Initial revision

2 files changed, 66 insertions, 0 deletions

diff --git a/vlc/build/patches/ebml_gcc7.patch b/vlc/build/patches/ebml_gcc7.patch
new file mode 100644
index 00000000..fc045bce
--- /dev/null
+++ b/vlc/build/patches/ebml_gcc7.patch
@@ -0,0 +1,34 @@
+From 7038d0048979db61ec75be51e2e62ac34a297176 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <robux4@ycbcr.xyz>
+Date: Sat, 21 Apr 2018 11:00:03 +0200
+Subject: [PATCH] fix build with gcc 7
+
+---
+ src/platform/win32/WinIOCallback.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/platform/win32/WinIOCallback.cpp b/src/platform/win32/WinIOCallback.cpp
+index b1310ee..f3aeff4 100644
+--- a/src/platform/win32/WinIOCallback.cpp
++++ b/src/platform/win32/WinIOCallback.cpp
+@@ -95,7 +95,7 @@ bool WinIOCallback::open(const char* Path, const open_mode aMode, DWORD dwFlags)
+   }
+ 
+   mFile = CreateFileA(Path, AccessMode, ShareMode, NULL, Disposition, dwFlags, NULL);
+-  if ((mFile == INVALID_HANDLE_VALUE) || ((long)mFile == 0xffffffff)) {
++  if ((mFile == INVALID_HANDLE_VALUE) || (mFile == (HANDLE)0xffffffff)) {
+     //File was not opened
+     char err_msg[256];
+     DWORD error_code = GetLastError();
+@@ -177,7 +177,7 @@ bool WinIOCallback::open(const wchar_t* Path, const open_mode aMode, DWORD dwFla
+       return mOk = false;
+     }
+   }
+-  if ((mFile == INVALID_HANDLE_VALUE) || ((long)mFile == 0xffffffff)) {
++  if ((mFile == INVALID_HANDLE_VALUE) || (mFile == (HANDLE)0xffffffff)) {
+     //File was not opened
+     char err_msg[256];
+     DWORD error_code = GetLastError();
+-- 
+2.8.1.windows.1
+
diff --git a/vlc/build/patches/qtbase_dont_tag_static_binaries.patch b/vlc/build/patches/qtbase_dont_tag_static_binaries.patch
new file mode 100644
index 00000000..ddef3116
--- /dev/null
+++ b/vlc/build/patches/qtbase_dont_tag_static_binaries.patch
@@ -0,0 +1,32 @@
+From 0cffe2135e7303bd103bdf888a345fe0a8b94cd6 Mon Sep 17 00:00:00 2001
+From: Thiago Macieira <thiago.macieira@intel.com>
+Date: Wed, 14 Sep 2016 11:29:37 -0700
+Subject: [PATCH] qversiontagging.h: Don't tag binaries in static mode
+
+Though there should have been no ill-effects, they happen.
+
+Task-number: QTBUG-52605
+Change-Id: I9093948278414644a416fffd147444078edc3183
+Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
+Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
+---
+ src/corelib/global/qversiontagging.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/corelib/global/qversiontagging.h b/src/corelib/global/qversiontagging.h
+index fa824d1c89e..b46bb7aa77d 100644
+--- a/src/corelib/global/qversiontagging.h
++++ b/src/corelib/global/qversiontagging.h
+@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
+  * There will only be one copy of the section in the output library or application.
+  */
+ 
+-#if defined(QT_BUILD_CORE_LIB) || defined(QT_BOOTSTRAPPED) || defined(QT_NO_VERSION_TAGGING)
++#if defined(QT_BUILD_CORE_LIB) || defined(QT_BOOTSTRAPPED) || defined(QT_NO_VERSION_TAGGING) || defined(QT_STATIC)
+ // don't make tags in QtCore, bootstrapped systems or if the user asked not to
+ #elif defined(Q_CC_GNU) && !defined(Q_OS_ANDROID)
+ #  if defined(Q_PROCESSOR_X86) && (defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL))
+-- 
+2.16.3
+
+