diff options
author | Tony Theodore <tonyt@logyst.com> | 2015-12-04 05:04:18 (GMT) |
---|---|---|
committer | Tony Theodore <tonyt@logyst.com> | 2015-12-04 05:04:18 (GMT) |
commit | 50ee67f88b207cd5acc5e105fc6fe7ac64bbe966 (patch) | |
tree | ae076073c6d7851ab0c613710ac96bfd474dc332 /src | |
parent | 3dbae68a7494e8b35661c5feb593381ce472c371 (diff) | |
download | mxe-50ee67f88b207cd5acc5e105fc6fe7ac64bbe966.zip mxe-50ee67f88b207cd5acc5e105fc6fe7ac64bbe966.tar.gz mxe-50ee67f88b207cd5acc5e105fc6fe7ac64bbe966.tar.bz2 |
xine-lib: remove mman-win32 renaming patch
Diffstat (limited to 'src')
-rw-r--r-- | src/xine-lib-5-change_mma_h_to_mma_win32_h.patch | 303 |
1 files changed, 0 insertions, 303 deletions
diff --git a/src/xine-lib-5-change_mma_h_to_mma_win32_h.patch b/src/xine-lib-5-change_mma_h_to_mma_win32_h.patch deleted file mode 100644 index 122abb4..0000000 --- a/src/xine-lib-5-change_mma_h_to_mma_win32_h.patch +++ /dev/null @@ -1,303 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -diff -urN xine-lib-1.2.4/contrib/libdha/irq.c xine-lib-1.2.4-patch/contrib/libdha/irq.c ---- xine-lib-1.2.4/contrib/libdha/irq.c 2012-02-05 21:16:59.000000000 +0200 -+++ xine-lib-1.2.4-patch/contrib/libdha/irq.c 2014-01-05 14:30:37.000000000 +0200 -@@ -2,7 +2,7 @@ - #include <stdio.h> - #include <sys/ioctl.h> - #include <sys/types.h> --#include <sys/mman.h> /* mlock */ -+#include <sys/mman-win32.h> /* mlock */ - #include <pthread.h> - #include <errno.h> - #include <unistd.h> -diff -urN xine-lib-1.2.4/contrib/libdha/kernelhelper/test.c xine-lib-1.2.4-patch/contrib/libdha/kernelhelper/test.c ---- xine-lib-1.2.4/contrib/libdha/kernelhelper/test.c 2012-02-05 21:16:59.000000000 +0200 -+++ xine-lib-1.2.4-patch/contrib/libdha/kernelhelper/test.c 2014-01-05 14:30:37.000000000 +0200 -@@ -4,7 +4,7 @@ - #include <unistd.h> - #include <errno.h> - #include <fcntl.h> --#include <sys/mman.h> -+#include <sys/mman-win32.h> - #include <stdlib.h> - - #include "dhahelper.h" -diff -urN xine-lib-1.2.4/contrib/libdha/libdha.c xine-lib-1.2.4-patch/contrib/libdha/libdha.c ---- xine-lib-1.2.4/contrib/libdha/libdha.c 2012-02-05 21:16:59.000000000 +0200 -+++ xine-lib-1.2.4-patch/contrib/libdha/libdha.c 2014-01-05 14:30:37.000000000 +0200 -@@ -58,7 +58,7 @@ - # endif /* SVR4 */ - - /* Generic version */ --#include <sys/mman.h> -+#include <sys/mman-win32.h> - #include <sys/ioctl.h> - #ifndef DEV_MEM - #define DEV_MEM "/dev/mem" -diff -urN xine-lib-1.2.4/contrib/libdha/mmi.c xine-lib-1.2.4-patch/contrib/libdha/mmi.c ---- xine-lib-1.2.4/contrib/libdha/mmi.c 2012-02-05 21:16:59.000000000 +0200 -+++ xine-lib-1.2.4-patch/contrib/libdha/mmi.c 2014-01-05 14:30:37.000000000 +0200 -@@ -2,7 +2,7 @@ - #include <stdio.h> - #include <sys/ioctl.h> - #include <sys/types.h> --#include <sys/mman.h> /* mlock */ -+#include <sys/mman-win32.h> /* mlock */ - #include <errno.h> - #include <unistd.h> - #include <fcntl.h> -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 ---- xine-lib-1.2.4/contrib/vidix/drivers/mach64_vid.c 2012-02-05 21:17:00.000000000 +0200 -+++ xine-lib-1.2.4-patch/contrib/vidix/drivers/mach64_vid.c 2014-01-05 14:30:35.000000000 +0200 -@@ -13,7 +13,7 @@ - #include <inttypes.h> - #include <fcntl.h> - #include <limits.h> --#include <sys/mman.h> /* for m(un)lock */ -+#include <sys/mman-win32.h> /* for m(un)lock */ - #ifdef HAVE_MALLOC_H - #include <malloc.h> - #ifdef HAVE_MEMALIGN -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 ---- xine-lib-1.2.4/contrib/vidix/drivers/pm3_vid.c 2012-02-05 21:17:00.000000000 +0200 -+++ xine-lib-1.2.4-patch/contrib/vidix/drivers/pm3_vid.c 2014-01-05 14:30:35.000000000 +0200 -@@ -24,7 +24,7 @@ - #include <string.h> - #include <inttypes.h> - #include <unistd.h> --#include <sys/mman.h> -+#include <sys/mman-win32.h> - - #include "vidix.h" - #include "fourcc.h" -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 ---- xine-lib-1.2.4/contrib/vidix/drivers/radeon_vid.c 2012-02-05 21:17:00.000000000 +0200 -+++ xine-lib-1.2.4-patch/contrib/vidix/drivers/radeon_vid.c 2014-01-05 14:30:36.000000000 +0200 -@@ -12,7 +12,7 @@ - #include <math.h> - #include <inttypes.h> - #include <sys/types.h> --#include <sys/mman.h> -+#include <sys/mman-win32.h> - #include "bswap.h" - #include "pci_ids.h" - #include "pci_names.h" -diff -urN xine-lib-1.2.4/include/configure.h.in xine-lib-1.2.4-patch/include/configure.h.in ---- xine-lib-1.2.4/include/configure.h.in 2013-09-20 16:07:56.000000000 +0300 -+++ xine-lib-1.2.4-patch/include/configure.h.in 2014-01-05 14:39:09.000000000 +0200 -@@ -441,7 +441,7 @@ - /* Define to 1 if you have the <sys/mixer.h> header file. */ - #undef HAVE_SYS_MIXER_H - --/* Define to 1 if you have the <sys/mman.h> header file. */ -+/* Define to 1 if you have the <sys/mman-win32.h> header file. */ - #undef HAVE_SYS_MMAN_H - - /* Define to 1 if you have the <sys/param.h> header file. */ -diff -urN xine-lib-1.2.4/src/input/input_file.c xine-lib-1.2.4-patch/src/input/input_file.c ---- xine-lib-1.2.4/src/input/input_file.c 2013-09-18 13:04:54.000000000 +0300 -+++ xine-lib-1.2.4-patch/src/input/input_file.c 2014-01-05 14:30:30.000000000 +0200 -@@ -35,7 +35,7 @@ - #include <errno.h> - - #ifdef HAVE_MMAP --#include <sys/mman.h> -+#include <sys/mman-win32.h> - #endif - - #define LOG_MODULE "input_file" -diff -urN xine-lib-1.2.4/src/input/input_v4l2.c xine-lib-1.2.4-patch/src/input/input_v4l2.c ---- xine-lib-1.2.4/src/input/input_v4l2.c 2012-02-05 21:17:02.000000000 +0200 -+++ xine-lib-1.2.4-patch/src/input/input_v4l2.c 2014-01-05 14:30:30.000000000 +0200 -@@ -44,7 +44,7 @@ - #else - # include <linux/videodev2.h> - #endif --#include <sys/mman.h> -+#include <sys/mman-win32.h> - #include <stdio.h> - #include <errno.h> - -diff -urN xine-lib-1.2.4/src/input/input_v4l.c xine-lib-1.2.4-patch/src/input/input_v4l.c ---- xine-lib-1.2.4/src/input/input_v4l.c 2013-09-18 13:04:54.000000000 +0300 -+++ xine-lib-1.2.4-patch/src/input/input_v4l.c 2014-01-05 14:30:26.000000000 +0200 -@@ -49,7 +49,7 @@ - - #include <linux/videodev.h> - #include <sys/ioctl.h> --#include <sys/mman.h> -+#include <sys/mman-win32.h> - #include <errno.h> - - /* Used to capture the audio data */ -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 ---- xine-lib-1.2.4/src/libw32dll/DirectShow/DS_VideoDecoder.c 2009-12-02 20:32:57.000000000 +0200 -+++ xine-lib-1.2.4-patch/src/libw32dll/DirectShow/DS_VideoDecoder.c 2014-01-05 14:29:19.000000000 +0200 -@@ -45,7 +45,7 @@ - #include <fcntl.h> - #include <errno.h> - #include <sys/types.h> --#include <sys/mman.h> -+#include <sys/mman-win32.h> - #include <stdio.h> - #include <stdlib.h> // labs - -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 ---- xine-lib-1.2.4/src/libw32dll/dmo/DMO_VideoDecoder.c 2009-12-02 20:32:57.000000000 +0200 -+++ xine-lib-1.2.4-patch/src/libw32dll/dmo/DMO_VideoDecoder.c 2014-01-05 14:29:15.000000000 +0200 -@@ -49,7 +49,7 @@ - #include <fcntl.h> - #include <errno.h> - #include <sys/types.h> --#include <sys/mman.h> -+#include <sys/mman-win32.h> - #include <stdio.h> - #include <stdlib.h> // labs - -diff -urN xine-lib-1.2.4/src/libw32dll/wine/ext.c xine-lib-1.2.4-patch/src/libw32dll/wine/ext.c ---- xine-lib-1.2.4/src/libw32dll/wine/ext.c 2009-11-30 23:28:52.000000000 +0200 -+++ xine-lib-1.2.4-patch/src/libw32dll/wine/ext.c 2014-01-05 14:29:18.000000000 +0200 -@@ -12,7 +12,7 @@ - #include <malloc.h> - #endif - #include <unistd.h> --#include <sys/mman.h> -+#include <sys/mman-win32.h> - #include <errno.h> - #include <fcntl.h> - #include <string.h> -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 ---- xine-lib-1.2.4/src/libw32dll/wine/ldt_keeper.c 2013-09-18 13:04:54.000000000 +0300 -+++ xine-lib-1.2.4-patch/src/libw32dll/wine/ldt_keeper.c 2014-01-05 14:29:18.000000000 +0200 -@@ -57,7 +57,7 @@ - #include <stdlib.h> - #include <errno.h> - #include <fcntl.h> --#include <sys/mman.h> -+#include <sys/mman-win32.h> - #include <sys/types.h> - #include <stdio.h> - #include <unistd.h> -diff -urN xine-lib-1.2.4/src/libw32dll/wine/module.c xine-lib-1.2.4-patch/src/libw32dll/wine/module.c ---- xine-lib-1.2.4/src/libw32dll/wine/module.c 2009-11-30 23:28:52.000000000 +0200 -+++ xine-lib-1.2.4-patch/src/libw32dll/wine/module.c 2014-01-05 14:29:16.000000000 +0200 -@@ -19,7 +19,7 @@ - #include <stdlib.h> - #include <string.h> - #include <unistd.h> --#include <sys/mman.h> -+#include <sys/mman-win32.h> - #include <sys/types.h> - - -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 ---- xine-lib-1.2.4/src/libw32dll/wine/pe_image.c 2009-11-30 23:28:52.000000000 +0200 -+++ xine-lib-1.2.4-patch/src/libw32dll/wine/pe_image.c 2014-01-05 14:29:18.000000000 +0200 -@@ -45,7 +45,7 @@ - #include <sys/stat.h> - #include <fcntl.h> - #ifdef HAVE_SYS_MMAN_H --#include <sys/mman.h> -+#include <sys/mman-win32.h> - #endif - #ifdef HAVE_ALLOCA_H - #include <alloca.h> -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 ---- xine-lib-1.2.4/src/video_out/video_out_aa.c 2013-09-18 13:04:54.000000000 +0300 -+++ xine-lib-1.2.4-patch/src/video_out/video_out_aa.c 2014-01-05 14:29:48.000000000 +0200 -@@ -32,7 +32,7 @@ - #include <fcntl.h> - #include <errno.h> - #include <sys/stat.h> --#include <sys/mman.h> -+#include <sys/mman-win32.h> - #include <sys/time.h> - - #ifdef HAVE_FFMPEG_AVUTIL_H -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 ---- xine-lib-1.2.4/src/video_out/video_out_caca.c 2013-09-18 13:04:54.000000000 +0300 -+++ xine-lib-1.2.4-patch/src/video_out/video_out_caca.c 2014-01-05 14:29:41.000000000 +0200 -@@ -32,7 +32,7 @@ - #include <fcntl.h> - #include <errno.h> - #include <sys/stat.h> --#include <sys/mman.h> -+#include <sys/mman-win32.h> - #include <sys/time.h> - #include <cucul.h> - #include <caca.h> -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 ---- xine-lib-1.2.4/src/video_out/video_out_fb.c 2013-09-18 13:04:54.000000000 +0300 -+++ xine-lib-1.2.4-patch/src/video_out/video_out_fb.c 2014-01-05 14:29:53.000000000 +0200 -@@ -60,7 +60,7 @@ - #include <sys/shm.h> - #include <sys/time.h> - #include <sys/ioctl.h> --#include <sys/mman.h> -+#include <sys/mman-win32.h> - - #include <pthread.h> - #include <netinet/in.h> -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 ---- xine-lib-1.2.4/src/video_out/video_out_pgx32.c 2013-09-18 13:04:54.000000000 +0300 -+++ xine-lib-1.2.4-patch/src/video_out/video_out_pgx32.c 2014-01-05 14:29:51.000000000 +0200 -@@ -34,7 +34,7 @@ - #include <unistd.h> - #include <sys/fbio.h> - #include <sys/visual_io.h> --#include <sys/mman.h> -+#include <sys/mman-win32.h> - - #include <X11/Xlib.h> - #include <X11/Xutil.h> -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 ---- xine-lib-1.2.4/src/video_out/video_out_pgx64.c 2013-09-18 13:04:54.000000000 +0300 -+++ xine-lib-1.2.4-patch/src/video_out/video_out_pgx64.c 2014-01-05 14:29:44.000000000 +0200 -@@ -36,7 +36,7 @@ - #include <unistd.h> - #include <sys/fbio.h> - #include <sys/visual_io.h> --#include <sys/mman.h> -+#include <sys/mman-win32.h> - - #include <X11/Xlib.h> - #include <X11/Xutil.h> -diff -urN xine-lib-1.2.4/src/xine-utils/xmlparser.c xine-lib-1.2.4-patch/src/xine-utils/xmlparser.c ---- xine-lib-1.2.4/src/xine-utils/xmlparser.c 2013-09-18 13:04:54.000000000 +0300 -+++ xine-lib-1.2.4-patch/src/xine-utils/xmlparser.c 2014-01-05 14:30:22.000000000 +0200 -@@ -879,7 +879,7 @@ - } - - #ifdef XINE_XML_PARSER_TEST --#include <sys/mman.h> -+#include <sys/mman-win32.h> - #include <sys/types.h> - #include <sys/stat.h> - #include <fcntl.h> -diff -urN xine-lib-1.2.4/win32/config.h xine-lib-1.2.4-patch/win32/config.h ---- xine-lib-1.2.4/win32/config.h 2012-02-05 21:17:03.000000000 +0200 -+++ xine-lib-1.2.4-patch/win32/config.h 2014-01-05 14:28:32.000000000 +0200 -@@ -273,7 +273,7 @@ - /* Define to 1 if you have the <sys/mixer.h> header file. */ - /* #undef HAVE_SYS_MIXER_H */ - --/* Define to 1 if you have the <sys/mman.h> header file. */ -+/* Define to 1 if you have the <sys/mman-win32.h> header file. */ - #define HAVE_SYS_MMAN_H 1 - - /* Define to 1 if you have the <sys/param.h> header file. */ -diff -urN xine-lib-1.2.4/win32/include/msvc/config.h xine-lib-1.2.4-patch/win32/include/msvc/config.h ---- xine-lib-1.2.4/win32/include/msvc/config.h 2009-11-30 23:26:06.000000000 +0200 -+++ xine-lib-1.2.4-patch/win32/include/msvc/config.h 2014-01-05 14:28:32.000000000 +0200 -@@ -425,7 +425,7 @@ - /* Define to 1 if you have the <sys/mixer.h> header file. */ - /* #undef HAVE_SYS_MIXER_H */ - --/* Define to 1 if you have the <sys/mman.h> header file. */ -+/* Define to 1 if you have the <sys/mman-win32.h> header file. */ - /* #undef HAVE_SYS_MMAN_H */ - - /* Define to 1 if you have the <sys/param.h> header file. */ |