From 109031b338b1624e30ff49aedefe4a6cd96827bc Mon Sep 17 00:00:00 2001
From: Adrien Beraud <adrien.beraud@savoirfairelinux.com>
Date: Thu, 22 Jun 2017 16:02:42 +0200
Subject: [PATCH] extra/tools: update gaz-preprocessor

An old, unsupported version of gaz-preprocessor
was used. Current FFmpeg for Android/iOS requires
a new version.

Update gaz-preprocessor by downloading the standalone
perl script directly from the FFmpeg repo

Change-Id: If77ef756e17ef8a5899d746f7e882337e7bef8eb
---
 extras/tools/bootstrap    |  2 +-
 extras/tools/packages.mak |  4 ++--
 extras/tools/tools.mak    | 13 ++++---------
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/extras/tools/bootstrap b/extras/tools/bootstrap
index c03cb6c67..d6712e23d 100755
--- a/extras/tools/bootstrap
+++ b/extras/tools/bootstrap
@@ -111,7 +111,7 @@ $CXX
 PREFIX=\$(abspath ./build)
 
 all: $NEEDED
-	@echo "You are ready to build SFLPhone and its contribs"
+	@echo "You are ready to build Ring and its contribs"
 
 include tools.mak
 EOF
diff --git a/extras/tools/packages.mak b/extras/tools/packages.mak
index a7b808024..7a3b7258e 100644
--- a/extras/tools/packages.mak
+++ b/extras/tools/packages.mak
@@ -31,8 +31,8 @@ TAR_URL=$(GNU)/tar/tar-$(TAR_VERSION).tar.bz2
 XZ_VERSION=5.2.2
 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
+GAS_VERSION=36bacb4cba27003c572e5bf7a9c4dfe3c9a8d40d
+GAS_URL=https://github.com/FFmpeg/gas-preprocessor/blob/$(GAS_VERSION)/gas-preprocessor.pl
 
 SED_VERSION=4.2.2
 SED_URL=$(GNU)/sed/sed-$(SED_VERSION).tar.bz2
diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak
index 19f477418..2595b2521 100644
--- a/extras/tools/tools.mak
+++ b/extras/tools/tools.mak
@@ -211,21 +211,16 @@ CLEAN_PKG += pkgconfig
 DISTCLEAN_PKG += pkg-config-$(PKGCFG_VERSION).tar.gz
 
 # gas-preprocessor
-gas-preprocessor-$(GAS_VERSION).tar.gz:
+gas-preprocessor-$(GAS_VERSION).pl:
 	$(call download,$(GAS_URL))
 
-gas: gas-preprocessor-$(GAS_VERSION).tar.gz
-	$(UNPACK)
-	$(MOVE)
-
-.gas: gas
+.gas: gas-preprocessor-$(GAS_VERSION).pl
 	mkdir -p $(PREFIX)/bin
-	cp gas/gas-preprocessor.pl $(PREFIX)/build/bin/
+	cp gas-preprocessor-$(GAS_VERSION).pl $(PREFIX)/bin/gas-preprocessor
 	touch $@
 
 CLEAN_FILE += .gas
-CLEAN_PKG += gas
-DISTCLEAN_PKG += yuvi-gas-preprocessor-$(GAS_VERSION).tar.gz
+DISTCLEAN_PKG += gas-preprocessor-$(GAS_VERSION).pl
 
 # GNU sed