[vlc-devel] [PATCH 2/5] protobuf: use the latest stable protobuf version from github

[Steve Lhomme]

---
 contrib/src/protobuf/SHA512SUMS |  2 +-
 contrib/src/protobuf/rules.mak  | 12 ++++++------
 extras/tools/packages.mak       |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/contrib/src/protobuf/SHA512SUMS b/contrib/src/protobuf/SHA512SUMS
index 4e0dd6e..e1c4f70 100644
--- a/contrib/src/protobuf/SHA512SUMS
+++ b/contrib/src/protobuf/SHA512SUMS
@@ -1 +1 @@
-a59a6d28d1653335fee42eff074f54b317d79d50361ed27d16502012ebb68bf7932ff80be4ce1588829940d6fdf77d113536ee3b27b72959577527ca488eddab  protobuf-2.6.0.tar.bz2
+818ac4ad24aca84d214d14ac860a75c14494528821af144d3cb603f69c94d4500512814be6d62cc82973804ebfa99eb94d9f034b309f53cadb622603a7886a3e  protobuf-2.6.1.tar.gz
diff --git a/contrib/src/protobuf/rules.mak b/contrib/src/protobuf/rules.mak
index eed116e..6d855ba 100644
--- a/contrib/src/protobuf/rules.mak
+++ b/contrib/src/protobuf/rules.mak
@@ -1,20 +1,20 @@
 # protobuf
-PROTOBUF_VERSION := 2.6.0
-PROTOBUF_URL := https://protobuf.googlecode.com/svn/rc/protobuf-$(PROTOBUF_VERSION).tar.bz2
+PROTOBUF_VERSION := 2.6.1
+PROTOBUF_URL := https://github.com/google/protobuf/releases/download/v$(PROTOBUF_VERSION)/protobuf-$(PROTOBUF_VERSION).tar.gz
 
 PKGS += protobuf
-ifeq ($(call need_pkg,"protobuf"),)
+ifeq ($(call need_pkg,"protobuf-devel"),)
 PKGS_FOUND += protobuf
 endif
 
-$(TARBALLS)/protobuf-$(PROTOBUF_VERSION).tar.bz2:
+$(TARBALLS)/protobuf-$(PROTOBUF_VERSION).tar.gz:
 	$(call download,$(PROTOBUF_URL))
 
-.sum-protobuf: protobuf-$(PROTOBUF_VERSION).tar.bz2
+.sum-protobuf: protobuf-$(PROTOBUF_VERSION).tar.gz
 
 DEPS_protobuf = zlib $(DEPS_zlib)
 
-protobuf: protobuf-$(PROTOBUF_VERSION).tar.bz2 .sum-protobuf
+protobuf: protobuf-$(PROTOBUF_VERSION).tar.gz .sum-protobuf
 	$(UNPACK)
 ifdef HAVE_WIN32
 	$(APPLY) $(SRC)/protobuf/win32.patch
diff --git a/extras/tools/packages.mak b/extras/tools/packages.mak
index 146ba7c..5122f6c 100644
--- a/extras/tools/packages.mak
+++ b/extras/tools/packages.mak
@@ -44,6 +44,6 @@ SED_URL=$(GNU)/sed/sed-$(SED_VERSION).tar.bz2
 ANT_VERSION=1.9.5
 ANT_URL=$(APACHE)/ant/binaries/apache-ant-$(ANT_VERSION)-bin.tar.bz2
 
-PROTOBUF_VERSION := 2.6.0
-PROTOBUF_URL := https://protobuf.googlecode.com/svn/rc/protobuf-$(PROTOBUF_VERSION).tar.bz2
+PROTOBUF_VERSION := 2.6.1
+PROTOBUF_URL := https://github.com/google/protobuf/releases/download/v$(PROTOBUF_VERSION)/protobuf-$(PROTOBUF_VERSION).tar.gz
 
-- 
2.5.1