megacoffee.net Gentoo overlay - legacy mirror

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

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
25
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
1 1.2.0 patch applied to 1.1.20
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
2 https://bugs.gentoo.org/show_bug.cgi?id=401449
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
3
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
4 --- xine-lib-1.1.20-orig/src/xine-engine/osd.c
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
5 +++ xine-lib-1.1.20/src/xine-engine/osd.c
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
6 @@ -650,7 +650,7 @@
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
7 osd->display_y = y;
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
8 }
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
9
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
10 -static uint16_t gzread_i16(gzFile *fp) {
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
11 +static uint16_t gzread_i16(gzFile fp) {
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
12 uint16_t ret;
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
13 ret = gzgetc(fp);
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
14 ret |= (gzgetc(fp)<<8);
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
15 @@ -663,7 +663,7 @@
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
16
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
17 static int osd_renderer_load_font(osd_renderer_t *this, char *filename) {
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
18
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
19 - gzFile *fp;
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
20 + gzFile fp;
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
21 osd_font_t *font = NULL;
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
22 int i, ret = 0;
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
23
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
24 --- xine-lib-1.1.20-orig/misc/xine-fontconv.c
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
25 +++ xine-lib-1.1.20/misc/xine-fontconv.c
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
26 @@ -109,7 +109,7 @@
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
27 osd_font_t font;
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
28
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
29
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
30 -static int gzwrite_i16(gzFile *fp, uint16_t number) {
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
31 +static int gzwrite_i16(gzFile fp, uint16_t number) {
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
32 return gzputc(fp, number & 0xFF) != -1 &&
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
33 gzputc(fp, (number >> 8) & 0xFF) != -1;
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
34 }
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
35 @@ -341,7 +341,7 @@
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
36
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
37 char filename[1024];
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
38 FT_Bitmap *out_bitmap;
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
39 - gzFile *fp;
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
40 + gzFile fp;
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
41 int error;
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
42 int error_counter;
d0b03ba8efdd media-libs/xine-lib-1.1.20 imported from official repository (deleted files), patch added for zlib
Daniel Neugebauer <dneuge@energiequant.de>
parents:
diff changeset
43 int glyph_index;