diff options
author | Joachim F <joachifm@users.noreply.github.com> | 2016-08-06 00:59:08 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-06 00:59:08 +0200 |
commit | af8b7d3a28009569c90901008b78bd339fe57927 (patch) | |
tree | a07605d29ff9f9d38094a8a30418a39f736f5300 /pkgs/development/libraries | |
parent | dece583a94e8018c55f3a82824dc1b904b4a535a (diff) | |
parent | 76c2988e3382855b25d26d0c4c23629214857a72 (diff) | |
download | nixlib-af8b7d3a28009569c90901008b78bd339fe57927.tar nixlib-af8b7d3a28009569c90901008b78bd339fe57927.tar.gz nixlib-af8b7d3a28009569c90901008b78bd339fe57927.tar.bz2 nixlib-af8b7d3a28009569c90901008b78bd339fe57927.tar.lz nixlib-af8b7d3a28009569c90901008b78bd339fe57927.tar.xz nixlib-af8b7d3a28009569c90901008b78bd339fe57927.tar.zst nixlib-af8b7d3a28009569c90901008b78bd339fe57927.zip |
Merge pull request #17526 from RamKromberg/fix/wavpack
wavpack: 4.75.0 -> 4.80.0
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/wavpack/default.nix | 18 | ||||
-rw-r--r-- | pkgs/development/libraries/wavpack/wavpack_clang.patch | 25 |
2 files changed, 2 insertions, 41 deletions
diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix index 3bdb1392bd97..efe645818935 100644 --- a/pkgs/development/libraries/wavpack/default.nix +++ b/pkgs/development/libraries/wavpack/default.nix @@ -2,29 +2,15 @@ stdenv.mkDerivation rec { name = "wavpack-${version}"; - version = "4.75.0"; + version = "4.80.0"; enableParallelBuilding = true; buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; - patches = [ - # backported from - # https://github.com/dbry/WavPack/commit/12867b33e2de3e95b88d7cb6f449ce0c5c87cdd5 - ./wavpack_clang.patch - ]; - - preConfigure = '' - sed -i '2iexec_prefix=@exec_prefix@' wavpack.pc.in - ''; - - # --disable-asm is required for clang - # https://github.com/dbry/WavPack/issues/3 - configureFlags = lib.optionalString stdenv.cc.isClang "--disable-asm"; - src = fetchurl { url = "http://www.wavpack.com/${name}.tar.bz2"; - sha256 = "0bmgwcvch3cjcivk7pyasqysj0s81wkg40j3zfrcd7bl0qhmqgn6"; + sha256 = "1sbbwvqixg87h02avg0d5r64mpjz8cmhcc6j3s9wmlbvbykjw63r"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/wavpack/wavpack_clang.patch b/pkgs/development/libraries/wavpack/wavpack_clang.patch deleted file mode 100644 index dfbe47181431..000000000000 --- a/pkgs/development/libraries/wavpack/wavpack_clang.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -ru -x '*~' wavpack-4.75.0_orig/src/wavpack_local.h wavpack-4.75.0/src/wavpack_local.h ---- wavpack-4.75.0_orig/src/wavpack_local.h 2015-05-21 06:50:26.000000000 +0900 -+++ wavpack-4.75.0/src/wavpack_local.h 2015-09-14 21:48:09.000000000 +0900 -@@ -650,9 +650,9 @@ - void scan_word (WavpackStream *wps, int32_t *samples, uint32_t num_samples, int dir); - void update_error_limit (WavpackStream *wps); - --const uint32_t bitset [32]; --const uint32_t bitmask [32]; --const char nbits_table [256]; -+extern const uint32_t bitset [32]; -+extern const uint32_t bitmask [32]; -+extern const char nbits_table [256]; - - int log2s (int32_t value); - int32_t exp2s (int log); -@@ -734,7 +734,7 @@ - /////////////////////////////////// common utilities //////////////////////////////////// - // module: common_utils.c - --const uint32_t sample_rates [16]; -+extern const uint32_t sample_rates [16]; - uint32_t WavpackGetLibraryVersion (void); - const char *WavpackGetLibraryVersionString (void); - uint32_t WavpackGetSampleRate (WavpackContext *wpc); |