package xine-lib: workaround for zlib 1.2.6 compatibility

1 files changed, 38 insertions, 6 deletions

diff --git a/src/xine-lib-1-fixes.patch b/src/xine-lib-1-fixes.patch
index ebbd3f0..f26ec8b 100644
--- a/src/xine-lib-1-fixes.patch
+++ b/src/xine-lib-1-fixes.patch
@@ -6,7 +6,7 @@ Contains ad hoc patches for cross building.
 From 4968ed3c3300976ce8b24c52c729db6bd264057c Mon Sep 17 00:00:00 2001
 From: mingw-cross-env
 Date: Sun, 13 Nov 2011 11:48:07 +0100
-Subject: [PATCH 1/3] fix-install-def-file
+Subject: [PATCH 1/4] fix-install-def-file
 
 
 diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am
@@ -44,13 +44,13 @@ index 167a32b..0664e1f 100644
  $(XINEUTILS_LIB):
  	$(MAKE) -C $(top_builddir)/src/xine-utils libxineutils.la
 -- 
-1.7.8
+1.7.8.3
 
 
 From 86f2d23f9229e17aa4a54ca982b8f95de5ee4644 Mon Sep 17 00:00:00 2001
 From: mingw-cross-env
 Date: Sun, 13 Nov 2011 12:05:22 +0100
-Subject: [PATCH 2/3] fake missing definitions for WIN32
+Subject: [PATCH 2/4] fake missing definitions for WIN32
 
 Taken from:
 https://bugs.xine-project.org/show_bug.cgi?id=433
@@ -79,13 +79,13 @@ index 802461e..8b9b704 100644
  
  struct wavhdr {
 -- 
-1.7.8
+1.7.8.3
 
 
 From 42946ec1f900d22b62cb28996b9f12d11d7be7a8 Mon Sep 17 00:00:00 2001
 From: mingw-cross-env
 Date: Sun, 13 Nov 2011 13:45:21 +0100
-Subject: [PATCH 3/3] force graphicsmagick over imagemagick
+Subject: [PATCH 3/4] force graphicsmagick over imagemagick
 
 
 diff --git a/configure.ac b/configure.ac
@@ -116,5 +116,37 @@ index b175301..d37ba36 100644
        AC_MSG_ERROR([ImageMagick support requested, but neither Wand, MagickWand, nor GraphicsMagick were found])
     elif test "x$have_imagemagick" = "xyes"; then
 -- 
-1.7.8
+1.7.8.3
+
+
+From f0fa8b5b9570cdf88788067b1a76669c6863ac9f Mon Sep 17 00:00:00 2001
+From: mingw-cross-env
+Date: Mon, 30 Jan 2012 09:21:33 +0100
+Subject: [PATCH 4/4] zlib 1.2.6 compatibility
+
+
+diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c
+index 1d22ea3..0fbde93 100644
+--- a/src/xine-engine/osd.c
++++ b/src/xine-engine/osd.c
+@@ -650,7 +650,7 @@ static void osd_set_position (osd_object_t *osd, int x, int y) {
+   osd->display_y = y;
+ }
+ 
+-static uint16_t gzread_i16(gzFile *fp) {
++static uint16_t gzread_i16(gzFile fp) {
+   uint16_t ret;
+   ret = gzgetc(fp);
+   ret |= (gzgetc(fp)<<8);
+@@ -663,7 +663,7 @@ static uint16_t gzread_i16(gzFile *fp) {
+ 
+ static int osd_renderer_load_font(osd_renderer_t *this, char *filename) {
+ 
+-  gzFile      *fp;
++  gzFile      fp;
+   osd_font_t  *font = NULL;
+   int          i, ret = 0;
+ 
+-- 
+1.7.8.3