[vlc-commits] Contribs: update libmatroska to 1.4.2

[Jean-Baptiste Kempf]

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

Contribs: update libmatroska to 1.4.2

Move to autotools

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

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

 contrib/src/matroska/SHA512SUMS         |    2 +-
 contrib/src/matroska/matroska-pic.patch |   22 ----------------------
 contrib/src/matroska/rules.mak          |   12 +++---------
 3 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/contrib/src/matroska/SHA512SUMS b/contrib/src/matroska/SHA512SUMS
index 049571b..91cdc48 100644
--- a/contrib/src/matroska/SHA512SUMS
+++ b/contrib/src/matroska/SHA512SUMS
@@ -1 +1 @@
-06db4906f497cca4adc09b8e8588edddc840cca1fbbf9890491cbfa55f9f238ad7d8b86de687293a5caa15dbc2ae64ac8fcb05da062940017f346be46e9ba8e3  libmatroska-1.4.1.tar.bz2
+37b7e35c4db0a5265682f69e2ded251168f64499ab86fa228d9a4dde8a85edab7b8b60c722563c1fed27317cd0e94ee86322c18446430aae7cafeda20a90e549  libmatroska-1.4.2.tar.bz2
diff --git a/contrib/src/matroska/matroska-pic.patch b/contrib/src/matroska/matroska-pic.patch
deleted file mode 100644
index 58431f7..0000000
--- a/contrib/src/matroska/matroska-pic.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ru libmatroska.orig/make/linux/Makefile libmatroska/make/linux/Makefile
---- libmatroska.orig/make/linux/Makefile	2011-06-15 15:00:37.000000000 +0300
-+++ libmatroska/make/linux/Makefile	2011-08-03 13:33:25.000000000 +0300
-@@ -65,7 +65,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 -D_GNU_SOURCE \
- 		-Wshadow
-@@ -89,9 +89,6 @@
- 
- # Build rules
- %.o: %$(EXTENSION)
--	$(CXX) -c $(COMPILEFLAGS) -o $@ $<
--
--%.lo: %$(EXTENSION)
- 	$(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
- 
- $(LIBRARY): $(objects)
diff --git a/contrib/src/matroska/rules.mak b/contrib/src/matroska/rules.mak
index 336e001..b8d0165 100644
--- a/contrib/src/matroska/rules.mak
+++ b/contrib/src/matroska/rules.mak
@@ -1,6 +1,6 @@
 # matroska
 
-MATROSKA_VERSION := 1.4.1
+MATROSKA_VERSION := 1.4.2
 MATROSKA_URL := http://dl.matroska.org/downloads/libmatroska/libmatroska-$(MATROSKA_VERSION).tar.bz2
 #MATROSKA_URL := $(CONTRIB_VIDEOLAN)/libmatroska-$(MATROSKA_VERSION).tar.bz2
 
@@ -14,15 +14,9 @@ $(TARBALLS)/libmatroska-$(MATROSKA_VERSION).tar.bz2:
 
 libmatroska: libmatroska-$(MATROSKA_VERSION).tar.bz2 .sum-matroska
 	$(UNPACK)
-	$(APPLY) $(SRC)/matroska/matroska-pic.patch
 	$(MOVE)
 
 .matroska: libmatroska
-ifdef HAVE_WIN32
-	cd $< && $(MAKE) -C make/mingw32 prefix="$(PREFIX)" $(HOSTVARS) SHARED=no EBML_DLL=no libmatroska.a
-else
-	cd $< && $(MAKE) -C make/linux prefix="$(PREFIX)" $(HOSTVARS) staticlib
-endif
-	cd $< && $(MAKE) -C make/linux install_staticlib install_headers prefix="$(PREFIX)" $(HOSTVARS)
-	$(RANLIB) "$(PREFIX)/lib/libmatroska.a"
+	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
+	cd $< && $(MAKE) install
 	touch $@