diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-01-30 20:47:46 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-01-30 20:47:46 +0000 |
| commit | aa6f91a205c2f85576db7fa3f54b94b452b25047 (patch) | |
| tree | 9aaf7d02f53c64aa15714420c717c54275afc3a0 /media-libs/xine-lib/files | |
| parent | Remove myself from metadata since I haven't touched this in 18 months. (diff) | |
| download | gentoo-2-aa6f91a205c2f85576db7fa3f54b94b452b25047.tar.gz gentoo-2-aa6f91a205c2f85576db7fa3f54b94b452b25047.tar.bz2 gentoo-2-aa6f91a205c2f85576db7fa3f54b94b452b25047.zip | |
Fix compability with sys-libs/zlib >= 1.2.5.2 wrt #401449 by Ulrich Müller
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/xine-lib/files')
| -rw-r--r-- | media-libs/xine-lib/files/xine-lib-1.2.0-zlib-1.2.5.2.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/media-libs/xine-lib/files/xine-lib-1.2.0-zlib-1.2.5.2.patch b/media-libs/xine-lib/files/xine-lib-1.2.0-zlib-1.2.5.2.patch new file mode 100644 index 000000000000..7c5bc4583c0f --- /dev/null +++ b/media-libs/xine-lib/files/xine-lib-1.2.0-zlib-1.2.5.2.patch @@ -0,0 +1,42 @@ +http://bugs.gentoo.org/401449 + +--- src/xine-engine/osd.c ++++ src/xine-engine/osd.c +@@ -846,7 +846,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); +@@ -859,7 +859,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; + +--- misc/xine-fontconv.c ++++ 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; |