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