Mercurial > mxe-octave

annotate src/xine-lib-1-fixes.patch @ 2561:3978a82b1cb4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
package xine-lib: provide localtime_r from old pthreads
author Mark Brand <mabrand@mabrand.nl>
date Mon, 28 May 2012 01:00:23 +0200
parents 99516e73b368
children c4cd2fe180e4
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.
2353
99516e73b368 Move doc/index.html -> index.html
Volker Grabsch <vog@notjusthosting.com>
parents: 2333
diff changeset
2 See index.html for further information.
2088
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
2561
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
6 From d8274b609ad0b0dd56a6b64b60dad9bff960dd8c Mon Sep 17 00:00:00 2001
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
7 From: "mxe@mxe.cc" <mxe@mxe.cc>
2088
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
8 Date: Sun, 13 Nov 2011 11:48:07 +0100
2561
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
9 Subject: [PATCH 1/5] fix-install-def-file
2088
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
10
2561
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
11 ---
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
12 src/xine-engine/Makefile.am | 4 ++--
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
13 src/xine-engine/Makefile.in | 4 ++--
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
14 2 files changed, 4 insertions(+), 4 deletions(-)
2088
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
15
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
16 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
17 index 67ae63f..0f94abf 100644
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
18 --- a/src/xine-engine/Makefile.am
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
19 +++ b/src/xine-engine/Makefile.am
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
20 @@ -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
21
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
22 if WIN32
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
23 install-exec-local:
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
24 - cp -p $(DEF_FILE) $(DESTDIR)$(libdir)
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
25 + -cp -p $(DEF_FILE) $(DESTDIR)$(libdir)
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
26
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
27 uninstall-local:
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
28 - rm -f $(DEF_FILE)
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
29 + -rm -f $(DESTDIR)$(libdir)/$(DEF_FILE)
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
30 endif
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
31
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
32 $(XINEUTILS_LIB):
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
33 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
34 index 167a32b..0664e1f 100644
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
35 --- a/src/xine-engine/Makefile.in
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
36 +++ b/src/xine-engine/Makefile.in
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
37 @@ -905,10 +905,10 @@ $(LIBXINEPOSIX):
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
38 $(MAKE) -C $(top_builddir)/lib libxineposix.la
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@install-exec-local:
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
41 -@WIN32_TRUE@ cp -p $(DEF_FILE) $(DESTDIR)$(libdir)
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
42 +@WIN32_TRUE@ -cp -p $(DEF_FILE) $(DESTDIR)$(libdir)
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 @WIN32_TRUE@uninstall-local:
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
45 -@WIN32_TRUE@ rm -f $(DEF_FILE)
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
46 +@WIN32_TRUE@ -rm -f $(DESTDIR)$(libdir)/$(DEF_FILE)
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
47
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
48 $(XINEUTILS_LIB):
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
49 $(MAKE) -C $(top_builddir)/src/xine-utils libxineutils.la
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
50 --
2561
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
51 1.7.9.2
2088
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
52
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
53
2561
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
54 From 939df00f8c1dfa7d138eddb19735d2ea826826fb Mon Sep 17 00:00:00 2001
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
55 From: "mxe@mxe.cc" <mxe@mxe.cc>
2088
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
56 Date: Sun, 13 Nov 2011 12:05:22 +0100
2561
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
57 Subject: [PATCH 2/5] fake missing definitions for WIN32
2088
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
58
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
59 Taken from:
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
60 https://bugs.xine-project.org/show_bug.cgi?id=433
2561
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
61 ---
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
62 src/audio_out/audio_file_out.c | 12 ++++++++++++
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
63 1 file changed, 12 insertions(+)
2088
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
64
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
65 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
66 index 802461e..8b9b704 100644
2088
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
67 --- a/src/audio_out/audio_file_out.c
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
68 +++ b/src/audio_out/audio_file_out.c
2196
4ca5272c3b38 update packages file xine-lib
Mark Brand <mabrand@mabrand.nl>
parents: 2089
diff changeset
69 @@ -53,6 +53,18 @@
4ca5272c3b38 update packages file xine-lib
Mark Brand <mabrand@mabrand.nl>
parents: 2089
diff changeset
70 #endif
4ca5272c3b38 update packages file xine-lib
Mark Brand <mabrand@mabrand.nl>
parents: 2089
diff changeset
71 #endif
2088
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
72
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
73 +#ifdef WIN32
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
74 +#ifndef S_IWUSR
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
75 +#define S_IWUSR 0x0000
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 +#ifndef S_IRGRP
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
78 +#define S_IRGRP 0x0000
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
79 +#endif
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
80 +#ifndef S_IROTH
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
81 +#define S_IROTH 0x0000
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
82 +#endif
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
83 +#endif
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
84 +
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
85 /* Taken (hStudlyCapsAndAll) from sox's wavwritehdr */
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
86
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
87 struct wavhdr {
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
88 --
2561
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
89 1.7.9.2
2088
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
90
a5ea5f98cbe3 update package xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
91
2561
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
92 From 6cd583034929bcdd0e3fa0424b4d4e026ef87728 Mon Sep 17 00:00:00 2001
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
93 From: "mxe@mxe.cc" <mxe@mxe.cc>
2089
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
94 Date: Sun, 13 Nov 2011 13:45:21 +0100
2561
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
95 Subject: [PATCH 3/5] force graphicsmagick over imagemagick
2089
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
96
2561
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
97 ---
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
98 configure.ac | 9 ---------
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
99 1 file changed, 9 deletions(-)
2089
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
100
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
101 diff --git a/configure.ac b/configure.ac
2196
4ca5272c3b38 update packages file xine-lib
Mark Brand <mabrand@mabrand.nl>
parents: 2089
diff changeset
102 index b175301..d37ba36 100644
2089
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
103 --- a/configure.ac
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
104 +++ b/configure.ac
2196
4ca5272c3b38 update packages file xine-lib
Mark Brand <mabrand@mabrand.nl>
parents: 2089
diff changeset
105 @@ -1412,14 +1412,6 @@ AC_ARG_WITH([imagemagick],
2089
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
106 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
107
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
108 if test "x$with_imagemagick" != "xno"; then
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
109 - 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
110 - if test "x$have_imagemagick" = 'xno'; then
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
111 - 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
112 - dnl Avoid $(WAND_FLAGS) $(MAGICKWAND_FLAGS) ...
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
113 - WAND_CFLAGS="$MAGICKWAND_CFLAGS"
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
114 - WAND_LIBS="$MAGICKWAND_LIBS"
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
115 - fi
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
116 - if test "x$have_imagemagick" = 'xno'; then
2196
4ca5272c3b38 update packages file xine-lib
Mark Brand <mabrand@mabrand.nl>
parents: 2089
diff changeset
117 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
118 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
119 dnl The following assignments are safe, since they include
4ca5272c3b38 update packages file xine-lib
Mark Brand <mabrand@mabrand.nl>
parents: 2089
diff changeset
120 @@ -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
121 WAND_CFLAGS="$GRAPHICSMAGICKWAND_CFLAGS"
4ca5272c3b38 update packages file xine-lib
Mark Brand <mabrand@mabrand.nl>
parents: 2089
diff changeset
122 WAND_LIBS="$GRAPHICSMAGICKWAND_LIBS"
4ca5272c3b38 update packages file xine-lib
Mark Brand <mabrand@mabrand.nl>
parents: 2089
diff changeset
123 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
124 - fi
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
125 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
126 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
127 elif test "x$have_imagemagick" = "xyes"; then
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
128 --
2561
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
129 1.7.9.2
2225
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
130
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
131
2561
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
132 From 7b7304ef66f91f6f9d94a84f38b70c4d13935f93 Mon Sep 17 00:00:00 2001
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
133 From: "mxe@mxe.cc" <mxe@mxe.cc>
2225
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
134 Date: Mon, 30 Jan 2012 09:21:33 +0100
2561
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
135 Subject: [PATCH 4/5] zlib 1.2.6 compatibility
2225
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
136
2561
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
137 ---
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
138 src/xine-engine/osd.c | 4 ++--
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
139 1 file changed, 2 insertions(+), 2 deletions(-)
2089
b9761fba654e package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents: 2088
diff changeset
140
2225
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
141 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
142 index 1d22ea3..0fbde93 100644
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
143 --- 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
144 +++ 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
145 @@ -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
146 osd->display_y = y;
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
147 }
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
148
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
149 -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
150 +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
151 uint16_t ret;
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
152 ret = gzgetc(fp);
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
153 ret |= (gzgetc(fp)<<8);
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
154 @@ -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
155
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
156 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
157
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
158 - gzFile *fp;
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
159 + gzFile fp;
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
160 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
161 int i, ret = 0;
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
162
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
163 --
2561
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
164 1.7.9.2
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
165
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
166
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
167 From 1a39e224fae0895f964e7c1ba1f1a77b4cd0492d Mon Sep 17 00:00:00 2001
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
168 From: Mark Brand <mabrand@mabrand.nl>
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
169 Date: Sun, 27 May 2012 23:28:57 +0200
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
170 Subject: [PATCH 5/5] add missing localtime_r
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
171
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
172 Previously provided by pthreads-w32-2-8-0-release, which is also
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
173 the source of this version.
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
174 ---
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
175 src/localtime_r.h | 3 +++
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
176 src/xine-engine/scratch.c | 1 +
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
177 2 files changed, 4 insertions(+)
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
178 create mode 100644 src/localtime_r.h
2225
ad1e636bd55b package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents: 2196
diff changeset
179
2561
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
180 diff --git a/src/localtime_r.h b/src/localtime_r.h
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
181 new file mode 100644
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
182 index 0000000..ec778c5
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
183 --- /dev/null
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
184 +++ b/src/localtime_r.h
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
185 @@ -0,0 +1,3 @@
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
186 +#define localtime_r( _clock, _result ) \
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
187 + ( *(_result) = *localtime( (_clock) ), \
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
188 + (_result) )
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
189 diff --git a/src/xine-engine/scratch.c b/src/xine-engine/scratch.c
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
190 index 39bb592..41d561b 100644
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
191 --- a/src/xine-engine/scratch.c
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
192 +++ b/src/xine-engine/scratch.c
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
193 @@ -36,6 +36,7 @@
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
194
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
195 #include "xineutils.h"
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
196 #include "scratch.h"
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
197 +#include "localtime_r.h"
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
198
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
199 static void XINE_FORMAT_PRINTF(2, 0)
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
200 scratch_printf (scratch_buffer_t *this, const char *format, va_list argp)
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
201 --
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
202 1.7.9.2
3978a82b1cb4 package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
203