[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:34:07 2014 +0200| [30fe07ba7b0d8d7f50239935bb9ade942fddb44d] | committer: Jean-Baptiste Kempf

Contrib: update protobuf to 2.6.0

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

 contrib/src/protobuf/SHA512SUMS |    2 +-
 contrib/src/protobuf/rules.mak  |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

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 $@