about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@viric.name>2012-07-02 23:09:01 +0200
committerLluís Batlle i Rossell <viric@viric.name>2012-07-02 23:09:01 +0200
commitef1d8eb915404ee55a5edbf6636228f5ab337dc6 (patch)
treee5baf756b468a0c37c40629e88a4ec5b04275e9c
parent5592b1f9b181fa5872b2e75c5ca8fcbd6e023b24 (diff)
downloadnixlib-ef1d8eb915404ee55a5edbf6636228f5ab337dc6.tar
nixlib-ef1d8eb915404ee55a5edbf6636228f5ab337dc6.tar.gz
nixlib-ef1d8eb915404ee55a5edbf6636228f5ab337dc6.tar.bz2
nixlib-ef1d8eb915404ee55a5edbf6636228f5ab337dc6.tar.lz
nixlib-ef1d8eb915404ee55a5edbf6636228f5ab337dc6.tar.xz
nixlib-ef1d8eb915404ee55a5edbf6636228f5ab337dc6.tar.zst
nixlib-ef1d8eb915404ee55a5edbf6636228f5ab337dc6.zip
xine-lib: removing a now unused patch
I forgot that in a previous commit.
-rw-r--r--pkgs/development/libraries/xine-lib/zlib126.patch52
1 files changed, 0 insertions, 52 deletions
diff --git a/pkgs/development/libraries/xine-lib/zlib126.patch b/pkgs/development/libraries/xine-lib/zlib126.patch
deleted file mode 100644
index f48063e038b5..000000000000
--- a/pkgs/development/libraries/xine-lib/zlib126.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-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;
- 
-