[vlc-commits] Contrib: update protobuf to 2.6.0

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Oct 11 14:12:02 2014 +0200| [c649ac4586ee83132708ac281dd5228c1398e2bb] | committer: Jean-Baptiste Kempf

Contrib: update protobuf to 2.6.0

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

 configure.ac                    |    8 ++++++++
 contrib/src/protobuf/SHA512SUMS |    2 +-
 contrib/src/protobuf/rules.mak  |    6 +++---
 modules/codec/mft.c             |    2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 895f2d0..80ca214 100644
--- a/configure.ac
+++ b/configure.ac
@@ -412,6 +412,14 @@ AS_IF([test -n "${CONTRIB_DIR}"], [
 ])
 AC_SUBST(CONTRIB_DIR)
 
+
+TOOLS_DIR="${srcdir}/extras/tools/build"
+AS_IF([test -d "${TOOLS_DIR}"], [
+    TOOLS_DIR=`cd "${TOOLS_DIR}" && pwd`
+    export PATH=${TOOLS_DIR}:$PATH
+    AC_MSG_ERROR([$PATH])
+])
+
 dnl
 dnl  Libtool
 dnl  It's very bad, but our former custom system was worst
diff --git a/contrib/src/protobuf/SHA512SUMS b/contrib/src/protobuf/SHA512SUMS
index 1367522..4e0dd6e 100644
--- a/contrib/src/protobuf/SHA512SUMS
+++ b/contrib/src/protobuf/SHA512SUMS
@@ -1 +1 @@
-5994b3669808b82fef5c860ecad36358c0767f84acac877e7bfcf722e59d972835a955714149bdd4158fbd1328a51d01397a563991d26475351ee72be48142ee  protobuf-2.5.0.tar.bz2
+a59a6d28d1653335fee42eff074f54b317d79d50361ed27d16502012ebb68bf7932ff80be4ce1588829940d6fdf77d113536ee3b27b72959577527ca488eddab  protobuf-2.6.0.tar.bz2
diff --git a/contrib/src/protobuf/rules.mak b/contrib/src/protobuf/rules.mak
index c1d0d24..eed116e 100644
--- a/contrib/src/protobuf/rules.mak
+++ b/contrib/src/protobuf/rules.mak
@@ -1,6 +1,6 @@
 # protobuf
-PROTOBUF_VERSION := 2.5.0
-PROTOBUF_URL := https://protobuf.googlecode.com/files/protobuf-$(PROTOBUF_VERSION).tar.bz2
+PROTOBUF_VERSION := 2.6.0
+PROTOBUF_URL := https://protobuf.googlecode.com/svn/rc/protobuf-$(PROTOBUF_VERSION).tar.bz2
 
 PKGS += protobuf
 ifeq ($(call need_pkg,"protobuf"),)
@@ -24,5 +24,5 @@ endif
 .protobuf: protobuf
 	$(RECONF)
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --with-protoc=protoc
-	cd $< && $(MAKE) install
+	cd $< && $(MAKE) && $(MAKE) install
 	touch $@
diff --git a/modules/codec/mft.c b/modules/codec/mft.c
index 143a308..3a81079 100644
--- a/modules/codec/mft.c
+++ b/modules/codec/mft.c
@@ -172,7 +172,7 @@ static const pair_format_guid video_format_table[] =
     { 0, NULL }
 };
 
-DEFINE_GUID(MFAudioFormat_Dolby_AC3, 0xe06d802c, 0xdb46, 0x11cf, 0xb4, 0xd1, 0x00, 0x80, 0x5f, 0x6c, 0xbb, 0xea);
+//DEFINE_GUID(MFAudioFormat_Dolby_AC3, 0xe06d802c, 0xdb46, 0x11cf, 0xb4, 0xd1, 0x00, 0x80, 0x5f, 0x6c, 0xbb, 0xea);
 /*
  * We cannot use the FOURCC code for audio either since the
  * WAVE_FORMAT value is used to create the GUID.