[vlc-commits] Contribs: update matroska to 1.4.1

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Nov  7 11:38:55 2013 +0100| [f4073f179065d6ef9246f57d1926c26884cb7b6b] | committer: Jean-Baptiste Kempf

Contribs: update matroska to 1.4.1

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

 contrib/src/matroska/SHA512SUMS         |    2 +-
 contrib/src/matroska/matroska-pic.patch |   34 +++++++++++++++----------------
 contrib/src/matroska/no-ansi.patch      |   11 ----------
 contrib/src/matroska/rules.mak          |    3 +--
 4 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/contrib/src/matroska/SHA512SUMS b/contrib/src/matroska/SHA512SUMS
index 3ca3256..049571b 100644
--- a/contrib/src/matroska/SHA512SUMS
+++ b/contrib/src/matroska/SHA512SUMS
@@ -1 +1 @@
-c6bcabfd69dcbf131d1412cbaed5d0eee8f26db702b0ac54b04ff9bdc3c162a6a16fc0e8f4445e88bd1b4536a9fec347b2993484fb3b300077b8e6cf0c9c8950  libmatroska-1.4.0.tar.bz2
+06db4906f497cca4adc09b8e8588edddc840cca1fbbf9890491cbfa55f9f238ad7d8b86de687293a5caa15dbc2ae64ac8fcb05da062940017f346be46e9ba8e3  libmatroska-1.4.1.tar.bz2
diff --git a/contrib/src/matroska/matroska-pic.patch b/contrib/src/matroska/matroska-pic.patch
index a573d79..58431f7 100644
--- a/contrib/src/matroska/matroska-pic.patch
+++ b/contrib/src/matroska/matroska-pic.patch
@@ -2,21 +2,21 @@ 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
+ # 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)
+ 
+ # Build rules
+ %.o: %$(EXTENSION)
+-	$(CXX) -c $(COMPILEFLAGS) -o $@ $<
+-
+-%.lo: %$(EXTENSION)
+ 	$(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
+ 
+ $(LIBRARY): $(objects)
diff --git a/contrib/src/matroska/no-ansi.patch b/contrib/src/matroska/no-ansi.patch
deleted file mode 100644
index 92856e3..0000000
--- a/contrib/src/matroska/no-ansi.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libmatroska-1.4.0/make/linux/Makefile.orig	2013-07-04 19:12:54.531784786 +0200
-+++ libmatroska-1.4.0/make/linux/Makefile	2013-07-04 19:13:25.958887357 +0200
-@@ -67,7 +67,7 @@
- 
- objects_so:=$(objects)
- 
--WARNINGFLAGS=-Wall -Wextra -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE \
-+WARNINGFLAGS=-Wall -Wextra -Wno-unknown-pragmas -fno-gnu-keywords -D_GNU_SOURCE \
- 		-Wshadow
- COMPILEFLAGS=$(DEBUGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(WARNINGFLAGS) $(INCLUDE)
- LINKFLAGS=-L. -L$(LIBEBML_LIB_DIR) $(LDFLAGS)
diff --git a/contrib/src/matroska/rules.mak b/contrib/src/matroska/rules.mak
index 57d7f15..336e001 100644
--- a/contrib/src/matroska/rules.mak
+++ b/contrib/src/matroska/rules.mak
@@ -1,6 +1,6 @@
 # matroska
 
-MATROSKA_VERSION := 1.4.0
+MATROSKA_VERSION := 1.4.1
 MATROSKA_URL := http://dl.matroska.org/downloads/libmatroska/libmatroska-$(MATROSKA_VERSION).tar.bz2
 #MATROSKA_URL := $(CONTRIB_VIDEOLAN)/libmatroska-$(MATROSKA_VERSION).tar.bz2
 
@@ -15,7 +15,6 @@ $(TARBALLS)/libmatroska-$(MATROSKA_VERSION).tar.bz2:
 libmatroska: libmatroska-$(MATROSKA_VERSION).tar.bz2 .sum-matroska
 	$(UNPACK)
 	$(APPLY) $(SRC)/matroska/matroska-pic.patch
-	$(APPLY) $(SRC)/matroska/no-ansi.patch
 	$(MOVE)
 
 .matroska: libmatroska