diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-03-06 08:59:13 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-06 08:59:13 +0100 |
commit | c31c11ecef2d10fff8421a54739af26a7f3a04a4 (patch) | |
tree | 77dee3318b5197210df634ea856e9bd9abe26e04 /pkgs/misc | |
parent | f39e718cab2d6c6c2e60688a0f16777a7a148cd9 (diff) | |
parent | 92d8680785d4de6dbc003bae36bae0bf03f11f2b (diff) |
Merge pull request #23482 from rardiol/pcsxr
pcsxr: remove name conflict with zlib 1.2.9
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/emulators/pcsxr/default.nix | 2 | ||||
-rw-r--r-- | pkgs/misc/emulators/pcsxr/uncompress2.patch | 20 |
2 files changed, 22 insertions, 0 deletions
diff --git a/pkgs/misc/emulators/pcsxr/default.nix b/pkgs/misc/emulators/pcsxr/default.nix index 74b9932ed832..bb6997dfb96c 100644 --- a/pkgs/misc/emulators/pcsxr/default.nix +++ b/pkgs/misc/emulators/pcsxr/default.nix @@ -45,6 +45,8 @@ stdenv.mkDerivation rec { url = "https://anonscm.debian.org/cgit/pkg-games/pcsxr.git/plain/debian/patches/08_reproducible.patch?h=debian/1.9.94-2"; sha256 = "1cx9q59drsk9h6l31097lg4aanaj93ysdz5p88pg9c7wvxk1qz06"; }) + + ./uncompress2.patch ]; buildInputs = [ diff --git a/pkgs/misc/emulators/pcsxr/uncompress2.patch b/pkgs/misc/emulators/pcsxr/uncompress2.patch new file mode 100644 index 000000000000..356868ce7a8b --- /dev/null +++ b/pkgs/misc/emulators/pcsxr/uncompress2.patch @@ -0,0 +1,20 @@ +--- a/libpcsxcore/cdriso.c ++++ b/libpcsxcore/cdriso.c +@@ -1219,7 +1219,7 @@ + return ret; + } + +-static int uncompress2(void *out, unsigned long *out_size, void *in, unsigned long in_size) ++static int uncompress3(void *out, unsigned long *out_size, void *in, unsigned long in_size) + { + static z_stream z; + int ret = 0; +@@ -1298,7 +1298,7 @@ + if (is_compressed) { + cdbuffer_size_expect = sizeof(compr_img->buff_raw[0]) << compr_img->block_shift; + cdbuffer_size = cdbuffer_size_expect; +- ret = uncompress2(compr_img->buff_raw[0], &cdbuffer_size, compr_img->buff_compressed, size); ++ ret = uncompress3(compr_img->buff_raw[0], &cdbuffer_size, compr_img->buff_compressed, size); + if (ret != 0) { + SysPrintf("uncompress failed with %d for block %d, sector %d\n", + ret, block, sector); |