[vlc-commits] Contribs: libebml, update to 1.3.0

[Jean-Baptiste Kempf]

vlc/vlc-2.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Jul  4 19:11:13 2013 +0200| [5bf1f6579ed97db80293ba6c92a8fafad6e6cecd] | committer: Jean-Baptiste Kempf

Contribs: libebml, update to 1.3.0

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

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

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

diff --git a/contrib/src/ebml/SHA512SUMS b/contrib/src/ebml/SHA512SUMS
index d2da3d9..567b9e1 100644
--- a/contrib/src/ebml/SHA512SUMS
+++ b/contrib/src/ebml/SHA512SUMS
@@ -1 +1 @@
-aa9b446aadbfea6cd7031a08a8cd0251a764febb8ef43ee3ba44d066b945698311bda7db6bb2d983d5f0c1e24f108ae4cf1c6551b04337210b13daf7e2236135  libebml-1.2.2.tar.bz2
+f5687af60e94f167cd341c24f038d57735d447b6279e96b916e3b0a98ca141f3c241ef4c46dd55ac87b0f6007eb14835e0f2a602f89610fcc0b4f93e8b9c87ab  libebml-1.3.0.tar.bz2
diff --git a/contrib/src/ebml/no-ansi.patch b/contrib/src/ebml/no-ansi.patch
index 2a5b42d..3f098a2 100644
--- a/contrib/src/ebml/no-ansi.patch
+++ b/contrib/src/ebml/no-ansi.patch
@@ -1,12 +1,11 @@
-diff -ru libebml-1.2.2/make/linux/Makefile libebml-fix/make/linux/Makefile
---- libebml-1.2.2/make/linux/Makefile	2012-03-31 14:53:46.000000000 +0200
-+++ libebml-fix/make/linux/Makefile	2012-03-31 14:54:28.000000000 +0200
+--- 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 -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow
-+WARNINGFLAGS=-Wall -Wno-unknown-pragmas -fno-gnu-keywords -Wshadow
+-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 3708b33..1d01818 100644
--- a/contrib/src/ebml/rules.mak
+++ b/contrib/src/ebml/rules.mak
@@ -1,6 +1,6 @@
 # ebml
 
-EBML_VERSION := 1.2.2
+EBML_VERSION := 1.3.0
 EBML_URL := http://dl.matroska.org/downloads/libebml/libebml-$(EBML_VERSION).tar.bz2
 #EBML_URL := $(CONTRIB_VIDEOLAN)/libebml-$(EBML_VERSION).tar.bz2