[vlc-commits] Extras: add protoc

Jean-Baptiste Kempf git at videolan.org
Wed Oct 8 13:05:49 CEST 2014


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Oct  8 12:58:06 2014 +0200| [c07175b094b93cf868104dfc9af37b5a2355f71c] | committer: Jean-Baptiste Kempf

Extras: add protoc

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

 extras/tools/bootstrap    |    1 +
 extras/tools/packages.mak |    4 ++++
 extras/tools/tools.mak    |   18 ++++++++++++++++++
 3 files changed, 23 insertions(+)

diff --git a/extras/tools/bootstrap b/extras/tools/bootstrap
index 905d128..5d1bd11 100755
--- a/extras/tools/bootstrap
+++ b/extras/tools/bootstrap
@@ -80,6 +80,7 @@ check yasm
 check_tar
 check ragel
 check_sed
+check protoc
 
 [ -n "$NEEDED" ] && mkdir -p build/
 
diff --git a/extras/tools/packages.mak b/extras/tools/packages.mak
index 00160f4..7f43d14 100644
--- a/extras/tools/packages.mak
+++ b/extras/tools/packages.mak
@@ -42,3 +42,7 @@ SED_URL=$(GNU)/sed/sed-$(SED_VERSION).tar.bz2
 
 ANT_VERSION=1.9.4
 ANT_URL=$(APACHE)/ant/binaries/apache-ant-$(ANT_VERSION)-bin.tar.bz2
+
+PROTOBUF_VERSION := 2.5.0
+PROTOBUF_URL := https://protobuf.googlecode.com/files/protobuf-$(PROTOBUF_VERSION).tar.bz2
+
diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak
index 231e86a..2553413 100644
--- a/extras/tools/tools.mak
+++ b/extras/tools/tools.mak
@@ -265,6 +265,24 @@ CLEAN_PKG += ant
 DISTCLEAN_PKG += apache-ant-$(ANT_VERSION).tar.bz2
 CLEAN_FILE += .ant
 
+
+# Protobuf Protoc
+
+protobuf-$(PROTOBUF_VERSION).tar.bz2:
+	$(call download,$(PROTOBUF_URL))
+
+protobuf: protobuf-$(PROTOBUF_VERSION).tar.bz2
+	$(UNPACK)
+	$(MOVE)
+
+.protoc: protobuf
+	(cd $< && ./configure --prefix="$(PREFIX)" && $(MAKE) && $(MAKE) install)
+	touch $@
+
+CLEAN_PKG += protobuf
+DISTCLEAN_PKG += protobuf-$(PROTOBUF_VERSION).tar.bz2
+CLEAN_FILE += .protoc
+
 #
 #
 #



More information about the vlc-commits mailing list