[vlc-devel] [PATCH 6/6] tools: don't build protoc anymore

[Steve Lhomme]

It's better handled in contribs were the versions is the same and the system
package detection is better.
---
 extras/tools/bootstrap    | 17 -----------------
 extras/tools/packages.mak |  3 ---
 extras/tools/tools.mak    | 18 ------------------
 3 files changed, 38 deletions(-)

diff --git a/extras/tools/bootstrap b/extras/tools/bootstrap
index fdb04c9ca86..5c2f3cb6f88 100755
--- a/extras/tools/bootstrap
+++ b/extras/tools/bootstrap
@@ -112,22 +112,6 @@ else
 fi
 }
 
-check_majmin() {
-if ! $1 --version >/dev/null 2>&1 && ! $1 -version >/dev/null 2>&1 && ! $1 --version 2>/dev/null
-then
-    echo "$1 not found"
-    NEEDED="$NEEDED $1"
-else
-    # found, need to check version ?
-    if [ -z "$2" ];then
-        FOUND="$FOUND $1"
-    else
-        gotver=`$1 --version | head -1 | sed s/'.* '//`
-        check_version_majmin $1 $gotver $2
-    fi
-fi
-}
-
 check autoconf 2.69
 check automake 1.15
 check m4 1.4.16
@@ -138,7 +122,6 @@ check yasm
 check_tar
 check ragel
 check_sed
-check_majmin protoc 3.1.0
 check ant
 check xz
 check bison 3.0.0
diff --git a/extras/tools/packages.mak b/extras/tools/packages.mak
index e935f77b4a5..bb3f6a8a6af 100644
--- a/extras/tools/packages.mak
+++ b/extras/tools/packages.mak
@@ -45,9 +45,6 @@ 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 := 3.1.0
-PROTOBUF_URL := https://github.com/google/protobuf/releases/download/v$(PROTOBUF_VERSION)/protobuf-cpp-$(PROTOBUF_VERSION).tar.gz
-
 BISON_VERSION=3.0.4
 BISON_URL=$(GNU)/bison/bison-$(BISON_VERSION).tar.xz
 
diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak
index d008a5a7e7a..a82e154a7fc 100644
--- a/extras/tools/tools.mak
+++ b/extras/tools/tools.mak
@@ -322,24 +322,6 @@ DISTCLEAN_PKG += apache-ant-$(ANT_VERSION).tar.bz2
 CLEAN_FILE += .buildant
 
 
-# Protobuf Protoc
-
-protobuf-$(PROTOBUF_VERSION).tar.gz:
-	$(call download_pkg,$(PROTOBUF_URL),protobuf)
-
-protobuf: protobuf-$(PROTOBUF_VERSION).tar.gz
-	$(UNPACK)
-	$(MOVE)
-
-.buildprotoc: protobuf
-	(cd $< && ./configure --prefix="$(PREFIX)" --disable-shared --enable-static && $(MAKE) && $(MAKE) install)
-	(find $(PREFIX) -name 'protobuf*.pc' -exec rm -f {} \;)
-	touch $@
-
-CLEAN_PKG += protobuf
-DISTCLEAN_PKG += protobuf-$(PROTOBUF_VERSION).tar.gz
-CLEAN_FILE += .buildprotoc
-
 #
 # GNU bison
 #
-- 
2.17.1