[vlc-devel] [PATCH] contrib: use the latest stable protobuf version from github

[Steve Lhomme]

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

diff --git a/contrib/src/protobuf/SHA512SUMS b/contrib/src/protobuf/SHA512SUMS
index 4e0dd6e..d0fd60e 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..9482029 100644
--- a/contrib/src/protobuf/rules.mak
+++ b/contrib/src/protobuf/rules.mak
@@ -1,28 +1,28 @@
-# protobuf
-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"),)
-PKGS_FOUND += protobuf
-endif
-
-$(TARBALLS)/protobuf-$(PROTOBUF_VERSION).tar.bz2:
-	$(call download,$(PROTOBUF_URL))
-
-.sum-protobuf: protobuf-$(PROTOBUF_VERSION).tar.bz2
-
-DEPS_protobuf = zlib $(DEPS_zlib)
-
-protobuf: protobuf-$(PROTOBUF_VERSION).tar.bz2 .sum-protobuf
-	$(UNPACK)
-ifdef HAVE_WIN32
-	$(APPLY) $(SRC)/protobuf/win32.patch
-endif
-	$(MOVE)
-
-.protobuf: protobuf
-	$(RECONF)
-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --with-protoc=protoc
-	cd $< && $(MAKE) && $(MAKE) install
-	touch $@
+# protobuf
+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"),)
+PKGS_FOUND += protobuf
+endif
+
+$(TARBALLS)/protobuf-$(PROTOBUF_VERSION).tar.gz:
+	$(call download,$(PROTOBUF_URL))
+
+.sum-protobuf: protobuf-$(PROTOBUF_VERSION).tar.gz
+
+DEPS_protobuf = zlib $(DEPS_zlib)
+
+protobuf: protobuf-$(PROTOBUF_VERSION).tar.gz .sum-protobuf
+	$(UNPACK)
+ifdef HAVE_WIN32
+	$(APPLY) $(SRC)/protobuf/win32.patch
+endif
+	$(MOVE)
+
+.protobuf: protobuf
+	$(RECONF)
+	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --with-protoc=protoc
+	cd $< && $(MAKE) && $(MAKE) install
+	touch $@
-- 
2.5.1