ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 06:14:26 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #17526 from RamKromberg/fix/wavpack

Browse Source 
wavpack: 4.75.0 -> 4.80.0
This commit is contained in:
Joachim F 2016-08-06 00:59:08 +02:00 committed by GitHub
commit af8b7d3a28
2 changed files with 2 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/libraries/wavpack/default.nix
View File

@ -2,29 +2,15 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "wavpack-${version}"; name = "wavpack-${version}";
version = "4.75.0"; version = "4.80.0";
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; 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 { src = fetchurl {
url = "http://www.wavpack.com/${name}.tar.bz2"; url = "http://www.wavpack.com/${name}.tar.bz2";
sha256 = "0bmgwcvch3cjcivk7pyasqysj0s81wkg40j3zfrcd7bl0qhmqgn6"; sha256 = "1sbbwvqixg87h02avg0d5r64mpjz8cmhcc6j3s9wmlbvbykjw63r";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {

25
pkgs/development/libraries/wavpack/wavpack_clang.patch
View File

@ -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);