[vlc-commits] contrib: x264: enable Winstore builds without MSVC

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Thu Mar  7 12:44:09 2019 +0100| [ec0b6bdc91024fef63cebfb6a07cc14f889ed6d8] | committer: Steve Lhomme

contrib: x264: enable Winstore builds without MSVC

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ec0b6bdc91024fef63cebfb6a07cc14f889ed6d8
---

 contrib/src/x264/rules.mak           |  1 +
 contrib/src/x264/x264-winstore.patch | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/contrib/src/x264/rules.mak b/contrib/src/x264/rules.mak
index 352f556332..49ca5ab508 100644
--- a/contrib/src/x264/rules.mak
+++ b/contrib/src/x264/rules.mak
@@ -88,6 +88,7 @@ x264 x26410b: %: $(X264_BASENAME) .sum-%
 	mkdir -p $*-git
 	tar xvjfo "$<" --strip-components=1 -C $*-git
 	$(UPDATE_AUTOCONFIG)
+	$(APPLY) $(SRC)/x264/x264-winstore.patch
 	mv $*-git $*
 
 x262: x262-git.tar.gz .sum-x262
diff --git a/contrib/src/x264/x264-winstore.patch b/contrib/src/x264/x264-winstore.patch
new file mode 100644
index 0000000000..b16d33487d
--- /dev/null
+++ b/contrib/src/x264/x264-winstore.patch
@@ -0,0 +1,23 @@
+--- x264/configure.winstore	2019-03-07 12:42:19.238431200 +0100
++++ x264/configure	2019-03-07 12:42:30.238709600 +0100
+@@ -841,15 +841,15 @@ if [ $SYS = WINDOWS ]; then
+     fi
+ 
+     if cpp_check "winapifamily.h" "" "!WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)" ; then
+-        [ $compiler = CL ] || die "WinRT requires MSVC"
++        #~ [ $compiler = CL ] || die "WinRT requires MSVC"
+         define HAVE_WINRT
+-        CFLAGS="$CFLAGS -MD"
++        #~ CFLAGS="$CFLAGS -MD"
+         LDFLAGS="$LDFLAGS -appcontainer"
+         if ! cpp_check "" "" "defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0603" ; then
+             die "_WIN32_WINNT must be defined to at least 0x0603 (Windows 8.1) for WinRT"
+-        elif cpp_check "" "" "_WIN32_WINNT >= 0x0A00" ; then
+-            # Universal Windows Platform (Windows 10)
+-            LDFLAGS="$LDFLAGS -lWindowsApp"
++        #~ elif cpp_check "" "" "_WIN32_WINNT >= 0x0A00" ; then
++            #~ # Universal Windows Platform (Windows 10)
++            #~ LDFLAGS="$LDFLAGS -lWindowsApp"
+         fi
+         cli="no"
+         opencl="no"