Mercurial > mxe-octave

comparison src/xine-lib-2-build_fixes.patch @ 3629:5aba05f2226e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update xine-lib, add mman-win32 * dist-files.mk: add mman-win32-1-include_name_change.patch, mman-win32.mk, add xine-lib-*.patch files. * index.html: add mman-win32 * src/mman-win32-1-include_name_change.patch: new file. * src/mman-win32.mk: new file. * src/xine-lib-1-configure_ac.patch: new file * src/xine-lib-1-fixes.patch: removed * src/xine-lib-2-build_fixes.patch: new file. * src/xine-lib-3-more_build_fixes.patch: new file * src/xine-lib-4-mkdir.patch: new file. * src/xine-lib-5-change_mma_h_to_mma_win32_h.patch: new file * src/xine-lib.mk: update version
author John Donoghue <john.donoghue@ieee.org>
date Sun, 29 Jun 2014 15:46:35 -0400
parents
children
comparison
equal deleted inserted replaced
3628:a98f4ebb8a3c 3629:5aba05f2226e
1 This file is part of MXE.
2 See index.html for further information.
3
4 diff -urN xine-lib-1.2.4/configure.ac xine-lib-1.2.4-patch/configure.ac
5 --- xine-lib-1.2.4/configure.ac 2013-12-17 11:45:43.657189416 +0200
6 +++ xine-lib-1.2.4-patch/configure.ac 2013-12-17 14:57:28.907822042 +0200
7 @@ -544,7 +544,7 @@
8
9 if test "$WIN32_SYS" = "mingw32"; then
10 WIN32_INCLUDES='-I$(top_srcdir)/win32/include'
11 - LIBS="-lwinmm -lwsock32 $LIBS"
12 + LIBS="-lwinmm -lwsock32 -lmman $LIBS"
13 LDFLAGS="-Wl,--enable-stdcall-fixup $LDFLAGS"
14 dnl iberty has been needed only in older versions
15 AC_CHECK_LIB(iberty, strncomp, [GOOM_LIBS="-liberty"])
16 diff -urN xine-lib-1.2.4/include/xine/xine_internal.h xine-lib-1.2.4-patch/include/xine/xine_internal.h
17 --- xine-lib-1.2.4/include/xine/xine_internal.h 2013-09-18 13:04:54.000000000 +0300
18 +++ xine-lib-1.2.4-patch/include/xine/xine_internal.h 2013-12-17 15:14:55.229127435 +0200
19 @@ -55,6 +55,26 @@
20 /* used by plugin loader */
21 #define XINE_VERSION_CODE XINE_MAJOR_VERSION*10000+XINE_MINOR_VERSION*100+XINE_SUB_VERSION
22
23 +// Add there to support them on MinGW
24 +#define timeradd(a, b, result) \
25 + do { \
26 + (result)->tv_sec = (a)->tv_sec + (b)->tv_sec; \
27 + (result)->tv_usec = (a)->tv_usec + (b)->tv_usec; \
28 + if ((result)->tv_usec >= 1000000L) { \
29 + ++(result)->tv_sec; \
30 + (result)->tv_usec -= 1000000L; \
31 + } \
32 + } while (0)
33 +
34 +#define timersub(a, b, result) \
35 + do { \
36 + (result)->tv_sec = (a)->tv_sec - (b)->tv_sec; \
37 + (result)->tv_usec = (a)->tv_usec - (b)->tv_usec; \
38 + if ((result)->tv_usec < 0) { \
39 + --(result)->tv_sec; \
40 + (result)->tv_usec += 1000000L; \
41 + } \
42 + } while (0)
43
44 /*
45 * log constants
46 diff -urN xine-lib-1.2.4/include/xine/xineutils.h xine-lib-1.2.4-patch/include/xine/xineutils.h
47 --- xine-lib-1.2.4/include/xine/xineutils.h 2013-09-18 13:04:54.000000000 +0300
48 +++ xine-lib-1.2.4-patch/include/xine/xineutils.h 2013-12-20 12:29:33.465030673 +0200
49 @@ -119,8 +119,8 @@
50
51
52 /* Optimized/fast memcpy */
53 -
54 -extern void *(* xine_fast_memcpy)(void *to, const void *from, size_t len) XINE_PROTECTED;
55 +//extern void *xine_fast_memcpy(void *to, const void *from, size_t len);
56 +#define xine_fast_memcpy(a, b, c) memcpy(a, b, c)
57
58 /*
59 * Debug stuff
60 diff -urN xine-lib-1.2.4/misc/Makefile.am xine-lib-1.2.4-patch/misc/Makefile.am
61 --- xine-lib-1.2.4/misc/Makefile.am 2012-02-05 21:17:01.000000000 +0200
62 +++ xine-lib-1.2.4-patch/misc/Makefile.am 2013-12-19 09:20:56.937982071 +0200
63 @@ -21,7 +21,7 @@
64 pkgconfig_DATA=libxine.pc
65
66 xine_list_@XINE_SERIES@_SOURCES = xine-list.c
67 -xine_list_@XINE_SERIES@_LDADD = $(XINE_LIB)
68 +xine_list_@XINE_SERIES@_LDADD = $(XINE_LIB) $(top_builddir)/src/xine-utils/libxineutils.la
69
70 fontdir = $(pkgdatadir)/fonts
71 dist_font_DATA = \
72 diff -urN xine-lib-1.2.4/src/audio_dec/xine_lpcm_decoder.c xine-lib-1.2.4-patch/src/audio_dec/xine_lpcm_decoder.c
73 --- xine-lib-1.2.4/src/audio_dec/xine_lpcm_decoder.c 2013-09-18 13:04:54.000000000 +0300
74 +++ xine-lib-1.2.4-patch/src/audio_dec/xine_lpcm_decoder.c 2013-12-17 15:18:20.459131654 +0200
75 @@ -41,7 +41,11 @@
76 #include <sys/types.h>
77 #include <sys/stat.h>
78 #include <fcntl.h>
79 +#ifdef __MINGW32__
80 +#include <winsock.h>
81 +#else
82 #include <arpa/inet.h> /* htons */
83 +#endif
84 #include <netinet/in.h> /* ntohs */
85
86 #include <xine/xine_internal.h>
87 diff -urN xine-lib-1.2.4/src/demuxers/demux_ts.c xine-lib-1.2.4-patch/src/demuxers/demux_ts.c
88 --- xine-lib-1.2.4/src/demuxers/demux_ts.c 2013-09-23 23:56:56.000000000 +0300
89 +++ xine-lib-1.2.4-patch/src/demuxers/demux_ts.c 2013-12-18 12:04:09.269573623 +0200
90 @@ -146,7 +146,11 @@
91 #include <fcntl.h>
92 #include <unistd.h>
93 #include <string.h>
94 -#include <arpa/inet.h>
95 +#ifdef __MINGW32__
96 +#include <winsock.h>
97 +#else
98 +#include <arpa/inet.h> /* htons */
99 +#endif
100
101 #ifdef HAVE_FFMPEG_AVUTIL_H
102 # include <crc.h>
103 diff -urN xine-lib-1.2.4/src/input/libdvdnav/dvdnav_internal.h xine-lib-1.2.4-patch/src/input/libdvdnav/dvdnav_internal.h
104 --- xine-lib-1.2.4/src/input/libdvdnav/dvdnav_internal.h 2009-11-30 23:28:34.000000000 +0200
105 +++ xine-lib-1.2.4-patch/src/input/libdvdnav/dvdnav_internal.h 2013-12-18 11:56:09.153450165 +0200
106 @@ -64,11 +64,11 @@
107 /* pthread_mutex_* wrapper for win32 */
108 #include <windows.h>
109 #include <process.h>
110 -typedef CRITICAL_SECTION pthread_mutex_t;
111 -#define pthread_mutex_init(a, b) InitializeCriticalSection(a)
112 -#define pthread_mutex_lock(a) EnterCriticalSection(a)
113 -#define pthread_mutex_unlock(a) LeaveCriticalSection(a)
114 -#define pthread_mutex_destroy(a)
115 +// typedef CRITICAL_SECTION pthread_mutex_t;
116 +// #define pthread_mutex_init(a, b) InitializeCriticalSection(a)
117 +// #define pthread_mutex_lock(a) EnterCriticalSection(a)
118 +// #define pthread_mutex_unlock(a) LeaveCriticalSection(a)
119 +// #define pthread_mutex_destroy(a)
120
121 #include <io.h> /* read() */
122 #define lseek64 _lseeki64
123 diff -urN xine-lib-1.2.4/src/post/deinterlace/speedy.c xine-lib-1.2.4-patch/src/post/deinterlace/speedy.c
124 --- xine-lib-1.2.4/src/post/deinterlace/speedy.c 2012-05-26 23:49:59.000000000 +0300
125 +++ xine-lib-1.2.4-patch/src/post/deinterlace/speedy.c 2013-12-20 12:24:59.608986588 +0200
126 @@ -1392,28 +1392,28 @@
127 }
128 #endif
129
130 -
131 -#define speedy_memcpy_c xine_fast_memcpy
132 -#define speedy_memcpy_mmx xine_fast_memcpy
133 -#define speedy_memcpy_mmxext xine_fast_memcpy
134 +//#undef xine_fast_memcpy
135 +//#define speedy_memcpy_c xine_fast_memcpy
136 +//#define speedy_memcpy_mmx xine_fast_memcpy
137 +//#define speedy_memcpy_mmxext xine_fast_memcpy
138
139
140 static void blit_packed422_scanline_c( uint8_t *dest, const uint8_t *src, int width )
141 {
142 - speedy_memcpy_c( dest, src, width*2 );
143 + memcpy( dest, src, width*2 );
144 }
145
146 #if defined(ARCH_X86) || defined(ARCH_X86_64)
147 static void blit_packed422_scanline_mmx( uint8_t *dest, const uint8_t *src, int width )
148 {
149 - speedy_memcpy_mmx( dest, src, width*2 );
150 + memcpy( dest, src, width*2 );
151 }
152 #endif
153
154 #if defined(ARCH_X86) || defined(ARCH_X86_64)
155 static void blit_packed422_scanline_mmxext( uint8_t *dest, const uint8_t *src, int width )
156 {
157 - speedy_memcpy_mmxext( dest, src, width*2 );
158 + memcpy( dest, src, width*2 );
159 }
160 #endif
161
162 @@ -2602,7 +2602,8 @@
163 kill_chroma_packed422_inplace_scanline = kill_chroma_packed422_inplace_scanline_c;
164 mirror_packed422_inplace_scanline = mirror_packed422_inplace_scanline_c;
165 halfmirror_packed422_inplace_scanline = halfmirror_packed422_inplace_scanline_c;
166 - speedy_memcpy = speedy_memcpy_c;
167 + speedy_memcpy = memcpy;
168 + //speedy_memcpy = speedy_memcpy_c;
169 diff_packed422_block8x8 = diff_packed422_block8x8_c;
170 a8_subpix_blit_scanline = a8_subpix_blit_scanline_c;
171 quarter_blit_vertical_packed422_scanline = quarter_blit_vertical_packed422_scanline_c;
172 @@ -2644,7 +2645,8 @@
173 invert_colour_packed422_inplace_scanline = invert_colour_packed422_inplace_scanline_mmx;
174 vfilter_chroma_121_packed422_scanline = vfilter_chroma_121_packed422_scanline_mmx;
175 vfilter_chroma_332_packed422_scanline = vfilter_chroma_332_packed422_scanline_mmx;
176 - speedy_memcpy = speedy_memcpy_mmxext;
177 + //speedy_memcpy = speedy_memcpy_mmxext;
178 + speedy_memcpy = memcpy;
179 } else if( speedy_accel & MM_ACCEL_X86_MMX ) {
180 if( verbose ) {
181 printf( "speedycode: Using MMX optimized functions.\n" );
182 @@ -2660,7 +2662,8 @@
183 invert_colour_packed422_inplace_scanline = invert_colour_packed422_inplace_scanline_mmx;
184 vfilter_chroma_121_packed422_scanline = vfilter_chroma_121_packed422_scanline_mmx;
185 vfilter_chroma_332_packed422_scanline = vfilter_chroma_332_packed422_scanline_mmx;
186 - speedy_memcpy = speedy_memcpy_mmx;
187 + //speedy_memcpy = speedy_memcpy_mmx;
188 + speedy_memcpy = memcpy;
189 } else {
190 if( verbose ) {
191 printf( "speedycode: No MMX or MMXEXT support detected, using C fallbacks.\n" );
192 diff -urN xine-lib-1.2.4/src/vdr/input_vdr.c xine-lib-1.2.4-patch/src/vdr/input_vdr.c
193 --- xine-lib-1.2.4/src/vdr/input_vdr.c 2013-09-18 13:04:54.000000000 +0300
194 +++ xine-lib-1.2.4-patch/src/vdr/input_vdr.c 2013-12-20 12:23:36.313756861 +0200
195 @@ -28,13 +28,13 @@
196 #include <fcntl.h>
197 #include <unistd.h>
198 #include <sys/stat.h>
199 -#include <sys/poll.h>
200 +// #include <sys/poll.h>
201 #include <errno.h>
202 #include <pthread.h>
203
204 #include <sys/socket.h>
205 #include <netinet/in.h>
206 -#include <resolv.h>
207 +// #include <resolv.h>
208 #include <netdb.h>
209
210 #define LOG_MODULE "input_vdr"
211 @@ -1919,7 +1919,7 @@
212 filename = strdup(filename);
213
214 _x_mrl_unescape (filename);
215 - this->fh = xine_open_cloexec(filename, O_RDONLY | O_NONBLOCK);
216 + this->fh = xine_open_cloexec(filename, O_RDONLY);
217
218 lprintf("filename '%s'\n", filename);
219
220 @@ -1934,7 +1934,7 @@
221 }
222
223 {
224 - struct pollfd poll_fh = { this->fh, POLLIN, 0 };
225 + /*struct pollfd poll_fh = { this->fh, POLLIN, 0 };
226
227 int r = poll(&poll_fh, 1, 300);
228 if (1 != r)
229 @@ -1945,10 +1945,10 @@
230 _("timeout expired during setup phase"));
231 free (filename);
232 return 0;
233 - }
234 + }*/
235 }
236
237 - fcntl(this->fh, F_SETFL, ~O_NONBLOCK & fcntl(this->fh, F_GETFL, 0));
238 + //fcntl(this->fh, F_SETFL, ~O_NONBLOCK & fcntl(this->fh, F_GETFL, 0));
239
240 /* eat initial handshake byte */
241 {
242 @@ -2098,7 +2098,7 @@
243 if ((this->fh = vdr_plugin_open_socket(this, host, port + 0)) == -1)
244 return 0;
245
246 - fcntl(this->fh, F_SETFL, ~O_NONBLOCK & fcntl(this->fh, F_GETFL, 0));
247 + //fcntl(this->fh, F_SETFL, ~O_NONBLOCK & fcntl(this->fh, F_GETFL, 0));
248
249 if ((this->fh_control = vdr_plugin_open_socket(this, host, port + 1)) == -1)
250 return 0;
251 diff -urN xine-lib-1.2.4/src/video_dec/libjpeg.c xine-lib-1.2.4-patch/src/video_dec/libjpeg.c
252 --- xine-lib-1.2.4/src/video_dec/libjpeg.c 2012-11-23 22:08:21.000000000 +0200
253 +++ xine-lib-1.2.4-patch/src/video_dec/libjpeg.c 2013-12-18 10:01:45.755428630 +0200
254 @@ -26,6 +26,7 @@
255 #endif
256
257
258 +
259 #include <stdlib.h>
260 #include <string.h>
261 #include <sys/types.h>
262 @@ -33,6 +34,7 @@
263 #include <fcntl.h>
264 #include <unistd.h>
265 #include <stdio.h>
266 +#include <basetsd.h>
267
268 #define LOG_MODULE "jpeg_video_decoder"
269 #define LOG_VERBOSE
270 diff -urN xine-lib-1.2.4/src/xine-utils/memcpy.c xine-lib-1.2.4-patch/src/xine-utils/memcpy.c
271 --- xine-lib-1.2.4/src/xine-utils/memcpy.c 2013-09-18 19:58:32.000000000 +0300
272 +++ xine-lib-1.2.4-patch/src/xine-utils/memcpy.c 2013-12-20 12:30:01.733448201 +0200
273 @@ -55,7 +55,7 @@
274 #include <xine/xine_internal.h>
275 #include "../xine-engine/xine_private.h"
276
277 -void *(* xine_fast_memcpy)(void *to, const void *from, size_t len);
278 +
279
280 /* Original comments from mplayer (file: aclib.c)
281 This part of code was taken by me from Linux-2.4.3 and slightly modified
282 @@ -558,7 +558,7 @@
283 && (config_flags & memcpy_method[method].cpu_require) ==
284 memcpy_method[method].cpu_require ) {
285 lprintf("using %s memcpy()\n", memcpy_method[method].name );
286 - xine_fast_memcpy = memcpy_method[method].function;
287 + // xine_fast_memcpy = memcpy_method[method].function;
288 return;
289 } else {
290 xprintf(xine, XINE_VERBOSITY_DEBUG, "xine: will probe memcpy on startup\n" );
291 @@ -603,13 +603,13 @@
292 (config_flags & memcpy_method[best].cpu_require) ==
293 memcpy_method[best].cpu_require ) {
294 lprintf("using %s memcpy()\n", memcpy_method[best].name );
295 - xine_fast_memcpy = memcpy_method[best].function;
296 + // xine_fast_memcpy = memcpy_method[best].function;
297 return;
298 }
299
300 best = 0;
301
302 - xine_fast_memcpy = memcpy;
303 + // xine_fast_memcpy = memcpy;
304
305 if( (buf1 = malloc(BUFSIZE)) == NULL )
306 return;