dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #122955 from peterhoeg/u/taglib_1_12

Browse Source 
taglib: 1.11.1 -> 1.12
This commit is contained in:
Thomas Tuegel 2021-05-14 11:09:03 -05:00 committed by GitHub
commit 2f06be9f99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/strawberry/default.nix
View File

@ -82,10 +82,6 @@ mkDerivation rec {
util-linux util-linux
]; ];
cmakeFlags = [
"-DUSE_SYSTEM_TAGLIB=ON"
];
postInstall = '' postInstall = ''
qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
''; '';

39
pkgs/development/libraries/taglib/default.nix
View File

@ -1,39 +1,21 @@
{ lib, stdenv, fetchurl, cmake, fetchpatch { lib
, stdenv
, fetchFromGitHub
, cmake
, zlib , zlib
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "taglib"; pname = "taglib";
version = "1.11.1"; version = "1.12";
src = fetchurl { src = fetchFromGitHub {
url = "http://taglib.org/releases/${pname}-${version}.tar.gz"; owner = "taglib";
sha256 = "0ssjcdjv4qf9liph5ry1kngam1y7zp8fzr9xv4wzzrma22kabldn"; repo = "taglib";
rev = "v${version}";
sha256 = "sha256-omErajnYgxbflsbe6pS2KsexZcXisso0WGYnmIud7WA=";
}; };
patches = [
(fetchpatch {
# https://github.com/taglib/taglib/issues/829
name = "CVE-2017-12678.patch";
url = "https://github.com/taglib/taglib/commit/eb9ded1206f18.patch";
sha256 = "1bvpxsvmlpi3by7myzss9kkpdkv405612n8ff68mw1ambj8h1m90";
})
(fetchpatch {
# https://github.com/taglib/taglib/pull/869
name = "CVE-2018-11439.patch";
url = "https://github.com/taglib/taglib/commit/272648ccfcccae30e002ccf34a22e075dd477278.patch";
sha256 = "0p397qq4anvcm0p8xs68mxa8hg6dl07chg260lc6k2929m34xv72";
})
(fetchpatch {
# many consumers of taglib have started vendoring taglib due to this bug
name = "fix_ogg_corruption.patch";
url = "https://github.com/taglib/taglib/commit/9336c82da3a04552168f208cd7a5fa4646701ea4.patch";
sha256 = "01wlwk4gmfxdg5hjj9jmrain7kia89z0zsdaf5gn3nibmy5bq70r";
})
];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ zlib ]; buildInputs = [ zlib ];
@ -51,7 +33,6 @@ stdenv.mkDerivation rec {
Speex, WavPack, TrueAudio, WAV, AIFF, MP4 and ASF files. Speex, WavPack, TrueAudio, WAV, AIFF, MP4 and ASF files.
''; '';
license = with licenses; [ lgpl3 mpl11 ]; license = with licenses; [ lgpl3 mpl11 ];
inherit (cmake.meta) platforms;
maintainers = with maintainers; [ ttuegel ]; maintainers = with maintainers; [ ttuegel ];
}; };
} }