vlc | branch: master | Steve Lhomme <[email protected]> | Mon Mar 4 13:17:20 2019 +0100| [852d95764ebc1865ed3fd3853342005888902dc0] | committer: Steve Lhomme
contrib:ebml: don't ever build WinIOCallback in our contribs It won't work with Winstore builds and we don't use it anyway. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=852d95764ebc1865ed3fd3853342005888902dc0 --- contrib/src/ebml/ebml-fix-univeral-windows.patch | 16 ++++++++++++---- contrib/src/ebml/rules.mak | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/contrib/src/ebml/ebml-fix-univeral-windows.patch b/contrib/src/ebml/ebml-fix-univeral-windows.patch index 287e894174..c4c65f3ff5 100644 --- a/contrib/src/ebml/ebml-fix-univeral-windows.patch +++ b/contrib/src/ebml/ebml-fix-univeral-windows.patch @@ -1,11 +1,19 @@ ---- ebml/CMakeLists.txt.uwp 2018-05-22 16:23:07.388136700 +0200 -+++ ebml/CMakeLists.txt 2018-05-22 16:23:21.243621600 +0200 -@@ -60,7 +60,7 @@ set(libebml_PUBLIC_HEADERS +--- ebml/CMakeLists.txt.winio 2019-03-05 13:28:29.477415900 +0100 ++++ ebml/CMakeLists.txt 2019-03-05 13:32:58.566207100 +0100 +@@ -4,6 +4,7 @@ project(ebml VERSION 1.3.6) + + option(DISABLE_PKGCONFIG "Disable PkgConfig module generation" OFF) + option(DISABLE_CMAKE_CONFIG "Disable CMake package config module generation" OFF) ++option(ENABLE_WIN32_IO "Build the Windows I/O helper class" OFF) + + include(GNUInstallDirs) + +@@ -60,7 +61,7 @@ set(libebml_PUBLIC_HEADERS ebml/MemReadIOCallback.h ebml/SafeReadIOCallback.h ebml/StdIOCallback.h) -if(WIN32) -+if(WIN32 AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "WindowsStore") ++if(WIN32 AND ENABLE_WIN32_IO) list(APPEND libebml_SOURCES src/platform/win32/WinIOCallback.cpp) list(APPEND libebml_PUBLIC_HEADERS diff --git a/contrib/src/ebml/rules.mak b/contrib/src/ebml/rules.mak index 32c1a5430f..7c628a974a 100644 --- a/contrib/src/ebml/rules.mak +++ b/contrib/src/ebml/rules.mak @@ -23,6 +23,6 @@ ebml: libebml-$(EBML_VERSION).tar.xz .sum-ebml EBML_CXXFLAGS := $(CXXFLAGS) $(PIC) -fexceptions -fvisibility=hidden .ebml: ebml toolchain.cmake - cd $< && $(HOSTVARS_PIC) CXXFLAGS="$(EBML_CXXFLAGS)" $(CMAKE) -DBUILD_SHARED_LIBS=OFF + cd $< && $(HOSTVARS_PIC) CXXFLAGS="$(EBML_CXXFLAGS)" $(CMAKE) -DBUILD_SHARED_LIBS=OFF -DENABLE_WIN32_IO=OFF cd $< && $(MAKE) install touch $@ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
