[vlc-commits] Tools: update protoc to 3.1.0

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Dec  4 13:11:59 2016 +0100| [1e93312fabccb54253d7aa522843764c7269236b] | committer: Jean-Baptiste Kempf

Tools: update protoc to 3.1.0

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

 extras/tools/packages.mak | 4 ++--
 extras/tools/tools.mak    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extras/tools/packages.mak b/extras/tools/packages.mak
index 239e0ef..567e89f 100644
--- a/extras/tools/packages.mak
+++ b/extras/tools/packages.mak
@@ -42,5 +42,5 @@ SED_URL=$(GNU)/sed/sed-$(SED_VERSION).tar.bz2
 ANT_VERSION=1.9.7
 ANT_URL=$(APACHE)/ant/binaries/apache-ant-$(ANT_VERSION)-bin.tar.bz2
 
-PROTOBUF_VERSION := 2.6.1
-PROTOBUF_URL := https://github.com/google/protobuf/releases/download/v$(PROTOBUF_VERSION)/protobuf-$(PROTOBUF_VERSION).tar.bz2
+PROTOBUF_VERSION := 3.1.0
+PROTOBUF_URL := https://github.com/google/protobuf/releases/download/v$(PROTOBUF_VERSION)/protobuf-cpp-$(PROTOBUF_VERSION).tar.gz
diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak
index e73a781..c52e6ec 100644
--- a/extras/tools/tools.mak
+++ b/extras/tools/tools.mak
@@ -274,10 +274,10 @@ CLEAN_FILE += .ant
 
 # Protobuf Protoc
 
-protobuf-$(PROTOBUF_VERSION).tar.bz2:
+protobuf-$(PROTOBUF_VERSION).tar.gz:
 	$(call download_pkg,$(PROTOBUF_URL),protobuf)
 
-protobuf: protobuf-$(PROTOBUF_VERSION).tar.bz2
+protobuf: protobuf-$(PROTOBUF_VERSION).tar.gz
 	$(UNPACK)
 	$(MOVE)
 
@@ -287,7 +287,7 @@ protobuf: protobuf-$(PROTOBUF_VERSION).tar.bz2
 	touch $@
 
 CLEAN_PKG += protobuf
-DISTCLEAN_PKG += protobuf-$(PROTOBUF_VERSION).tar.bz2
+DISTCLEAN_PKG += protobuf-$(PROTOBUF_VERSION).tar.gz
 CLEAN_FILE += .protoc
 
 #