Mercurial > mxe-octave
annotate src/xine-lib-5-change_mma_h_to_mma_win32_h.patch @ 5893:53a6c7df43f8
Mesa 3D: Update to version 21.1.8.
* src/mesa.mk: Update version and checksum.
* src/mesa-2-uninitialized.patch: Remove file.
* dist-files.mk: Remove file from list.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Thu, 16 Sep 2021 22:37:45 +0200 |
| 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/contrib/libdha/irq.c xine-lib-1.2.4-patch/contrib/libdha/irq.c |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
5 --- xine-lib-1.2.4/contrib/libdha/irq.c 2012-02-05 21:16:59.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
6 +++ xine-lib-1.2.4-patch/contrib/libdha/irq.c 2014-01-05 14:30:37.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
7 @@ -2,7 +2,7 @@ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
8 #include <stdio.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
9 #include <sys/ioctl.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
10 #include <sys/types.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
11 -#include <sys/mman.h> /* mlock */ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
12 +#include <sys/mman-win32.h> /* mlock */ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
13 #include <pthread.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
14 #include <errno.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
15 #include <unistd.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
16 diff -urN xine-lib-1.2.4/contrib/libdha/kernelhelper/test.c xine-lib-1.2.4-patch/contrib/libdha/kernelhelper/test.c |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
17 --- xine-lib-1.2.4/contrib/libdha/kernelhelper/test.c 2012-02-05 21:16:59.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
18 +++ xine-lib-1.2.4-patch/contrib/libdha/kernelhelper/test.c 2014-01-05 14:30:37.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
19 @@ -4,7 +4,7 @@ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
20 #include <unistd.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
21 #include <errno.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
22 #include <fcntl.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
23 -#include <sys/mman.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
24 +#include <sys/mman-win32.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
25 #include <stdlib.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
26 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
27 #include "dhahelper.h" |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
28 diff -urN xine-lib-1.2.4/contrib/libdha/libdha.c xine-lib-1.2.4-patch/contrib/libdha/libdha.c |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
29 --- xine-lib-1.2.4/contrib/libdha/libdha.c 2012-02-05 21:16:59.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
30 +++ xine-lib-1.2.4-patch/contrib/libdha/libdha.c 2014-01-05 14:30:37.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
31 @@ -58,7 +58,7 @@ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
32 # endif /* SVR4 */ |
|
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 /* Generic version */ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
35 -#include <sys/mman.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
36 +#include <sys/mman-win32.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
37 #include <sys/ioctl.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
38 #ifndef DEV_MEM |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
39 #define DEV_MEM "/dev/mem" |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
40 diff -urN xine-lib-1.2.4/contrib/libdha/mmi.c xine-lib-1.2.4-patch/contrib/libdha/mmi.c |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
41 --- xine-lib-1.2.4/contrib/libdha/mmi.c 2012-02-05 21:16:59.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
42 +++ xine-lib-1.2.4-patch/contrib/libdha/mmi.c 2014-01-05 14:30:37.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
43 @@ -2,7 +2,7 @@ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
44 #include <stdio.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
45 #include <sys/ioctl.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
46 #include <sys/types.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
47 -#include <sys/mman.h> /* mlock */ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
48 +#include <sys/mman-win32.h> /* mlock */ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
49 #include <errno.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
50 #include <unistd.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
51 #include <fcntl.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
52 diff -urN xine-lib-1.2.4/contrib/vidix/drivers/mach64_vid.c xine-lib-1.2.4-patch/contrib/vidix/drivers/mach64_vid.c |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
53 --- xine-lib-1.2.4/contrib/vidix/drivers/mach64_vid.c 2012-02-05 21:17:00.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
54 +++ xine-lib-1.2.4-patch/contrib/vidix/drivers/mach64_vid.c 2014-01-05 14:30:35.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
55 @@ -13,7 +13,7 @@ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
56 #include <inttypes.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
57 #include <fcntl.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
58 #include <limits.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
59 -#include <sys/mman.h> /* for m(un)lock */ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
60 +#include <sys/mman-win32.h> /* for m(un)lock */ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
61 #ifdef HAVE_MALLOC_H |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
62 #include <malloc.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
63 #ifdef HAVE_MEMALIGN |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
64 diff -urN xine-lib-1.2.4/contrib/vidix/drivers/pm3_vid.c xine-lib-1.2.4-patch/contrib/vidix/drivers/pm3_vid.c |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
65 --- xine-lib-1.2.4/contrib/vidix/drivers/pm3_vid.c 2012-02-05 21:17:00.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
66 +++ xine-lib-1.2.4-patch/contrib/vidix/drivers/pm3_vid.c 2014-01-05 14:30:35.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
67 @@ -24,7 +24,7 @@ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
68 #include <string.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
69 #include <inttypes.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
70 #include <unistd.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
71 -#include <sys/mman.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
72 +#include <sys/mman-win32.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
73 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
74 #include "vidix.h" |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
75 #include "fourcc.h" |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
76 diff -urN xine-lib-1.2.4/contrib/vidix/drivers/radeon_vid.c xine-lib-1.2.4-patch/contrib/vidix/drivers/radeon_vid.c |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
77 --- xine-lib-1.2.4/contrib/vidix/drivers/radeon_vid.c 2012-02-05 21:17:00.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
78 +++ xine-lib-1.2.4-patch/contrib/vidix/drivers/radeon_vid.c 2014-01-05 14:30:36.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
79 @@ -12,7 +12,7 @@ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
80 #include <math.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
81 #include <inttypes.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
82 #include <sys/types.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
83 -#include <sys/mman.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
84 +#include <sys/mman-win32.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
85 #include "bswap.h" |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
86 #include "pci_ids.h" |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
87 #include "pci_names.h" |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
88 diff -urN xine-lib-1.2.4/include/configure.h.in xine-lib-1.2.4-patch/include/configure.h.in |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
89 --- xine-lib-1.2.4/include/configure.h.in 2013-09-20 16:07:56.000000000 +0300 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
90 +++ xine-lib-1.2.4-patch/include/configure.h.in 2014-01-05 14:39:09.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
91 @@ -441,7 +441,7 @@ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
92 /* Define to 1 if you have the <sys/mixer.h> header file. */ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
93 #undef HAVE_SYS_MIXER_H |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
94 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
95 -/* Define to 1 if you have the <sys/mman.h> header file. */ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
96 +/* Define to 1 if you have the <sys/mman-win32.h> header file. */ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
97 #undef HAVE_SYS_MMAN_H |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
98 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
99 /* Define to 1 if you have the <sys/param.h> header file. */ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
100 diff -urN xine-lib-1.2.4/src/input/input_file.c xine-lib-1.2.4-patch/src/input/input_file.c |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
101 --- xine-lib-1.2.4/src/input/input_file.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
|
102 +++ xine-lib-1.2.4-patch/src/input/input_file.c 2014-01-05 14:30:30.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
103 @@ -35,7 +35,7 @@ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
104 #include <errno.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
105 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
106 #ifdef HAVE_MMAP |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
107 -#include <sys/mman.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
108 +#include <sys/mman-win32.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
109 #endif |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
110 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
111 #define LOG_MODULE "input_file" |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
112 diff -urN xine-lib-1.2.4/src/input/input_v4l2.c xine-lib-1.2.4-patch/src/input/input_v4l2.c |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
113 --- xine-lib-1.2.4/src/input/input_v4l2.c 2012-02-05 21:17:02.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
114 +++ xine-lib-1.2.4-patch/src/input/input_v4l2.c 2014-01-05 14:30:30.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
115 @@ -44,7 +44,7 @@ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
116 #else |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
117 # include <linux/videodev2.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
118 #endif |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
119 -#include <sys/mman.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
120 +#include <sys/mman-win32.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
121 #include <stdio.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
122 #include <errno.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
123 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
124 diff -urN xine-lib-1.2.4/src/input/input_v4l.c xine-lib-1.2.4-patch/src/input/input_v4l.c |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
125 --- xine-lib-1.2.4/src/input/input_v4l.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
|
126 +++ xine-lib-1.2.4-patch/src/input/input_v4l.c 2014-01-05 14:30:26.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
127 @@ -49,7 +49,7 @@ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
128 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
129 #include <linux/videodev.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
130 #include <sys/ioctl.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
131 -#include <sys/mman.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
132 +#include <sys/mman-win32.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
133 #include <errno.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
134 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
135 /* Used to capture the audio data */ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
136 diff -urN xine-lib-1.2.4/src/libw32dll/DirectShow/DS_VideoDecoder.c xine-lib-1.2.4-patch/src/libw32dll/DirectShow/DS_VideoDecoder.c |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
137 --- xine-lib-1.2.4/src/libw32dll/DirectShow/DS_VideoDecoder.c 2009-12-02 20:32:57.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
138 +++ xine-lib-1.2.4-patch/src/libw32dll/DirectShow/DS_VideoDecoder.c 2014-01-05 14:29:19.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
139 @@ -45,7 +45,7 @@ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
140 #include <fcntl.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
141 #include <errno.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
142 #include <sys/types.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
143 -#include <sys/mman.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
144 +#include <sys/mman-win32.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
145 #include <stdio.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
146 #include <stdlib.h> // labs |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
147 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
148 diff -urN xine-lib-1.2.4/src/libw32dll/dmo/DMO_VideoDecoder.c xine-lib-1.2.4-patch/src/libw32dll/dmo/DMO_VideoDecoder.c |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
149 --- xine-lib-1.2.4/src/libw32dll/dmo/DMO_VideoDecoder.c 2009-12-02 20:32:57.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
150 +++ xine-lib-1.2.4-patch/src/libw32dll/dmo/DMO_VideoDecoder.c 2014-01-05 14:29:15.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
151 @@ -49,7 +49,7 @@ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
152 #include <fcntl.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
153 #include <errno.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
154 #include <sys/types.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
155 -#include <sys/mman.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
156 +#include <sys/mman-win32.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
157 #include <stdio.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
158 #include <stdlib.h> // labs |
|
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 diff -urN xine-lib-1.2.4/src/libw32dll/wine/ext.c xine-lib-1.2.4-patch/src/libw32dll/wine/ext.c |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
161 --- xine-lib-1.2.4/src/libw32dll/wine/ext.c 2009-11-30 23:28:52.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
162 +++ xine-lib-1.2.4-patch/src/libw32dll/wine/ext.c 2014-01-05 14:29:18.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
163 @@ -12,7 +12,7 @@ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
164 #include <malloc.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
165 #endif |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
166 #include <unistd.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
167 -#include <sys/mman.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
168 +#include <sys/mman-win32.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
169 #include <errno.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
170 #include <fcntl.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
171 #include <string.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
172 diff -urN xine-lib-1.2.4/src/libw32dll/wine/ldt_keeper.c xine-lib-1.2.4-patch/src/libw32dll/wine/ldt_keeper.c |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
173 --- xine-lib-1.2.4/src/libw32dll/wine/ldt_keeper.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
|
174 +++ xine-lib-1.2.4-patch/src/libw32dll/wine/ldt_keeper.c 2014-01-05 14:29:18.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
175 @@ -57,7 +57,7 @@ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
176 #include <stdlib.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
177 #include <errno.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
178 #include <fcntl.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
179 -#include <sys/mman.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
180 +#include <sys/mman-win32.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
181 #include <sys/types.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
182 #include <stdio.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
183 #include <unistd.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
184 diff -urN xine-lib-1.2.4/src/libw32dll/wine/module.c xine-lib-1.2.4-patch/src/libw32dll/wine/module.c |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
185 --- xine-lib-1.2.4/src/libw32dll/wine/module.c 2009-11-30 23:28:52.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
186 +++ xine-lib-1.2.4-patch/src/libw32dll/wine/module.c 2014-01-05 14:29:16.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
187 @@ -19,7 +19,7 @@ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
188 #include <stdlib.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
189 #include <string.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
190 #include <unistd.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
191 -#include <sys/mman.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
192 +#include <sys/mman-win32.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
193 #include <sys/types.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
194 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
195 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
196 diff -urN xine-lib-1.2.4/src/libw32dll/wine/pe_image.c xine-lib-1.2.4-patch/src/libw32dll/wine/pe_image.c |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
197 --- xine-lib-1.2.4/src/libw32dll/wine/pe_image.c 2009-11-30 23:28:52.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
198 +++ xine-lib-1.2.4-patch/src/libw32dll/wine/pe_image.c 2014-01-05 14:29:18.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
199 @@ -45,7 +45,7 @@ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
200 #include <sys/stat.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
201 #include <fcntl.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
202 #ifdef HAVE_SYS_MMAN_H |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
203 -#include <sys/mman.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
204 +#include <sys/mman-win32.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
205 #endif |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
206 #ifdef HAVE_ALLOCA_H |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
207 #include <alloca.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
208 diff -urN xine-lib-1.2.4/src/video_out/video_out_aa.c xine-lib-1.2.4-patch/src/video_out/video_out_aa.c |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
209 --- xine-lib-1.2.4/src/video_out/video_out_aa.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
|
210 +++ xine-lib-1.2.4-patch/src/video_out/video_out_aa.c 2014-01-05 14:29:48.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
211 @@ -32,7 +32,7 @@ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
212 #include <fcntl.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
213 #include <errno.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
214 #include <sys/stat.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
215 -#include <sys/mman.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
216 +#include <sys/mman-win32.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
217 #include <sys/time.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
218 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
219 #ifdef HAVE_FFMPEG_AVUTIL_H |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
220 diff -urN xine-lib-1.2.4/src/video_out/video_out_caca.c xine-lib-1.2.4-patch/src/video_out/video_out_caca.c |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
221 --- xine-lib-1.2.4/src/video_out/video_out_caca.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
|
222 +++ xine-lib-1.2.4-patch/src/video_out/video_out_caca.c 2014-01-05 14:29:41.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
223 @@ -32,7 +32,7 @@ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
224 #include <fcntl.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
225 #include <errno.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
226 #include <sys/stat.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
227 -#include <sys/mman.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
228 +#include <sys/mman-win32.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
229 #include <sys/time.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
230 #include <cucul.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
231 #include <caca.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
232 diff -urN xine-lib-1.2.4/src/video_out/video_out_fb.c xine-lib-1.2.4-patch/src/video_out/video_out_fb.c |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
233 --- xine-lib-1.2.4/src/video_out/video_out_fb.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
|
234 +++ xine-lib-1.2.4-patch/src/video_out/video_out_fb.c 2014-01-05 14:29:53.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
235 @@ -60,7 +60,7 @@ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
236 #include <sys/shm.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
237 #include <sys/time.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
238 #include <sys/ioctl.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
239 -#include <sys/mman.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
240 +#include <sys/mman-win32.h> |
|
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 #include <pthread.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
243 #include <netinet/in.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
244 diff -urN xine-lib-1.2.4/src/video_out/video_out_pgx32.c xine-lib-1.2.4-patch/src/video_out/video_out_pgx32.c |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
245 --- xine-lib-1.2.4/src/video_out/video_out_pgx32.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
|
246 +++ xine-lib-1.2.4-patch/src/video_out/video_out_pgx32.c 2014-01-05 14:29:51.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
247 @@ -34,7 +34,7 @@ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
248 #include <unistd.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
249 #include <sys/fbio.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
250 #include <sys/visual_io.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
251 -#include <sys/mman.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
252 +#include <sys/mman-win32.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
253 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
254 #include <X11/Xlib.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
255 #include <X11/Xutil.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
256 diff -urN xine-lib-1.2.4/src/video_out/video_out_pgx64.c xine-lib-1.2.4-patch/src/video_out/video_out_pgx64.c |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
257 --- xine-lib-1.2.4/src/video_out/video_out_pgx64.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
|
258 +++ xine-lib-1.2.4-patch/src/video_out/video_out_pgx64.c 2014-01-05 14:29:44.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
259 @@ -36,7 +36,7 @@ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
260 #include <unistd.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
261 #include <sys/fbio.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
262 #include <sys/visual_io.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
263 -#include <sys/mman.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
264 +#include <sys/mman-win32.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
265 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
266 #include <X11/Xlib.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
267 #include <X11/Xutil.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
268 diff -urN xine-lib-1.2.4/src/xine-utils/xmlparser.c xine-lib-1.2.4-patch/src/xine-utils/xmlparser.c |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
269 --- xine-lib-1.2.4/src/xine-utils/xmlparser.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
|
270 +++ xine-lib-1.2.4-patch/src/xine-utils/xmlparser.c 2014-01-05 14:30:22.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
271 @@ -879,7 +879,7 @@ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
272 } |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
273 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
274 #ifdef XINE_XML_PARSER_TEST |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
275 -#include <sys/mman.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
276 +#include <sys/mman-win32.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
277 #include <sys/types.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
278 #include <sys/stat.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
279 #include <fcntl.h> |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
280 diff -urN xine-lib-1.2.4/win32/config.h xine-lib-1.2.4-patch/win32/config.h |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
281 --- xine-lib-1.2.4/win32/config.h 2012-02-05 21:17:03.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
282 +++ xine-lib-1.2.4-patch/win32/config.h 2014-01-05 14:28:32.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
283 @@ -273,7 +273,7 @@ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
284 /* Define to 1 if you have the <sys/mixer.h> header file. */ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
285 /* #undef HAVE_SYS_MIXER_H */ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
286 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
287 -/* Define to 1 if you have the <sys/mman.h> header file. */ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
288 +/* Define to 1 if you have the <sys/mman-win32.h> header file. */ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
289 #define HAVE_SYS_MMAN_H 1 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
290 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
291 /* Define to 1 if you have the <sys/param.h> header file. */ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
292 diff -urN xine-lib-1.2.4/win32/include/msvc/config.h xine-lib-1.2.4-patch/win32/include/msvc/config.h |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
293 --- xine-lib-1.2.4/win32/include/msvc/config.h 2009-11-30 23:26:06.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
294 +++ xine-lib-1.2.4-patch/win32/include/msvc/config.h 2014-01-05 14:28:32.000000000 +0200 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
295 @@ -425,7 +425,7 @@ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
296 /* Define to 1 if you have the <sys/mixer.h> header file. */ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
297 /* #undef HAVE_SYS_MIXER_H */ |
|
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 -/* Define to 1 if you have the <sys/mman.h> header file. */ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
300 +/* Define to 1 if you have the <sys/mman-win32.h> header file. */ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
301 /* #undef HAVE_SYS_MMAN_H */ |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
302 |
|
5aba05f2226e
update xine-lib, add mman-win32
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
303 /* Define to 1 if you have the <sys/param.h> header file. */ |