Commit a5a24a20 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

vlc-winrt: Update mingw-w64 patchset

And bump winrt images IMAGE_DATE
parent 53d29ece
......@@ -2,7 +2,7 @@ FROM registry.videolan.org:5000/videolan-base-stretch:latest
MAINTAINER Hugo Beauzée-Luyssen <hugo@beauzee.fr>
ENV IMAGE_DATE=201711201508
ENV IMAGE_DATE=201711201530
RUN apt-get update -qq && apt-get install -qqy \
git wget bzip2 file libwine-dev unzip libtool pkg-config cmake \
......
From 31eb1cd55bb3d47449860e9b9d0e6d18926b0377 Mon Sep 17 00:00:00 2001
From af4f65af97ad8503a9b2fd178ae36b37987285be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Thu, 21 Apr 2016 16:07:59 +0200
Subject: [PATCH 1/9] UGLY HACK: Don't use Rtl* function on win64 when building
Subject: [PATCH 1/3] UGLY HACK: Don't use Rtl* function on win64 when building
for winrt
---
......@@ -12,57 +12,57 @@ Subject: [PATCH 1/9] UGLY HACK: Don't use Rtl* function on win64 when building
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/mingw-w64-crt/crt/crt_handler.c b/mingw-w64-crt/crt/crt_handler.c
index a1b51ce..8a7983b 100644
index 6571e69e..7a86641e 100644
--- a/mingw-w64-crt/crt/crt_handler.c
+++ b/mingw-w64-crt/crt/crt_handler.c
@@ -40,7 +40,7 @@ PBYTE _GetPEImageBase (void);
int __mingw_init_ehandler (void);
extern void _fpreset (void);
-#if defined(_WIN64) && !defined(_MSC_VER)
+#if defined(_WIN64_NOPE_NOPE_NOPE) && !defined(_MSC_VER)
-#if defined(__x86_64__) && !defined(_MSC_VER)
+#if defined(__x86_64___NOPE_NOPE_NOPE) && !defined(_MSC_VER)
EXCEPTION_DISPOSITION __mingw_SEH_error_handler(struct _EXCEPTION_RECORD *, void *, struct _CONTEXT *, void *);
#define MAX_PDATA_ENTRIES 32
diff --git a/mingw-w64-crt/crt/crtdll.c b/mingw-w64-crt/crt/crtdll.c
index 07a1840..026da7a 100644
index 6b5418bd..5a39af54 100644
--- a/mingw-w64-crt/crt/crtdll.c
+++ b/mingw-w64-crt/crt/crtdll.c
@@ -164,7 +164,7 @@ DllMainCRTStartup (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)
@@ -171,7 +171,7 @@ DllMainCRTStartup (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)
if (dwReason == DLL_PROCESS_ATTACH)
{
__security_init_cookie ();
-#ifdef _WIN64
+#ifdef _WIN64_NOPE_NOPE_NOPE
-#ifdef __x86_64__
+#ifdef __x86_64___NOPE_NOPE_NOPE
__mingw_init_ehandler ();
#endif
}
diff --git a/mingw-w64-crt/crt/crtexe.c b/mingw-w64-crt/crt/crtexe.c
index ae37e0f..3be64bb 100644
index baa8d81e..37f1bab5 100644
--- a/mingw-w64-crt/crt/crtexe.c
+++ b/mingw-w64-crt/crt/crtexe.c
@@ -279,7 +279,7 @@ __tmainCRTStartup (void)
@@ -286,7 +286,7 @@ __tmainCRTStartup (void)
_pei386_runtime_relocator ();
__mingw_oldexcpt_handler = SetUnhandledExceptionFilter (_gnu_exception_handler);
-#ifdef _WIN64
+#ifdef _WIN64_NOPE_NOPE_NOPE
-#ifdef __x86_64__
+#ifdef __x86_64___NOPE_NOPE_NOPE
__mingw_init_ehandler ();
#endif
_set_invalid_parameter_handler (__mingw_invalidParameterHandler);
diff --git a/mingw-w64-crt/crt/gs_support.c b/mingw-w64-crt/crt/gs_support.c
index c5c1773..51d2d1a 100644
index 0c6ac68c..779d6faf 100644
--- a/mingw-w64-crt/crt/gs_support.c
+++ b/mingw-w64-crt/crt/gs_support.c
@@ -104,7 +104,7 @@ __declspec(noreturn) void __cdecl
__report_gsfailure (ULONG_PTR StackCookie)
{
volatile UINT_PTR cookie[2] __MINGW_ATTRIB_UNUSED;
-#ifdef _WIN64
+#ifdef _WIN64_NOPE_NOPE_NOPE
-#if defined(_WIN64) && !defined(__aarch64__)
+#if defined(_WIN64_NOPE_NOPE_NOPE) && !defined(__aarch64__)
ULONG64 controlPC, imgBase, establisherFrame;
PRUNTIME_FUNCTION fctEntry;
PVOID hndData;
--
2.9.3
2.11.0
From 52944716641824d4dcd1460540ceb821491c9551 Mon Sep 17 00:00:00 2001
From 42df9603d48c3378480c0ac16180a96a39986fdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Fri, 29 Apr 2016 11:07:45 +0200
Subject: [PATCH 2/9] crt: Add missing snprintf aliases
Subject: [PATCH 2/3] crt: Add missing snprintf aliases
---
mingw-w64-crt/lib32/msvcr120_app.def.in | 1 +
......@@ -9,7 +9,7 @@ Subject: [PATCH 2/9] crt: Add missing snprintf aliases
2 files changed, 2 insertions(+)
diff --git a/mingw-w64-crt/lib32/msvcr120_app.def.in b/mingw-w64-crt/lib32/msvcr120_app.def.in
index b29eaf9..0c5aaff 100644
index b29eaf9a..0c5aaff9 100644
--- a/mingw-w64-crt/lib32/msvcr120_app.def.in
+++ b/mingw-w64-crt/lib32/msvcr120_app.def.in
@@ -1042,6 +1042,7 @@ _vscwprintf_p
......@@ -21,7 +21,7 @@ index b29eaf9..0c5aaff 100644
_vsnprintf_c_l
_vsnprintf_l
diff --git a/mingw-w64-crt/lib64/msvcr120_app.def.in b/mingw-w64-crt/lib64/msvcr120_app.def.in
index 53b2f7b..b829b84 100644
index 53b2f7b0..b829b841 100644
--- a/mingw-w64-crt/lib64/msvcr120_app.def.in
+++ b/mingw-w64-crt/lib64/msvcr120_app.def.in
@@ -984,6 +984,7 @@ _vscwprintf_p
......@@ -33,5 +33,5 @@ index 53b2f7b..b829b84 100644
_vsnprintf_c_l
_vsnprintf_l
--
2.9.3
2.11.0
From 76fdf024eb822e0cb92e13fca7d633d229c2c548 Mon Sep 17 00:00:00 2001
From a0e4ba37087e54898638fe56ea9445d2d3802643 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Tue, 27 Jun 2017 17:30:24 +0200
Subject: [PATCH] winbase.h: WaitForMultipleObjects is available on UWP
Subject: [PATCH 3/3] winbase.h: WaitForMultipleObjects is available on UWP
---
mingw-w64-headers/include/winbase.h | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/mingw-w64-headers/include/winbase.h b/mingw-w64-headers/include/winbase.h
index 74bc512c..be050cc6 100644
index 77da6a38..db391292 100644
--- a/mingw-w64-headers/include/winbase.h
+++ b/mingw-w64-headers/include/winbase.h
@@ -1265,6 +1265,10 @@ extern "C" {
......
......@@ -2,7 +2,7 @@ FROM registry.videolan.org:5000/videolan-base-stretch:latest
MAINTAINER Hugo Beauzée-Luyssen <hugo@beauzee.fr>
ENV IMAGE_DATE=201711201508
ENV IMAGE_DATE=201711201530
RUN apt-get update -qq && apt-get install -qqy \
git wget bzip2 file libwine-dev unzip libtool pkg-config cmake \
......
From 31eb1cd55bb3d47449860e9b9d0e6d18926b0377 Mon Sep 17 00:00:00 2001
From af4f65af97ad8503a9b2fd178ae36b37987285be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Thu, 21 Apr 2016 16:07:59 +0200
Subject: [PATCH 1/9] UGLY HACK: Don't use Rtl* function on win64 when building
Subject: [PATCH 1/3] UGLY HACK: Don't use Rtl* function on win64 when building
for winrt
---
......@@ -12,57 +12,57 @@ Subject: [PATCH 1/9] UGLY HACK: Don't use Rtl* function on win64 when building
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/mingw-w64-crt/crt/crt_handler.c b/mingw-w64-crt/crt/crt_handler.c
index a1b51ce..8a7983b 100644
index 6571e69e..7a86641e 100644
--- a/mingw-w64-crt/crt/crt_handler.c
+++ b/mingw-w64-crt/crt/crt_handler.c
@@ -40,7 +40,7 @@ PBYTE _GetPEImageBase (void);
int __mingw_init_ehandler (void);
extern void _fpreset (void);
-#if defined(_WIN64) && !defined(_MSC_VER)
+#if defined(_WIN64_NOPE_NOPE_NOPE) && !defined(_MSC_VER)
-#if defined(__x86_64__) && !defined(_MSC_VER)
+#if defined(__x86_64___NOPE_NOPE_NOPE) && !defined(_MSC_VER)
EXCEPTION_DISPOSITION __mingw_SEH_error_handler(struct _EXCEPTION_RECORD *, void *, struct _CONTEXT *, void *);
#define MAX_PDATA_ENTRIES 32
diff --git a/mingw-w64-crt/crt/crtdll.c b/mingw-w64-crt/crt/crtdll.c
index 07a1840..026da7a 100644
index 6b5418bd..5a39af54 100644
--- a/mingw-w64-crt/crt/crtdll.c
+++ b/mingw-w64-crt/crt/crtdll.c
@@ -164,7 +164,7 @@ DllMainCRTStartup (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)
@@ -171,7 +171,7 @@ DllMainCRTStartup (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)
if (dwReason == DLL_PROCESS_ATTACH)
{
__security_init_cookie ();
-#ifdef _WIN64
+#ifdef _WIN64_NOPE_NOPE_NOPE
-#ifdef __x86_64__
+#ifdef __x86_64___NOPE_NOPE_NOPE
__mingw_init_ehandler ();
#endif
}
diff --git a/mingw-w64-crt/crt/crtexe.c b/mingw-w64-crt/crt/crtexe.c
index ae37e0f..3be64bb 100644
index baa8d81e..37f1bab5 100644
--- a/mingw-w64-crt/crt/crtexe.c
+++ b/mingw-w64-crt/crt/crtexe.c
@@ -279,7 +279,7 @@ __tmainCRTStartup (void)
@@ -286,7 +286,7 @@ __tmainCRTStartup (void)
_pei386_runtime_relocator ();
__mingw_oldexcpt_handler = SetUnhandledExceptionFilter (_gnu_exception_handler);
-#ifdef _WIN64
+#ifdef _WIN64_NOPE_NOPE_NOPE
-#ifdef __x86_64__
+#ifdef __x86_64___NOPE_NOPE_NOPE
__mingw_init_ehandler ();
#endif
_set_invalid_parameter_handler (__mingw_invalidParameterHandler);
diff --git a/mingw-w64-crt/crt/gs_support.c b/mingw-w64-crt/crt/gs_support.c
index c5c1773..51d2d1a 100644
index 0c6ac68c..779d6faf 100644
--- a/mingw-w64-crt/crt/gs_support.c
+++ b/mingw-w64-crt/crt/gs_support.c
@@ -104,7 +104,7 @@ __declspec(noreturn) void __cdecl
__report_gsfailure (ULONG_PTR StackCookie)
{
volatile UINT_PTR cookie[2] __MINGW_ATTRIB_UNUSED;
-#ifdef _WIN64
+#ifdef _WIN64_NOPE_NOPE_NOPE
-#if defined(_WIN64) && !defined(__aarch64__)
+#if defined(_WIN64_NOPE_NOPE_NOPE) && !defined(__aarch64__)
ULONG64 controlPC, imgBase, establisherFrame;
PRUNTIME_FUNCTION fctEntry;
PVOID hndData;
--
2.9.3
2.11.0
From 52944716641824d4dcd1460540ceb821491c9551 Mon Sep 17 00:00:00 2001
From 42df9603d48c3378480c0ac16180a96a39986fdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Fri, 29 Apr 2016 11:07:45 +0200
Subject: [PATCH 2/9] crt: Add missing snprintf aliases
Subject: [PATCH 2/3] crt: Add missing snprintf aliases
---
mingw-w64-crt/lib32/msvcr120_app.def.in | 1 +
......@@ -9,7 +9,7 @@ Subject: [PATCH 2/9] crt: Add missing snprintf aliases
2 files changed, 2 insertions(+)
diff --git a/mingw-w64-crt/lib32/msvcr120_app.def.in b/mingw-w64-crt/lib32/msvcr120_app.def.in
index b29eaf9..0c5aaff 100644
index b29eaf9a..0c5aaff9 100644
--- a/mingw-w64-crt/lib32/msvcr120_app.def.in
+++ b/mingw-w64-crt/lib32/msvcr120_app.def.in
@@ -1042,6 +1042,7 @@ _vscwprintf_p
......@@ -21,7 +21,7 @@ index b29eaf9..0c5aaff 100644
_vsnprintf_c_l
_vsnprintf_l
diff --git a/mingw-w64-crt/lib64/msvcr120_app.def.in b/mingw-w64-crt/lib64/msvcr120_app.def.in
index 53b2f7b..b829b84 100644
index 53b2f7b0..b829b841 100644
--- a/mingw-w64-crt/lib64/msvcr120_app.def.in
+++ b/mingw-w64-crt/lib64/msvcr120_app.def.in
@@ -984,6 +984,7 @@ _vscwprintf_p
......@@ -33,5 +33,5 @@ index 53b2f7b..b829b84 100644
_vsnprintf_c_l
_vsnprintf_l
--
2.9.3
2.11.0
From 76fdf024eb822e0cb92e13fca7d633d229c2c548 Mon Sep 17 00:00:00 2001
From a0e4ba37087e54898638fe56ea9445d2d3802643 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Tue, 27 Jun 2017 17:30:24 +0200
Subject: [PATCH] winbase.h: WaitForMultipleObjects is available on UWP
Subject: [PATCH 3/3] winbase.h: WaitForMultipleObjects is available on UWP
---
mingw-w64-headers/include/winbase.h | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/mingw-w64-headers/include/winbase.h b/mingw-w64-headers/include/winbase.h
index 74bc512c..be050cc6 100644
index 77da6a38..db391292 100644
--- a/mingw-w64-headers/include/winbase.h
+++ b/mingw-w64-headers/include/winbase.h
@@ -1265,6 +1265,10 @@ extern "C" {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment