Mercurial > mxe-octave
annotate src/xine-lib-1-fixes.patch @ 3338:1e9695b83a80
imported patch msvc-gl2ps-doc
| author | Michael Goffioul <michael.goffioul@gmail.com> |
|---|---|
| date | Fri, 29 Nov 2013 18:46:47 -0500 |
| parents | c4cd2fe180e4 |
| children |
| 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 | 3 |
| 2583 | 4 From 6dc46ed1253c1fce1cfa8d360e352b5bc12d0d3b Mon Sep 17 00:00:00 2001 |
|
2561
3978a82b1cb4
package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
5 From: "mxe@mxe.cc" <mxe@mxe.cc> |
| 2088 | 6 Date: Sun, 13 Nov 2011 12:05:22 +0100 |
| 2583 | 7 Subject: [PATCH 1/4] fake missing definitions for WIN32 |
| 2088 | 8 |
| 9 Taken from: | |
| 10 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
|
11 --- |
|
3978a82b1cb4
package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
12 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
|
13 1 file changed, 12 insertions(+) |
| 2088 | 14 |
| 15 diff --git a/src/audio_out/audio_file_out.c b/src/audio_out/audio_file_out.c | |
| 2583 | 16 index bc40d4e..a613a89 100644 |
| 2088 | 17 --- a/src/audio_out/audio_file_out.c |
| 18 +++ b/src/audio_out/audio_file_out.c | |
|
2196
4ca5272c3b38
update packages file xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
2089
diff
changeset
|
19 @@ -53,6 +53,18 @@ |
|
4ca5272c3b38
update packages file xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
2089
diff
changeset
|
20 #endif |
|
4ca5272c3b38
update packages file xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
2089
diff
changeset
|
21 #endif |
| 2088 | 22 |
| 23 +#ifdef WIN32 | |
| 24 +#ifndef S_IWUSR | |
| 25 +#define S_IWUSR 0x0000 | |
| 26 +#endif | |
| 27 +#ifndef S_IRGRP | |
| 28 +#define S_IRGRP 0x0000 | |
| 29 +#endif | |
| 30 +#ifndef S_IROTH | |
| 31 +#define S_IROTH 0x0000 | |
| 32 +#endif | |
| 33 +#endif | |
| 34 + | |
| 35 /* Taken (hStudlyCapsAndAll) from sox's wavwritehdr */ | |
| 36 | |
| 37 struct wavhdr { | |
| 38 -- | |
| 2583 | 39 1.7.10.4 |
| 2088 | 40 |
| 41 | |
| 2583 | 42 From 4a7cd803cbc3daa3f19fdc6b34fb93e1994bc2f5 Mon Sep 17 00:00:00 2001 |
|
2561
3978a82b1cb4
package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
43 From: "mxe@mxe.cc" <mxe@mxe.cc> |
|
2089
b9761fba654e
package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents:
2088
diff
changeset
|
44 Date: Sun, 13 Nov 2011 13:45:21 +0100 |
| 2583 | 45 Subject: [PATCH 2/4] force graphicsmagick over imagemagick |
|
2089
b9761fba654e
package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents:
2088
diff
changeset
|
46 |
|
2561
3978a82b1cb4
package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
47 --- |
|
3978a82b1cb4
package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
48 configure.ac | 9 --------- |
|
3978a82b1cb4
package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
49 1 file changed, 9 deletions(-) |
|
2089
b9761fba654e
package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents:
2088
diff
changeset
|
50 |
|
b9761fba654e
package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents:
2088
diff
changeset
|
51 diff --git a/configure.ac b/configure.ac |
| 2583 | 52 index 9112b58..67f1147 100644 |
|
2089
b9761fba654e
package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents:
2088
diff
changeset
|
53 --- a/configure.ac |
|
b9761fba654e
package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents:
2088
diff
changeset
|
54 +++ b/configure.ac |
|
2196
4ca5272c3b38
update packages file xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
2089
diff
changeset
|
55 @@ -1412,14 +1412,6 @@ AC_ARG_WITH([imagemagick], |
|
2089
b9761fba654e
package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents:
2088
diff
changeset
|
56 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
|
57 |
|
b9761fba654e
package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents:
2088
diff
changeset
|
58 if test "x$with_imagemagick" != "xno"; then |
|
b9761fba654e
package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents:
2088
diff
changeset
|
59 - 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
|
60 - if test "x$have_imagemagick" = 'xno'; then |
|
b9761fba654e
package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents:
2088
diff
changeset
|
61 - 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
|
62 - dnl Avoid $(WAND_FLAGS) $(MAGICKWAND_FLAGS) ... |
|
b9761fba654e
package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents:
2088
diff
changeset
|
63 - WAND_CFLAGS="$MAGICKWAND_CFLAGS" |
|
b9761fba654e
package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents:
2088
diff
changeset
|
64 - WAND_LIBS="$MAGICKWAND_LIBS" |
|
b9761fba654e
package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents:
2088
diff
changeset
|
65 - fi |
|
b9761fba654e
package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents:
2088
diff
changeset
|
66 - if test "x$have_imagemagick" = 'xno'; then |
|
2196
4ca5272c3b38
update packages file xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
2089
diff
changeset
|
67 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
|
68 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
|
69 dnl The following assignments are safe, since they include |
|
4ca5272c3b38
update packages file xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
2089
diff
changeset
|
70 @@ -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
|
71 WAND_CFLAGS="$GRAPHICSMAGICKWAND_CFLAGS" |
|
4ca5272c3b38
update packages file xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
2089
diff
changeset
|
72 WAND_LIBS="$GRAPHICSMAGICKWAND_LIBS" |
|
4ca5272c3b38
update packages file xine-lib
Mark Brand <mabrand@mabrand.nl>
parents:
2089
diff
changeset
|
73 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
|
74 - fi |
|
b9761fba654e
package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents:
2088
diff
changeset
|
75 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
|
76 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
|
77 elif test "x$have_imagemagick" = "xyes"; then |
|
b9761fba654e
package xine-lib: enable graphicsmagick
Mark Brand <mabrand@mabrand.nl>
parents:
2088
diff
changeset
|
78 -- |
| 2583 | 79 1.7.10.4 |
|
2225
ad1e636bd55b
package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2196
diff
changeset
|
80 |
|
ad1e636bd55b
package xine-lib: workaround for zlib 1.2.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2196
diff
changeset
|
81 |
| 2583 | 82 From 5b362f4aed3a814a351cd259efb62b40761ddb3d Mon Sep 17 00:00:00 2001 |
|
2561
3978a82b1cb4
package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
83 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
|
84 Date: Sun, 27 May 2012 23:28:57 +0200 |
| 2583 | 85 Subject: [PATCH 3/4] add missing localtime_r |
|
2561
3978a82b1cb4
package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
86 |
|
3978a82b1cb4
package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
87 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
|
88 the source of this version. |
|
3978a82b1cb4
package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
89 --- |
|
3978a82b1cb4
package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
90 src/localtime_r.h | 3 +++ |
|
3978a82b1cb4
package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
91 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
|
92 2 files changed, 4 insertions(+) |
|
3978a82b1cb4
package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
93 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
|
94 |
|
2561
3978a82b1cb4
package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
95 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
|
96 new file mode 100644 |
|
3978a82b1cb4
package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
97 index 0000000..ec778c5 |
|
3978a82b1cb4
package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
98 --- /dev/null |
|
3978a82b1cb4
package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
99 +++ b/src/localtime_r.h |
|
3978a82b1cb4
package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
100 @@ -0,0 +1,3 @@ |
|
3978a82b1cb4
package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
101 +#define localtime_r( _clock, _result ) \ |
|
3978a82b1cb4
package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
102 + ( *(_result) = *localtime( (_clock) ), \ |
|
3978a82b1cb4
package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
103 + (_result) ) |
|
3978a82b1cb4
package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
104 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
|
105 index 39bb592..41d561b 100644 |
|
3978a82b1cb4
package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
106 --- 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
|
107 +++ 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
|
108 @@ -36,6 +36,7 @@ |
|
3978a82b1cb4
package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
109 |
|
3978a82b1cb4
package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
110 #include "xineutils.h" |
|
3978a82b1cb4
package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
111 #include "scratch.h" |
|
3978a82b1cb4
package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
112 +#include "localtime_r.h" |
|
3978a82b1cb4
package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
113 |
|
3978a82b1cb4
package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
114 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
|
115 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
|
116 -- |
| 2583 | 117 1.7.10.4 |
| 118 | |
| 119 | |
| 120 From 0d3546c3c12a8bf311c9751f0d0d2e3a95569657 Mon Sep 17 00:00:00 2001 | |
| 121 From: Mark Brand <mabrand@mabrand.nl> | |
| 122 Date: Sun, 27 May 2012 23:23:19 +0200 | |
| 123 Subject: [PATCH 4/4] ffmpeg 0.11 removed avcodec_init | |
| 124 | |
| 125 --- | |
| 126 src/combined/ffmpeg/ffmpeg_decoder.c | 1 - | |
| 127 1 file changed, 1 deletion(-) | |
|
2561
3978a82b1cb4
package xine-lib: provide localtime_r from old pthreads
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
128 |
| 2583 | 129 diff --git a/src/combined/ffmpeg/ffmpeg_decoder.c b/src/combined/ffmpeg/ffmpeg_decoder.c |
| 130 index 879df53..84ee1a3 100644 | |
| 131 --- a/src/combined/ffmpeg/ffmpeg_decoder.c | |
| 132 +++ b/src/combined/ffmpeg/ffmpeg_decoder.c | |
| 133 @@ -312,7 +312,6 @@ void avcodec_register_all(void) | |
| 134 | |
| 135 void init_once_routine(void) { | |
| 136 pthread_mutex_init(&ffmpeg_lock, NULL); | |
| 137 - avcodec_init(); | |
| 138 avcodec_register_all(); | |
| 139 } | |
| 140 | |
| 141 -- | |
| 142 1.7.10.4 | |
| 143 |