[vlc-commits] Contribs: update libmatroska to 1.4.0

[Jean-Baptiste Kempf]

vlc/vlc-2.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Jul  4 19:14:12 2013 +0200| [746b84ce367e222677af6ca55fe7b7a898ac2956] | committer: Jean-Baptiste Kempf

Contribs: update libmatroska to 1.4.0

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

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

 contrib/src/matroska/SHA512SUMS    |    2 +-
 contrib/src/matroska/no-ansi.patch |    9 ++++-----
 contrib/src/matroska/rules.mak     |    2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/contrib/src/matroska/SHA512SUMS b/contrib/src/matroska/SHA512SUMS
index 8971336..3ca3256 100644
--- a/contrib/src/matroska/SHA512SUMS
+++ b/contrib/src/matroska/SHA512SUMS
@@ -1 +1 @@
-adbb5f85b0e55e39b6a5f629bac82041fc8d1ac0cdf8aecc6ea9966320c35aee4fe9437ca620229b7e15d3d8f7c2d4cf1beb71280789e1e6700087b4d2ec0c8a  libmatroska-1.3.0.tar.bz2
+c6bcabfd69dcbf131d1412cbaed5d0eee8f26db702b0ac54b04ff9bdc3c162a6a16fc0e8f4445e88bd1b4536a9fec347b2993484fb3b300077b8e6cf0c9c8950  libmatroska-1.4.0.tar.bz2
diff --git a/contrib/src/matroska/no-ansi.patch b/contrib/src/matroska/no-ansi.patch
index 14ec732..92856e3 100644
--- a/contrib/src/matroska/no-ansi.patch
+++ b/contrib/src/matroska/no-ansi.patch
@@ -1,12 +1,11 @@
-diff -ru libmatroska-1.3.0/make/linux/Makefile libmatroska-fix/make/linux/Makefile
---- libmatroska-1.3.0/make/linux/Makefile	2012-03-31 15:04:21.000000000 +0200
-+++ libmatroska-fix/make/linux/Makefile	2012-03-31 15:05:04.000000000 +0200
+--- 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 -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE \
-+WARNINGFLAGS=-Wall -Wno-unknown-pragmas -fno-gnu-keywords -D_GNU_SOURCE \
+-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 62ecf0d..57d7f15 100644
--- a/contrib/src/matroska/rules.mak
+++ b/contrib/src/matroska/rules.mak
@@ -1,6 +1,6 @@
 # matroska
 
-MATROSKA_VERSION := 1.3.0
+MATROSKA_VERSION := 1.4.0
 MATROSKA_URL := http://dl.matroska.org/downloads/libmatroska/libmatroska-$(MATROSKA_VERSION).tar.bz2
 #MATROSKA_URL := $(CONTRIB_VIDEOLAN)/libmatroska-$(MATROSKA_VERSION).tar.bz2