[vlc-commits] contribs: Fix ebml clang build

Hugo Beauzée-Luyssen git at videolan.org
Wed May 30 00:04:26 CEST 2018


vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Mon Apr 23 12:03:04 2018 +0200| [96c14d10351c6f96ab0e3548f4c7ab1f3baef1bb] | committer: Konstantin Pavlov

contribs: Fix ebml clang build

(cherry picked from commit 612553ddf04265edaea7e27e9cf9bace21c3ad85)
Signed-off-by: Konstantin Pavlov <thresh at videolan.org>

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

 contrib/src/ebml/fix-clang-build.patch | 10 ++++++++++
 contrib/src/ebml/rules.mak             |  1 +
 2 files changed, 11 insertions(+)

diff --git a/contrib/src/ebml/fix-clang-build.patch b/contrib/src/ebml/fix-clang-build.patch
new file mode 100644
index 0000000000..dba5504d1a
--- /dev/null
+++ b/contrib/src/ebml/fix-clang-build.patch
@@ -0,0 +1,10 @@
+--- 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 28fa355207..32c1a5430f 100644
--- a/contrib/src/ebml/rules.mak
+++ b/contrib/src/ebml/rules.mak
@@ -15,6 +15,7 @@ $(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)
 



More information about the vlc-commits mailing list