From 7ac66aea11c07eae825e9fc651f89ee19406f96b Mon Sep 17 00:00:00 2001
From: Mystro256 <alexjnewt@hotmail.com>
Date: Feb 13 2017 04:35:50 +0000
Subject: Patch for zlib 1.2.9


---

diff --git a/pcsxr-1.9.94-zlib129fix.patch b/pcsxr-1.9.94-zlib129fix.patch
new file mode 100644
index 0000000..632e1ce
--- /dev/null
+++ b/pcsxr-1.9.94-zlib129fix.patch
@@ -0,0 +1,34 @@
+diff --git a/pcsxr/configure.ac b/pcsxr/configure.ac
+index 300bb18..128b4f9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -113,6 +113,9 @@ if test "x$have_xtest" = xno; then
+ 	AC_MSG_ERROR([unable to find xtest headers])
+ fi
+ 
++AC_CHECK_LIB(z, uncompress2,
++[ AC_DEFINE([HAVE_UNCOMPRESS2], [1], [Define if libz supports uncompress2]) ])
++
+ AM_CONDITIONAL(USE_LIBCDIO, false)
+ 
+ AC_ARG_ENABLE(libcdio, [  --enable-libcdio        use GNU libcdio for CD-ROM support (default=no)],
+diff --git a/pcsxr/libpcsxcore/cdriso.c b/pcsxr/libpcsxcore/cdriso.c
+index 04e866d..fb7f28a 100644
+--- a/libpcsxcore/cdriso.c
++++ b/libpcsxcore/cdriso.c
+@@ -1219,6 +1219,7 @@ static int cdread_sub_mixed(FILE *f, unsigned int base, void *dest, int sector)
+ 	return ret;
+ }
+ 
++#ifndef HAVE_UNCOMPRESS2
+ static int uncompress2(void *out, unsigned long *out_size, void *in, unsigned long in_size)
+ {
+ 	static z_stream z;
+@@ -1249,6 +1250,7 @@ static int uncompress2(void *out, unsigned long *out_size, void *in, unsigned lo
+ 	*out_size -= z.avail_out;
+ 	return ret == 1 ? 0 : ret;
+ }
++#endif
+ 
+ static int cdread_compressed(FILE *f, unsigned int base, void *dest, int sector)
+ {
diff --git a/pcsxr.spec b/pcsxr.spec
index 6175515..8d8765a 100644
--- a/pcsxr.spec
+++ b/pcsxr.spec
@@ -2,7 +2,7 @@
 %undefine _hardened_build
 Name:           pcsxr
 Version:        1.9.94
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        A plugin based PlayStation (PSX) emulator with high compatibility
 
 #All is GPLv2+ except:
@@ -19,6 +19,9 @@ Source1:        %{name}.appdata.xml
 #Missing include, bug filed upstream:
 #https://pcsxr.codeplex.com/workitem/12408
 Patch0:         %{name}-%{version}-missinginclude.patch
+#Fix for zlib 1.2.9+, backported from upstream PR:
+#https://pcsxr.codeplex.com/SourceControl/network/forks/mgorny/pcsxr/contribution/9061
+Patch1:         %{name}-%{version}-zlib129fix.patch
 
 BuildRequires:  SDL2-devel
 BuildRequires:  gtk3-devel
@@ -82,6 +85,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_datadir}/appdata/*.appdata.xml
 
 %changelog
+* Sun Feb 12 2017 Jeremy Newton <alexjnewt AT hotmail DOT com> - 1.9.94-10
+- Backport fix for zlib-1.2.9+
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.94-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild