Mercurial > mxe-octave

annotate src/xine-lib-1-fixes.patch @ 2333:f653602a0500

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rebrand to new project name MXE
author Volker Grabsch <vog@notjusthosting.com>
date Wed, 28 Mar 2012 15:46:58 +0200
parents ad1e636bd55b
children 99516e73b368
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 2225
diff changeset
1 This file is part of MXE.
2088
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
2 See doc/index.html for further information.
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
3
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
4 Contains ad hoc patches for cross building.
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
5
2196
4ca5272c3b38 update packages file xine-lib
Mark Brand <mabrand@mabrand.nl>
parents: 2089
diff changeset
6 From 4968ed3c3300976ce8b24c52c729db6bd264057c Mon Sep 17 00:00:00 2001
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 2225
diff changeset
7 From: MXE
2088
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
8 Date: Sun, 13 Nov 2011 11:48:07 +0100
2225
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
9 Subject: [PATCH 1/4] fix-install-def-file
2088
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
10
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
11
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
12 diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
13 index 67ae63f..0f94abf 100644
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
14 --- a/src/xine-engine/Makefile.am
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
15 +++ b/src/xine-engine/Makefile.am
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
16 @@ -45,10 +45,10 @@ noinst_HEADERS = bswap.h ffmpeg_bswap.h xine_private.h
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
17
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
18 if WIN32
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
19 install-exec-local:
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
20 - cp -p $(DEF_FILE) $(DESTDIR)$(libdir)
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
21 + -cp -p $(DEF_FILE) $(DESTDIR)$(libdir)
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
22
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
23 uninstall-local:
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
24 - rm -f $(DEF_FILE)
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
25 + -rm -f $(DESTDIR)$(libdir)/$(DEF_FILE)
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
26 endif
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
27
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
28 $(XINEUTILS_LIB):
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
29 diff --git a/src/xine-engine/Makefile.in b/src/xine-engine/Makefile.in
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
30 index 167a32b..0664e1f 100644
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
31 --- a/src/xine-engine/Makefile.in
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
32 +++ b/src/xine-engine/Makefile.in
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
33 @@ -905,10 +905,10 @@ $(LIBXINEPOSIX):
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
34 $(MAKE) -C $(top_builddir)/lib libxineposix.la
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
35
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
36 @WIN32_TRUE@install-exec-local:
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
37 -@WIN32_TRUE@ cp -p $(DEF_FILE) $(DESTDIR)$(libdir)
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
38 +@WIN32_TRUE@ -cp -p $(DEF_FILE) $(DESTDIR)$(libdir)
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
39
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
40 @WIN32_TRUE@uninstall-local:
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
41 -@WIN32_TRUE@ rm -f $(DEF_FILE)
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
42 +@WIN32_TRUE@ -rm -f $(DESTDIR)$(libdir)/$(DEF_FILE)
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
43
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
44 $(XINEUTILS_LIB):
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
45 $(MAKE) -C $(top_builddir)/src/xine-utils libxineutils.la
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
46 --
2225
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
47 1.7.8.3
2088
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
48
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
49
2196
4ca5272c3b38 update packages file xine-lib
Mark Brand <mabrand@mabrand.nl>
parents: 2089
diff changeset
50 From 86f2d23f9229e17aa4a54ca982b8f95de5ee4644 Mon Sep 17 00:00:00 2001
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 2225
diff changeset
51 From: MXE
2088
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
52 Date: Sun, 13 Nov 2011 12:05:22 +0100
2225
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
53 Subject: [PATCH 2/4] fake missing definitions for WIN32
2088
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
54
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
55 Taken from:
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
56 https://bugs.xine-project.org/show_bug.cgi?id=433
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
57
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
58 diff --git a/src/audio_out/audio_file_out.c b/src/audio_out/audio_file_out.c
2196
4ca5272c3b38 update packages file xine-lib
Mark Brand <mabrand@mabrand.nl>
parents: 2089
diff changeset
59 index 802461e..8b9b704 100644
2088
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
60 --- a/src/audio_out/audio_file_out.c
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
61 +++ b/src/audio_out/audio_file_out.c
2196
4ca5272c3b38 update packages file xine-lib
Mark Brand <mabrand@mabrand.nl>
parents: 2089
diff changeset
62 @@ -53,6 +53,18 @@
4ca5272c3b38 update packages file xine-lib
Mark Brand <mabrand@mabrand.nl>
parents: 2089
diff changeset
63 #endif
4ca5272c3b38 update packages file xine-lib
Mark Brand <mabrand@mabrand.nl>
parents: 2089
diff changeset
64 #endif
2088
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
65
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
66 +#ifdef WIN32
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
67 +#ifndef S_IWUSR
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
68 +#define S_IWUSR 0x0000
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
69 +#endif
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
70 +#ifndef S_IRGRP
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
71 +#define S_IRGRP 0x0000
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
72 +#endif
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
73 +#ifndef S_IROTH
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
74 +#define S_IROTH 0x0000
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
75 +#endif
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
76 +#endif
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
77 +
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
78 /* Taken (hStudlyCapsAndAll) from sox's wavwritehdr */
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
79
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
80 struct wavhdr {
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
81 --
2225
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
82 1.7.8.3
2088
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
83
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
84
2196
4ca5272c3b38 update packages file xine-lib
Mark Brand <mabrand@mabrand.nl>
parents: 2089
diff changeset
85 From 42946ec1f900d22b62cb28996b9f12d11d7be7a8 Mon Sep 17 00:00:00 2001
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 2225
diff changeset
86 From: MXE
2089
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
87 Date: Sun, 13 Nov 2011 13:45:21 +0100
2225
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
88 Subject: [PATCH 3/4] force graphicsmagick over imagemagick
2089
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
89
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
90
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
91 diff --git a/configure.ac b/configure.ac
2196
4ca5272c3b38 update packages file xine-lib
Mark Brand <mabrand@mabrand.nl>
parents: 2089
diff changeset
92 index b175301..d37ba36 100644
2089
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
93 --- a/configure.ac
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
94 +++ b/configure.ac
2196
4ca5272c3b38 update packages file xine-lib
Mark Brand <mabrand@mabrand.nl>
parents: 2089
diff changeset
95 @@ -1412,14 +1412,6 @@ AC_ARG_WITH([imagemagick],
2089
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
96 AS_HELP_STRING([--without-imagemagick], [Build without ImageMagick image decoder (or GraphicsMagick's compat layer)]))
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
97
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
98 if test "x$with_imagemagick" != "xno"; then
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
99 - PKG_CHECK_MODULES([WAND], [Wand], [have_imagemagick=yes], [AC_MSG_RESULT([no]); have_imagemagick=no])
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
100 - if test "x$have_imagemagick" = 'xno'; then
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
101 - PKG_CHECK_MODULES([MAGICKWAND], [MagickWand], [have_imagemagick=yes], [AC_MSG_RESULT([no]); have_imagemagick=no])
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
102 - dnl Avoid $(WAND_FLAGS) $(MAGICKWAND_FLAGS) ...
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
103 - WAND_CFLAGS="$MAGICKWAND_CFLAGS"
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
104 - WAND_LIBS="$MAGICKWAND_LIBS"
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
105 - fi
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
106 - if test "x$have_imagemagick" = 'xno'; then
2196
4ca5272c3b38 update packages file xine-lib
Mark Brand <mabrand@mabrand.nl>
parents: 2089
diff changeset
107 PKG_CHECK_MODULES([GRAPHICSMAGICK], [ImageMagick], [have_imagemagick=yes], [AC_MSG_RESULT([no]); have_imagemagick=no])
4ca5272c3b38 update packages file xine-lib
Mark Brand <mabrand@mabrand.nl>
parents: 2089
diff changeset
108 PKG_CHECK_MODULES([GRAPHICSMAGICKWAND], [GraphicsMagickWand], [have_imagemagick=yes], [AC_MSG_RESULT([no]); have_imagemagick=no])
4ca5272c3b38 update packages file xine-lib
Mark Brand <mabrand@mabrand.nl>
parents: 2089
diff changeset
109 dnl The following assignments are safe, since they include
4ca5272c3b38 update packages file xine-lib
Mark Brand <mabrand@mabrand.nl>
parents: 2089
diff changeset
110 @@ -1427,7 +1419,6 @@ if test "x$with_imagemagick" != "xno"; then
4ca5272c3b38 update packages file xine-lib
Mark Brand <mabrand@mabrand.nl>
parents: 2089
diff changeset
111 WAND_CFLAGS="$GRAPHICSMAGICKWAND_CFLAGS"
4ca5272c3b38 update packages file xine-lib
Mark Brand <mabrand@mabrand.nl>
parents: 2089
diff changeset
112 WAND_LIBS="$GRAPHICSMAGICKWAND_LIBS"
4ca5272c3b38 update packages file xine-lib
Mark Brand <mabrand@mabrand.nl>
parents: 2089
diff changeset
113 AC_DEFINE([HAVE_GRAPHICSMAGICK], [1], [Define this if you have GraphicsMagick installed])
2089
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
114 - fi
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
115 if test "x$with_imagemagick" = "xyes" && test "x$have_imagemagick" = "xno"; then
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
116 AC_MSG_ERROR([ImageMagick support requested, but neither Wand, MagickWand, nor GraphicsMagick were found])
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
117 elif test "x$have_imagemagick" = "xyes"; then
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
118 --
2225
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
119 1.7.8.3
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
120
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
121
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
122 From f0fa8b5b9570cdf88788067b1a76669c6863ac9f Mon Sep 17 00:00:00 2001
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 2225
diff changeset
123 From: MXE
2225
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
124 Date: Mon, 30 Jan 2012 09:21:33 +0100
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
125 Subject: [PATCH 4/4] zlib 1.2.6 compatibility
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
126
2089
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
127
2225
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
128 diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
129 index 1d22ea3..0fbde93 100644
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
130 --- a/src/xine-engine/osd.c
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
131 +++ b/src/xine-engine/osd.c
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
132 @@ -650,7 +650,7 @@ static void osd_set_position (osd_object_t *osd, int x, int y) {
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
133 osd->display_y = y;
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
134 }
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
135
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
136 -static uint16_t gzread_i16(gzFile *fp) {
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
137 +static uint16_t gzread_i16(gzFile fp) {
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
138 uint16_t ret;
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
139 ret = gzgetc(fp);
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
140 ret |= (gzgetc(fp)<<8);
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
141 @@ -663,7 +663,7 @@ static uint16_t gzread_i16(gzFile *fp) {
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
142
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
143 static int osd_renderer_load_font(osd_renderer_t *this, char *filename) {
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
144
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
145 - gzFile *fp;
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
146 + gzFile fp;
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
147 osd_font_t *font = NULL;
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
148 int i, ret = 0;
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
149
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
150 --
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
151 1.7.8.3
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
152