Contribs: update libmatroska to 1.4.0

diff --git a/contrib/src/matroska/SHA512SUMS b/contrib/src/matroska/SHA512SUMS
index 89713367cbb2e0db27800af578bd4ee5d358b9ae..3ca32564d427c1f8227e99d15b66776218517592 100644 (file)
--- 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 14ec7323db5384c1ec0c3ebf12f1f8931458fc0d..92856e355227ad299e97f21aaeaa3f688a87f31e 100644 (file)
--- 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 @@
  \r
  objects_so:=$(objects)\r
  \r
--WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE \\r
-+WARNINGFLAGS=-Wall -Wno-unknown-pragmas -fno-gnu-keywords -D_GNU_SOURCE \\r
+-WARNINGFLAGS=-Wall -Wextra -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE \\r
++WARNINGFLAGS=-Wall -Wextra -Wno-unknown-pragmas -fno-gnu-keywords -D_GNU_SOURCE \\r
                -Wshadow\r
  COMPILEFLAGS=$(DEBUGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(WARNINGFLAGS) $(INCLUDE)\r
  LINKFLAGS=-L. -L$(LIBEBML_LIB_DIR) $(LDFLAGS)\r

diff --git a/contrib/src/matroska/rules.mak b/contrib/src/matroska/rules.mak
index 62ecf0d82b6bab84430356a61371732c94b31566..57d7f15c6f8091cc6ca1db2ac6d33c0b1382347b 100644 (file)
--- 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