| 1 |
ssuominen 12/01/30 20:47:46 |
| 2 |
|
| 3 |
Added: xine-lib-1.2.0-zlib-1.2.5.2.patch |
| 4 |
Log: |
| 5 |
Fix compability with sys-libs/zlib >= 1.2.5.2 wrt #401449 by Ulrich Müller |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-libs/xine-lib/files/xine-lib-1.2.0-zlib-1.2.5.2.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/xine-lib/files/xine-lib-1.2.0-zlib-1.2.5.2.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/xine-lib/files/xine-lib-1.2.0-zlib-1.2.5.2.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: xine-lib-1.2.0-zlib-1.2.5.2.patch |
| 16 |
=================================================================== |
| 17 |
http://bugs.gentoo.org/401449 |
| 18 |
|
| 19 |
--- src/xine-engine/osd.c |
| 20 |
+++ src/xine-engine/osd.c |
| 21 |
@@ -846,7 +846,7 @@ |
| 22 |
osd->display_y = y; |
| 23 |
} |
| 24 |
|
| 25 |
-static uint16_t gzread_i16(gzFile *fp) { |
| 26 |
+static uint16_t gzread_i16(gzFile fp) { |
| 27 |
uint16_t ret; |
| 28 |
ret = gzgetc(fp); |
| 29 |
ret |= (gzgetc(fp)<<8); |
| 30 |
@@ -859,7 +859,7 @@ |
| 31 |
|
| 32 |
static int osd_renderer_load_font(osd_renderer_t *this, char *filename) { |
| 33 |
|
| 34 |
- gzFile *fp; |
| 35 |
+ gzFile fp; |
| 36 |
osd_font_t *font = NULL; |
| 37 |
int i, ret = 0; |
| 38 |
|
| 39 |
--- misc/xine-fontconv.c |
| 40 |
+++ misc/xine-fontconv.c |
| 41 |
@@ -109,7 +109,7 @@ |
| 42 |
osd_font_t font; |
| 43 |
|
| 44 |
|
| 45 |
-static int gzwrite_i16(gzFile *fp, uint16_t number) { |
| 46 |
+static int gzwrite_i16(gzFile fp, uint16_t number) { |
| 47 |
return gzputc(fp, number & 0xFF) != -1 && |
| 48 |
gzputc(fp, (number >> 8) & 0xFF) != -1; |
| 49 |
} |
| 50 |
@@ -341,7 +341,7 @@ |
| 51 |
|
| 52 |
char filename[1024]; |
| 53 |
FT_Bitmap *out_bitmap; |
| 54 |
- gzFile *fp; |
| 55 |
+ gzFile fp; |
| 56 |
int error; |
| 57 |
int error_counter; |
| 58 |
int glyph_index; |
Archives