From f113fbb5ddf8559d45d737f36194253dce4ea8d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 9 Feb 2012 09:35:54 +0000
Subject: [PATCH] Fixing the xine lib build, for problems building with zlib
 1.2.6

svn path=/nixpkgs/branches/stdenv-updates/; revision=32153
---
 .../libraries/xine-lib/default.nix            |  1 +
 .../libraries/xine-lib/zlib126.patch          | 52 +++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/development/libraries/xine-lib/zlib126.patch

diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix
index f8866e807a4d..13b2fdce4582 100644
--- a/pkgs/development/libraries/xine-lib/default.nix
+++ b/pkgs/development/libraries/xine-lib/default.nix
@@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "1yss9cxxkcb6dzrv78xvi845ls6lhhbv6g8yfm6zjjl07v7jbm6c";
   };
 
+  patches = [ ./zlib126.patch ];
 #  patches =
 #    [ (fetchurl {
 #        url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/xine-lib/files/xine-lib-1.1.19-ffmpeg.patch?revision=1.1";
diff --git a/pkgs/development/libraries/xine-lib/zlib126.patch b/pkgs/development/libraries/xine-lib/zlib126.patch
new file mode 100644
index 000000000000..f48063e038b5
--- /dev/null
+++ b/pkgs/development/libraries/xine-lib/zlib126.patch
@@ -0,0 +1,52 @@
+http://anonscm.debian.org/hg/xine-lib/xine-lib/rev/24d09421ed09
+
+# HG changeset patch
+# User Ulrich Müller <ulm@gentoo.org>
+# Date 1327945720 0
+# Node ID 24d09421ed09d3a78efeab5c9b8ab31daaaba4fd
+# Parent  da296856c52e654cf599248de3a01bb754363c79
+Compile failure in osd.c with sys-libs/zlib-1.2.6
+
+diff -r da296856c52e -r 24d09421ed09 misc/xine-fontconv.c
+--- a/misc/xine-fontconv.c	Wed Jan 18 22:01:28 2012 +0000
++++ b/misc/xine-fontconv.c	Mon Jan 30 17:48:40 2012 +0000
+@@ -109,7 +109,7 @@
+ osd_font_t     font;
+ 
+ 
+-static int gzwrite_i16(gzFile *fp, uint16_t number) {
++static int gzwrite_i16(gzFile fp, uint16_t number) {
+   return gzputc(fp, number & 0xFF) != -1 &&
+          gzputc(fp, (number >> 8) & 0xFF) != -1;
+ }
+@@ -341,7 +341,7 @@
+ 
+   char                filename[1024];
+   FT_Bitmap          *out_bitmap;
+-  gzFile             *fp;
++  gzFile              fp;
+   int                 error;
+   int                 error_counter;
+   int                 glyph_index;
+diff -r da296856c52e -r 24d09421ed09 src/xine-engine/osd.c
+--- a/src/xine-engine/osd.c	Wed Jan 18 22:01:28 2012 +0000
++++ b/src/xine-engine/osd.c	Mon Jan 30 17:48:40 2012 +0000
+@@ -650,7 +650,7 @@
+   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 int osd_renderer_load_font(osd_renderer_t *this, char *filename) {
+ 
+-  gzFile      *fp;
++  gzFile       fp;
+   osd_font_t  *font = NULL;
+   int          i, ret = 0;
+ 
+