git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #122955 from peterhoeg/u/taglib_1_12

taglib: 1.11.1 -> 1.12

commit2f06be9f99f56275951d7b3a3f642608e2f90fe7 authorThomas Tuegel <ttuegel@mailbox.org> dateFri 14 May 2021, 11:09 (6 years ago) parent8b27f3a92f7fe5
2 files changed+10−33
pkgs/applications/audio/strawberry/default.nix−4 pkgs/development/libraries/taglib/default.nix+10−29
pkgs/applications/audio/strawberry/default.nix−4
@@ -82,10 +82,6 @@ mkDerivation rec {
8282 util-linux
8383 ];
8484
85− cmakeFlags = [
86− "-DUSE_SYSTEM_TAGLIB=ON"
87− ];
88−
8985 postInstall = ''
9086 qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
9187 '';
pkgs/development/libraries/taglib/default.nix+10−29
@@ -1,39 +1,21 @@
1−{ lib, stdenv, fetchurl, cmake, fetchpatch
1+{ lib
2+, stdenv
3+, fetchFromGitHub
4+, cmake
25, zlib
36}:
47
58stdenv.mkDerivation rec {
69 pname = "taglib";
7− version = "1.11.1";
10+ version = "1.12";
811
9− src = fetchurl {
10− url = "http://taglib.org/releases/${pname}-${version}.tar.gz";
11− sha256 = "0ssjcdjv4qf9liph5ry1kngam1y7zp8fzr9xv4wzzrma22kabldn";
12+ src = fetchFromGitHub {
13+ owner = "taglib";
14+ repo = "taglib";
15+ rev = "v${version}";
16+ sha256 = "sha256-omErajnYgxbflsbe6pS2KsexZcXisso0WGYnmIud7WA=";
1217 };
1318
14− patches = [
15− (fetchpatch {
16− # https://github.com/taglib/taglib/issues/829
17− name = "CVE-2017-12678.patch";
18− url = "https://github.com/taglib/taglib/commit/eb9ded1206f18.patch";
19− sha256 = "1bvpxsvmlpi3by7myzss9kkpdkv405612n8ff68mw1ambj8h1m90";
20− })
21−
22− (fetchpatch {
23− # https://github.com/taglib/taglib/pull/869
24− name = "CVE-2018-11439.patch";
25− url = "https://github.com/taglib/taglib/commit/272648ccfcccae30e002ccf34a22e075dd477278.patch";
26− sha256 = "0p397qq4anvcm0p8xs68mxa8hg6dl07chg260lc6k2929m34xv72";
27− })
28−
29− (fetchpatch {
30− # many consumers of taglib have started vendoring taglib due to this bug
31− name = "fix_ogg_corruption.patch";
32− url = "https://github.com/taglib/taglib/commit/9336c82da3a04552168f208cd7a5fa4646701ea4.patch";
33− sha256 = "01wlwk4gmfxdg5hjj9jmrain7kia89z0zsdaf5gn3nibmy5bq70r";
34− })
35− ];
36−
3719 nativeBuildInputs = [ cmake ];
3820
3921 buildInputs = [ zlib ];
@@ -51,7 +33,6 @@ stdenv.mkDerivation rec {
5133 Speex, WavPack, TrueAudio, WAV, AIFF, MP4 and ASF files.
5234 '';
5335 license = with licenses; [ lgpl3 mpl11 ];
54− inherit (cmake.meta) platforms;
5536 maintainers = with maintainers; [ ttuegel ];
5637 };
5738}