diff options
| author | Ram Kromberg <ramkromberg@mail.com> | 2016-08-05 11:36:15 +0300 |
|---|---|---|
| committer | Ram Kromberg <ramkromberg@mail.com> | 2016-08-05 13:54:56 +0300 |
| commit | 76c2988e3382855b25d26d0c4c23629214857a72 (patch) | |
| tree | b3a7de81543663d733c900f79bf51370c7725941 /pkgs/development/libraries | |
| parent | 1664279f0e710fcc331b9d0b5102d4561e8ef22c (diff) | |
| download | nixlib-76c2988e3382855b25d26d0c4c23629214857a72.tar nixlib-76c2988e3382855b25d26d0c4c23629214857a72.tar.gz nixlib-76c2988e3382855b25d26d0c4c23629214857a72.tar.bz2 nixlib-76c2988e3382855b25d26d0c4c23629214857a72.tar.lz nixlib-76c2988e3382855b25d26d0c4c23629214857a72.tar.xz nixlib-76c2988e3382855b25d26d0c4c23629214857a72.tar.zst nixlib-76c2988e3382855b25d26d0c4c23629214857a72.zip | |
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); |