vlc/vlc-3.0 | branch: master | Steve Lhomme <[email protected]> | Mon May 27 09:10:17 2019 +0200| [fa89eb26213b143426adf2ab3351ca153662a23e] | committer: Steve Lhomme
contrib: update libebml to 1.3.8 (cherry picked from commit 7196586c6d9deeb8dcdadf11d494588f6ec93492) > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=fa89eb26213b143426adf2ab3351ca153662a23e --- contrib/src/ebml/0001-fix-build-with-gcc-7.patch | 34 ------------------------ contrib/src/ebml/SHA512SUMS | 2 +- contrib/src/ebml/ebml-fix-univeral-windows.patch | 11 -------- contrib/src/ebml/fix-clang-build.patch | 10 ------- contrib/src/ebml/rules.mak | 5 +--- 5 files changed, 2 insertions(+), 60 deletions(-) diff --git a/contrib/src/ebml/0001-fix-build-with-gcc-7.patch b/contrib/src/ebml/0001-fix-build-with-gcc-7.patch deleted file mode 100644 index fc045bce88..0000000000 --- a/contrib/src/ebml/0001-fix-build-with-gcc-7.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 7038d0048979db61ec75be51e2e62ac34a297176 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme <[email protected]> -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/contrib/src/ebml/SHA512SUMS b/contrib/src/ebml/SHA512SUMS index 1769afc1a5..006dcf335b 100644 --- a/contrib/src/ebml/SHA512SUMS +++ b/contrib/src/ebml/SHA512SUMS @@ -1 +1 @@ -6a31a56dcde39642848f25353a462f4621d6cfd3bc9ef62add1b00d098c6a80b3c2b50ecf4d6dd50650c609eb39a6150c6d1b69ea3a77a3928bd3300af7dd91f libebml-1.3.6.tar.xz +12fab1f2389ae6d6c6329d3e67e302d46f470ca64a4ebcb0cda3451ee27cc9e9fa503d7fb0dcf55ddc770c341e28f6b9279b7558b8e7ea8ca8caf745d8242276 libebml-1.3.8.tar.xz diff --git a/contrib/src/ebml/ebml-fix-univeral-windows.patch b/contrib/src/ebml/ebml-fix-univeral-windows.patch deleted file mode 100644 index 287e894174..0000000000 --- a/contrib/src/ebml/ebml-fix-univeral-windows.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/MemReadIOCallback.h - ebml/SafeReadIOCallback.h - ebml/StdIOCallback.h) --if(WIN32) -+if(WIN32 AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "WindowsStore") - list(APPEND libebml_SOURCES - src/platform/win32/WinIOCallback.cpp) - list(APPEND libebml_PUBLIC_HEADERS diff --git a/contrib/src/ebml/fix-clang-build.patch b/contrib/src/ebml/fix-clang-build.patch deleted file mode 100644 index dba5504d1a..0000000000 --- a/contrib/src/ebml/fix-clang-build.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ebml/src/EbmlSInteger.cpp.old 2018-04-23 12:01:29.747339700 +0200 -+++ ebml/src/EbmlSInteger.cpp 2018-04-23 12:01:53.219339286 +0200 -@@ -34,6 +34,7 @@ - */ - #include <cassert> - #include <climits> -+#include <limits> - - #include "ebml/EbmlSInteger.h" - diff --git a/contrib/src/ebml/rules.mak b/contrib/src/ebml/rules.mak index 32c1a5430f..007764e410 100644 --- a/contrib/src/ebml/rules.mak +++ b/contrib/src/ebml/rules.mak @@ -1,6 +1,6 @@ # ebml -EBML_VERSION := 1.3.6 +EBML_VERSION := 1.3.8 EBML_URL := http://dl.matroska.org/downloads/libebml/libebml-$(EBML_VERSION).tar.xz ifeq ($(call need_pkg,"libebml"),) @@ -14,9 +14,6 @@ $(TARBALLS)/libebml-$(EBML_VERSION).tar.xz: ebml: libebml-$(EBML_VERSION).tar.xz .sum-ebml $(UNPACK) - $(APPLY) $(SRC)/ebml/0001-fix-build-with-gcc-7.patch - $(APPLY) $(SRC)/ebml/fix-clang-build.patch - $(APPLY) $(SRC)/ebml/ebml-fix-univeral-windows.patch $(MOVE) # libebml requires exceptions _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
