We have moved to Git. This repository is only provided for compatibility with old installations. Learn how to migrate your installation here.

diff media-libs/xine-lib/files/xine-lib-1.1.20-zlib-1.2.5.2.patch @ 25:d0b03ba8efdd

media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
author Daniel Neugebauer <dneuge@energiequant.de>
date Thu, 11 Oct 2012 16:24:24 +0200
parents
children
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/media-libs/xine-lib/files/xine-lib-1.1.20-zlib-1.2.5.2.patch	Thu Oct 11 16:24:24 2012 +0200
@@ -0,0 +1,43 @@
+1.2.0 patch applied to 1.1.20
+https://bugs.gentoo.org/show_bug.cgi?id=401449
+
+--- xine-lib-1.1.20-orig/src/xine-engine/osd.c
++++ xine-lib-1.1.20/src/xine-engine/osd.c
+@@ -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;
+ 
+--- xine-lib-1.1.20-orig/misc/xine-fontconv.c
++++ xine-lib-1.1.20/misc/xine-fontconv.c
+@@ -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;