diff options
| -rw-r--r-- | src/libaacs-1.patch | 27 | ||||
| -rw-r--r-- | src/libbluray-1.patch | 25 | ||||
| -rw-r--r-- | src/libdvdcss-1.patch | 24 | ||||
| -rw-r--r-- | src/mingw-w64-1-float-h.patch | 25 | ||||
| -rw-r--r-- | src/mingw-w64-1.patch | 62 | ||||
| -rw-r--r-- | src/nsis-1-fixes.patch | 29 | ||||
| -rw-r--r-- | src/openal-1-fixes.patch | 23 | ||||
| -rw-r--r-- | src/poppler-1-win32.patch | 25 |
8 files changed, 72 insertions, 168 deletions
diff --git a/src/libaacs-1.patch b/src/libaacs-1.patch index 624a242..985fdce 100644 --- a/src/libaacs-1.patch +++ b/src/libaacs-1.patch @@ -4,7 +4,7 @@ See index.html for further information. From 5ebe4419738fd337f5c2f8e2849dd8e7c1f55d01 Mon Sep 17 00:00:00 2001 From: Timothy Gu <timothygu99@gmail.com> Date: Sat, 28 Mar 2015 21:06:26 +0100 -Subject: [PATCH 1/3] fix configure +Subject: [PATCH 1/2] fix configure diff --git a/configure.ac b/configure.ac @@ -36,7 +36,7 @@ index 155acad..8cb7e79 100644 From c807305d0df68e88aa04fabd3275aff4f34d4368 Mon Sep 17 00:00:00 2001 From: Timothy Gu <timothygu99@gmail.com> Date: Sat, 28 Mar 2015 21:06:56 +0100 -Subject: [PATCH 2/3] fix pkgconfig +Subject: [PATCH 2/2] fix pkgconfig diff --git a/src/libaacs.pc.in b/src/libaacs.pc.in @@ -53,26 +53,3 @@ index 598f206..4334d8c 100644 2.1.0 -From 638bb17ec1daf447def2706896e209dd22adb8ca Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Sat, 28 Mar 2015 21:03:45 +0100 -Subject: [PATCH 3/3] fix include order - - -diff --git a/src/file/dirs_win32.c b/src/file/dirs_win32.c -index 0e1208a..a037f8d 100644 ---- a/src/file/dirs_win32.c -+++ b/src/file/dirs_win32.c -@@ -28,8 +28,8 @@ - #include <stdio.h> - #include <string.h> - --#include <shlobj.h> - #include <windows.h> -+#include <shlobj.h> - #include <limits.h> - #include <direct.h> - --- -2.1.0 - diff --git a/src/libbluray-1.patch b/src/libbluray-1.patch index 5127364..ce6ceb7 100644 --- a/src/libbluray-1.patch +++ b/src/libbluray-1.patch @@ -4,7 +4,7 @@ See index.html for further information. From b9d39febfd23198c1f9758ffe400cb35a97c1223 Mon Sep 17 00:00:00 2001 From: Timothy Gu <timothygu99@gmail.com> Date: Sat, 28 Mar 2015 10:57:00 +0100 -Subject: [PATCH 1/2] fix strncasecmp +Subject: [PATCH] fix strncasecmp diff --git a/src/libbluray/bdnav/meta_parse.c b/src/libbluray/bdnav/meta_parse.c @@ -29,26 +29,3 @@ index a74ed6e..73ea57b 100644 2.1.0 -From 0fa51b86a9e606004c1c83226ed5dfc144de50e7 Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Sat, 28 Mar 2015 10:58:04 +0100 -Subject: [PATCH 2/2] fix include order - - -diff --git a/src/file/dirs_win32.c b/src/file/dirs_win32.c -index 4d1e51d..72bb03a 100644 ---- a/src/file/dirs_win32.c -+++ b/src/file/dirs_win32.c -@@ -29,8 +29,8 @@ - #include <stdio.h> - #include <string.h> - --#include <shlobj.h> - #include <windows.h> -+#include <shlobj.h> - #include <limits.h> - #include <direct.h> - --- -2.1.0 - diff --git a/src/libdvdcss-1.patch b/src/libdvdcss-1.patch deleted file mode 100644 index c5243c6..0000000 --- a/src/libdvdcss-1.patch +++ /dev/null @@ -1,24 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -From 269d376d164460d13b653a47db797bf22295e81c Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Sat, 28 Mar 2015 11:17:45 +0100 -Subject: [PATCH] add missing include - - -diff --git a/src/libdvdcss.c b/src/libdvdcss.c -index 6c4befc..bad76fc 100644 ---- a/src/libdvdcss.c -+++ b/src/libdvdcss.c -@@ -120,6 +120,7 @@ - #endif - - #if defined(_WIN32_IE) && _WIN32_IE >= 0x500 -+# include <windows.h> - # include <shlobj.h> - #endif - --- -2.1.0 - diff --git a/src/mingw-w64-1-float-h.patch b/src/mingw-w64-1-float-h.patch deleted file mode 100644 index 990a3b6..0000000 --- a/src/mingw-w64-1-float-h.patch +++ /dev/null @@ -1,25 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -workaround for -isystem flag messing up include order -https://bugzilla.redhat.com/show_bug.cgi?id=843436 - -diff -ur a/mingw-w64-headers/crt/float.h b/mingw-w64-headers/crt/float.h ---- a/mingw-w64-headers/crt/float.h 2014-01-11 21:38:50.640418500 +1100 -+++ b/mingw-w64-headers/crt/float.h 2014-01-11 21:44:08.528393903 +1100 -@@ -105,6 +105,15 @@ - #define DBL_MAX_10_EXP __DBL_MAX_10_EXP__ - #define LDBL_MAX_10_EXP __LDBL_MAX_10_EXP__ - -+ /* The difference between 1 and the least value greater than 1 that is -+ representable in the given floating point type, b**1-p. */ -+ #undef FLT_EPSILON -+ #undef DBL_EPSILON -+ #undef LDBL_EPSILON -+ #define FLT_EPSILON __FLT_EPSILON__ -+ #define DBL_EPSILON __DBL_EPSILON__ -+ #define LDBL_EPSILON __LDBL_EPSILON__ -+ - /* Addition rounds to 0: zero, 1: nearest, 2: +inf, 3: -inf, -1: unknown. */ - /* ??? This is supposed to change with calls to fesetround in <fenv.h>. */ - #undef FLT_ROUNDS diff --git a/src/mingw-w64-1.patch b/src/mingw-w64-1.patch new file mode 100644 index 0000000..f8d3208 --- /dev/null +++ b/src/mingw-w64-1.patch @@ -0,0 +1,62 @@ +This file is part of MXE. +See index.html for further information. + +From 8de1a5d893f5eba0d54731ad4eeff4b0128798be Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Sun, 29 Mar 2015 14:36:38 +0200 +Subject: [PATCH 1/2] workaround for -isystem flag messing up include order + +https://bugzilla.redhat.com/show_bug.cgi?id=843436 + +diff --git a/mingw-w64-headers/crt/float.h b/mingw-w64-headers/crt/float.h +index 5874f4e..c031ce0 100644 +--- a/mingw-w64-headers/crt/float.h ++++ b/mingw-w64-headers/crt/float.h +@@ -105,6 +105,15 @@ + #define DBL_MAX_10_EXP __DBL_MAX_10_EXP__ + #define LDBL_MAX_10_EXP __LDBL_MAX_10_EXP__ + ++ /* The difference between 1 and the least value greater than 1 that is ++ representable in the given floating point type, b**1-p. */ ++ #undef FLT_EPSILON ++ #undef DBL_EPSILON ++ #undef LDBL_EPSILON ++ #define FLT_EPSILON __FLT_EPSILON__ ++ #define DBL_EPSILON __DBL_EPSILON__ ++ #define LDBL_EPSILON __LDBL_EPSILON__ ++ + /* Addition rounds to 0: zero, 1: nearest, 2: +inf, 3: -inf, -1: unknown. */ + /* ??? This is supposed to change with calls to fesetround in <fenv.h>. */ + #undef FLT_ROUNDS +-- +2.1.0 + + +From 0637bae1999f6dcd7932d1d844db57f1e0c6104c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?= + =?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986@gmail.com> +Date: Wed, 18 Mar 2015 14:06:33 +0000 +Subject: [PATCH 2/2] Add more includes to shlobj.h + +wtypesbase.h and wincrypt.h pull some other headers, +together they all provide EXTERN_C, DECLSPEC_IMPORT and WINAPI macros, +which are needed by shlobj.h directly or indirectly. + +(cherry picked from commit 6c56d0b0eb5be9fbeb552ba070a2304b842a5102) + +diff --git a/mingw-w64-headers/include/shlobj.h b/mingw-w64-headers/include/shlobj.h +index 3d2e21c..be087c4 100644 +--- a/mingw-w64-headers/include/shlobj.h ++++ b/mingw-w64-headers/include/shlobj.h +@@ -6,6 +6,8 @@ + #ifndef _SHLOBJ_H_ + #define _SHLOBJ_H_ + ++#include <wtypesbase.h> ++#include <wincrypt.h> + #include <winapifamily.h> + + #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || defined(WINSTORECOMPAT) +-- +2.1.0 + diff --git a/src/nsis-1-fixes.patch b/src/nsis-1-fixes.patch index ac1bee8..ce53524 100644 --- a/src/nsis-1-fixes.patch +++ b/src/nsis-1-fixes.patch @@ -4,7 +4,7 @@ See index.html for further information. From 1cc3dd0dfd47bab82e06be916f9e57ef783406f9 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Sun, 12 Aug 2012 12:33:26 +0200 -Subject: [PATCH 1/5] explicit mingw cross prefix +Subject: [PATCH 1/4] explicit mingw cross prefix This patch has been taken from: http://sourceforge.net/tracker/index.php?func=detail&aid=3305366&group_id=22049&atid=373085 @@ -51,7 +51,7 @@ index 80872bc..4f113dd 100755 From 7df0fa80a65279ee7d99da8ec6abdddff7e040b0 Mon Sep 17 00:00:00 2001 From: freeman <free.man.uu@gmail.com> Date: Sun, 12 Aug 2012 12:36:39 +0200 -Subject: [PATCH 2/5] add missing header +Subject: [PATCH 2/4] add missing header diff --git a/Source/util.h b/Source/util.h @@ -73,7 +73,7 @@ index 4259a6a..664923e 100755 From 9a40694c9177db6fa5db3f28d7d68c042d0a6144 Mon Sep 17 00:00:00 2001 From: Tony Theodore <tonyt@logyst.com> Date: Fri, 3 May 2013 17:28:44 +1000 -Subject: [PATCH 3/5] Enable native 64-bit build +Subject: [PATCH 3/4] Enable native 64-bit build Taken from: http://anonscm.debian.org/gitweb/?p=collab-maint/nsis.git;a=blob;f=debian/patches/makensis_native_64bit.patch;h=2256a0e193db894dd99507ac0de66f8ae060b46b;hb=HEAD @@ -588,7 +588,7 @@ index 2c0b07f..18c31a2 100755 From eb6e12dd7173f4c259fd31c9074b0c95bc567487 Mon Sep 17 00:00:00 2001 From: Tony Theodore <tonyt@logyst.com> Date: Thu, 9 May 2013 13:08:59 +1000 -Subject: [PATCH 4/5] i686-w64-mingw32 fixes +Subject: [PATCH 4/4] i686-w64-mingw32 fixes diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp @@ -775,24 +775,3 @@ index 18c31a2..fc9443f 100755 2.1.0 -From 5a88cf1c8a78d9e627e6ee259ea0c09af712aac0 Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Sun, 29 Mar 2015 09:32:40 +0200 -Subject: [PATCH 5/5] add missing include - - -diff --git a/Source/exehead/Ui.c b/Source/exehead/Ui.c -index 7fe32ac..952b87e 100755 ---- a/Source/exehead/Ui.c -+++ b/Source/exehead/Ui.c -@@ -14,6 +14,7 @@ - * warranty. - */ - -+#include <windows.h> - #include <windowsx.h> - #include <shlobj.h> - #include <shellapi.h> --- -2.1.0 - diff --git a/src/openal-1-fixes.patch b/src/openal-1-fixes.patch index e388d82..a023a87 100644 --- a/src/openal-1-fixes.patch +++ b/src/openal-1-fixes.patch @@ -3,7 +3,7 @@ See index.html for further information. From 25b591198c896959ca5b7dc9ad3a35605c66dc63 Mon Sep 17 00:00:00 2001 From: Guilherme Lima Bernal <dev@lbguilherme.com> Date: Sat, 28 Mar 2015 20:52:05 +0100 -Subject: [PATCH 1/2] fixes for cross-building +Subject: [PATCH] fixes for cross-building diff --git a/CMakeLists.txt b/CMakeLists.txt @@ -60,24 +60,3 @@ index 0087edb..749f813 100644 2.1.0 -From 6d0e7d9cb038aa54f33f9a8cef351c2aaa866ac1 Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Sat, 28 Mar 2015 20:47:15 +0100 -Subject: [PATCH 2/2] add missing include - - -diff --git a/Alc/alcConfig.c b/Alc/alcConfig.c -index 2c9aef4..bcd16d9 100644 ---- a/Alc/alcConfig.c -+++ b/Alc/alcConfig.c -@@ -33,6 +33,7 @@ - #include <ctype.h> - #include <string.h> - #ifdef _WIN32_IE -+#include <windows.h> - #include <shlobj.h> - #endif - --- -2.1.0 - diff --git a/src/poppler-1-win32.patch b/src/poppler-1-win32.patch index 90c4b8e..0fc1063 100644 --- a/src/poppler-1-win32.patch +++ b/src/poppler-1-win32.patch @@ -4,7 +4,7 @@ See index.html for further information. From 19910ebb3242f3089ac7ba2cc83ad21c11a29b31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20L=C3=B6ffler?= <st.loeffler@gmail.com> Date: Mon, 15 Sep 2014 19:53:04 -0700 -Subject: [PATCH 1/3] Only check for Type1 fonts in custom directory if path is +Subject: [PATCH 1/2] Only check for Type1 fonts in custom directory if path is non-NULL Otherwise, programs using poppler may crash @@ -30,7 +30,7 @@ index 084b49b..9bd7dac 100644 From 346680cd02223d6be57c4eecb983505db13b2acf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20L=C3=B6ffler?= <st.loeffler@gmail.com> Date: Mon, 15 Sep 2014 20:01:22 -0700 -Subject: [PATCH 2/3] Don't use dllimport/dllexport +Subject: [PATCH 2/2] Don't use dllimport/dllexport Otherwise static linking fails @@ -122,24 +122,3 @@ index 2e2f6ff..e625564 100644 2.1.0 -From 4977b26b480c1de6e6626d66b3b416d170f7e03b Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Sat, 28 Mar 2015 21:24:04 +0100 -Subject: [PATCH 3/3] add missing include - - -diff --git a/poppler/GlobalParams.cc b/poppler/GlobalParams.cc -index 3d88646..ef232f0 100644 ---- a/poppler/GlobalParams.cc -+++ b/poppler/GlobalParams.cc -@@ -56,6 +56,7 @@ - # endif - #endif - #ifdef _WIN32 -+# include <windows.h> - # include <shlobj.h> - # include <mbstring.h> - #endif --- -2.1.0 - |