[vlc-devel] [PATCH] protobuf: use the latest stable protobuf version from github
Steve Lhomme
robux4 at videolabs.io
Thu Sep 17 14:51:28 CEST 2015
---
contrib/src/protobuf/SHA512SUMS | 2 +-
contrib/src/protobuf/rules.mak | 56 +++++++++++------------
extras/tools/packages.mak | 98 ++++++++++++++++++++---------------------
3 files changed, 78 insertions(+), 78 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..6bda2a3 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-devel"),)
+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 $@
diff --git a/extras/tools/packages.mak b/extras/tools/packages.mak
index 146ba7c..fbcfb32 100644
--- a/extras/tools/packages.mak
+++ b/extras/tools/packages.mak
@@ -1,49 +1,49 @@
-GNU=http://ftp.gnu.org/gnu
-APACHE=http://mir2.ovh.net/ftp.apache.org/dist
-SF= http://downloads.sourceforge.net/project
-VIDEOLAN=http://downloads.videolan.org/pub/contrib
-
-YASM_VERSION=1.2.0
-#YASM_URL=$(VIDEOLAN)/yasm-$(YASM_VERSION).tar.gz
-YASM_URL=http://www.tortall.net/projects/yasm/releases/yasm-$(YASM_VERSION).tar.gz
-
-CMAKE_VERSION=3.1.0
-CMAKE_URL=http://www.cmake.org/files/v3.1/cmake-$(CMAKE_VERSION).tar.gz
-
-LIBTOOL_VERSION=2.4.2
-LIBTOOL_URL=$(GNU)/libtool/libtool-$(LIBTOOL_VERSION).tar.gz
-
-AUTOCONF_VERSION=2.69
-AUTOCONF_URL=$(GNU)/autoconf/autoconf-$(AUTOCONF_VERSION).tar.gz
-
-AUTOMAKE_VERSION=1.14
-AUTOMAKE_URL=$(GNU)/automake/automake-$(AUTOMAKE_VERSION).tar.gz
-
-M4_VERSION=1.4.16
-M4_URL=$(GNU)/m4/m4-$(M4_VERSION).tar.gz
-
-PKGCFG_VERSION=0.28-1
-#PKGCFG_URL=http://downloads.videolan.org/pub/videolan/testing/contrib/pkg-config-$(PKGCFG_VERSION).tar.gz
-PKGCFG_URL=$(SF)/pkgconfiglite/$(PKGCFG_VERSION)/pkg-config-lite-$(PKGCFG_VERSION).tar.gz
-
-TAR_VERSION=1.26
-TAR_URL=$(GNU)/tar/tar-$(TAR_VERSION).tar.bz2
-
-XZ_VERSION=5.0.3
-XZ_URL=http://tukaani.org/xz/xz-$(XZ_VERSION).tar.bz2
-
-GAS_VERSION=72887b9
-GAS_URL=http://git.libav.org/?p=gas-preprocessor.git;a=snapshot;h=$(GAS_VERSION);sf=tgz
-
-RAGEL_VERSION=6.8
-RAGEL_URL=http://www.colm.net/files/ragel/ragel-$(RAGEL_VERSION).tar.gz
-
-SED_VERSION=4.2.2
-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
-
+GNU=http://ftp.gnu.org/gnu
+APACHE=http://mir2.ovh.net/ftp.apache.org/dist
+SF= http://downloads.sourceforge.net/project
+VIDEOLAN=http://downloads.videolan.org/pub/contrib
+
+YASM_VERSION=1.2.0
+#YASM_URL=$(VIDEOLAN)/yasm-$(YASM_VERSION).tar.gz
+YASM_URL=http://www.tortall.net/projects/yasm/releases/yasm-$(YASM_VERSION).tar.gz
+
+CMAKE_VERSION=3.1.0
+CMAKE_URL=http://www.cmake.org/files/v3.1/cmake-$(CMAKE_VERSION).tar.gz
+
+LIBTOOL_VERSION=2.4.2
+LIBTOOL_URL=$(GNU)/libtool/libtool-$(LIBTOOL_VERSION).tar.gz
+
+AUTOCONF_VERSION=2.69
+AUTOCONF_URL=$(GNU)/autoconf/autoconf-$(AUTOCONF_VERSION).tar.gz
+
+AUTOMAKE_VERSION=1.14
+AUTOMAKE_URL=$(GNU)/automake/automake-$(AUTOMAKE_VERSION).tar.gz
+
+M4_VERSION=1.4.16
+M4_URL=$(GNU)/m4/m4-$(M4_VERSION).tar.gz
+
+PKGCFG_VERSION=0.28-1
+#PKGCFG_URL=http://downloads.videolan.org/pub/videolan/testing/contrib/pkg-config-$(PKGCFG_VERSION).tar.gz
+PKGCFG_URL=$(SF)/pkgconfiglite/$(PKGCFG_VERSION)/pkg-config-lite-$(PKGCFG_VERSION).tar.gz
+
+TAR_VERSION=1.26
+TAR_URL=$(GNU)/tar/tar-$(TAR_VERSION).tar.bz2
+
+XZ_VERSION=5.0.3
+XZ_URL=http://tukaani.org/xz/xz-$(XZ_VERSION).tar.bz2
+
+GAS_VERSION=72887b9
+GAS_URL=http://git.libav.org/?p=gas-preprocessor.git;a=snapshot;h=$(GAS_VERSION);sf=tgz
+
+RAGEL_VERSION=6.8
+RAGEL_URL=http://www.colm.net/files/ragel/ragel-$(RAGEL_VERSION).tar.gz
+
+SED_VERSION=4.2.2
+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.1
+PROTOBUF_URL := https://github.com/google/protobuf/releases/download/v$(PROTOBUF_VERSION)/protobuf-$(PROTOBUF_VERSION).tar.gz
+
--
2.5.1
More information about the vlc-devel
mailing list