[vlc-commits] Contribs: update libebml 1.3.1

[Jean-Baptiste Kempf]

vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Jan  6 22:22:33 2015 +0100| [9470b8685f5a29abada6525ef7882c8e7fd7b535] | committer: Jean-Baptiste Kempf

Contribs: update libebml 1.3.1

Move to autoconf

(cherry picked from commit bb286ca8ca2612af172a190308a62e088b1e6138)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 contrib/src/ebml/SHA512SUMS     |    2 +-
 contrib/src/ebml/ebml-pic.patch |   22 ----------------------
 contrib/src/ebml/no-ansi.patch  |   11 -----------
 contrib/src/ebml/rules.mak      |   13 +++----------
 4 files changed, 4 insertions(+), 44 deletions(-)

diff --git a/contrib/src/ebml/SHA512SUMS b/contrib/src/ebml/SHA512SUMS
index 567b9e1..981da1d 100644
--- a/contrib/src/ebml/SHA512SUMS
+++ b/contrib/src/ebml/SHA512SUMS
@@ -1 +1 @@
-f5687af60e94f167cd341c24f038d57735d447b6279e96b916e3b0a98ca141f3c241ef4c46dd55ac87b0f6007eb14835e0f2a602f89610fcc0b4f93e8b9c87ab  libebml-1.3.0.tar.bz2
+b42d198611e480a4938fe95b920f6ee6ca37453f9551990e4310ed82651f93284f1de1d871357b6280219634bbbf6a98d4ac988e25e7bd7b5bbf5c0ba5766334  libebml-1.3.1.tar.bz2
diff --git a/contrib/src/ebml/ebml-pic.patch b/contrib/src/ebml/ebml-pic.patch
deleted file mode 100644
index c9511b1..0000000
--- a/contrib/src/ebml/ebml-pic.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ru libebml.orig/make/linux/Makefile libebml/make/linux/Makefile
---- libebml.orig/make/linux/Makefile	2011-08-03 13:39:21.000000000 +0300
-+++ libebml/make/linux/Makefile	2011-08-03 13:39:57.000000000 +0300
-@@ -59,7 +59,7 @@
- 
- # object files; replace .cxx extension with .o
- objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
--objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources))
-+objects_so:=$(objects)
- 
- WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow
- COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE)
-@@ -81,9 +81,6 @@
- 
- # Build rules
- %.o: %$(EXTENSION)
--	$(CXX) -c $(COMPILEFLAGS) -o $@ $<
--
--%.lo: %$(EXTENSION)
- 	$(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
- 
- $(LIBRARY): $(objects)
diff --git a/contrib/src/ebml/no-ansi.patch b/contrib/src/ebml/no-ansi.patch
deleted file mode 100644
index 3f098a2..0000000
--- a/contrib/src/ebml/no-ansi.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libebml-1.3.0/make/linux/Makefile.orig	2013-07-04 19:08:40.474927603 +0200
-+++ libebml-1.3.0/make/linux/Makefile	2013-07-04 19:09:09.568664476 +0200
-@@ -61,7 +61,7 @@
- objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
- objects_so:=$(objects)
- 
--WARNINGFLAGS=-Wall -Wextra -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow
-+WARNINGFLAGS=-Wall -Wextra -Wno-unknown-pragmas -fno-gnu-keywords -Wshadow
- COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE)
- DEPENDFLAGS  = $(CXXFLAGS) $(INCLUDE)
- 
diff --git a/contrib/src/ebml/rules.mak b/contrib/src/ebml/rules.mak
index 1d01818..9d87c29 100644
--- a/contrib/src/ebml/rules.mak
+++ b/contrib/src/ebml/rules.mak
@@ -1,6 +1,6 @@
 # ebml
 
-EBML_VERSION := 1.3.0
+EBML_VERSION := 1.3.1
 EBML_URL := http://dl.matroska.org/downloads/libebml/libebml-$(EBML_VERSION).tar.bz2
 #EBML_URL := $(CONTRIB_VIDEOLAN)/libebml-$(EBML_VERSION).tar.bz2
 
@@ -11,8 +11,6 @@ $(TARBALLS)/libebml-$(EBML_VERSION).tar.bz2:
 
 libebml: libebml-$(EBML_VERSION).tar.bz2 .sum-ebml
 	$(UNPACK)
-	$(APPLY) $(SRC)/ebml/ebml-pic.patch
-	$(APPLY) $(SRC)/ebml/no-ansi.patch
 	$(MOVE)
 
 # libebml requires exceptions
@@ -20,11 +18,6 @@ EBML_EXTRA_FLAGS = CXXFLAGS="${CXXFLAGS} -fexceptions" \
 					CPPFLAGS=""
 
 .ebml: libebml
-ifdef HAVE_WIN32
-	cd $< && $(MAKE) -C make/mingw32 prefix="$(PREFIX)" $(HOSTVARS) SHARED=no
-else
-	cd $< && $(MAKE) -C make/linux prefix="$(PREFIX)" $(HOSTVARS) $(EBML_EXTRA_FLAGS) staticlib
-endif
-	cd $< && $(MAKE) -C make/linux install_staticlib install_headers prefix="$(PREFIX)" $(HOSTVARS)
-	$(RANLIB) "$(PREFIX)/lib/libebml.a"
+	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
+	cd $< && $(MAKE) install
 	touch $@