From 92d8680785d4de6dbc003bae36bae0bf03f11f2b Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Sat, 4 Mar 2017 08:36:06 -0300
Subject: [PATCH] pcsxr: remove name conflict with zlib 1.2.9

---
 pkgs/misc/emulators/pcsxr/default.nix       |  2 ++
 pkgs/misc/emulators/pcsxr/uncompress2.patch | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/misc/emulators/pcsxr/uncompress2.patch

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