From fd89259db6b9a5b889fdcedd0e7017c83e2860e4 Mon Sep 17 00:00:00 2001
From: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
Date: Mon, 16 Mar 2015 11:21:37 -0400
Subject: [PATCH] contrib: use fixed commit in git repo to dl x264

Refs #68606

Change-Id: I41c91e9c3066f4dbe128073b223705df03d3da6b
---
 daemon/contrib/src/x264/rules.mak | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/daemon/contrib/src/x264/rules.mak b/daemon/contrib/src/x264/rules.mak
index ff00dcbe9e..a272387ee0 100644
--- a/daemon/contrib/src/x264/rules.mak
+++ b/daemon/contrib/src/x264/rules.mak
@@ -1,6 +1,7 @@
 # x264
 
-X264_SNAPURL := http://download.videolan.org/contrib/x264-git.tar.gz
+X264_HASH := fa3cac516cb71b8ece09cedbfd0ce631ca8a2a4c
+X264_GITURL := git://git.videolan.org/x264.git
 
 ifeq ($(call need_pkg,"x264 >= 0.86"),)
 PKGS_FOUND += x264
@@ -24,17 +25,17 @@ ifdef HAVE_CROSS_COMPILE
 X264CONF += --cross-prefix="$(HOST)-"
 endif
 
-$(TARBALLS)/x264-git.tar.gz:
-	$(call download,$(X264_SNAPURL))
+$(TARBALLS)/x264-$(X264_HASH).tar.xz:
+	$(call download_git,$(X264_GITURL),master,$(X264_HASH))
 
-.sum-x264: x264-git.tar.gz
+.sum-x264: x264-$(X264_HASH).tar.xz
 	$(warning $@ not implemented)
 	touch $@
 
-x264: x264-git.tar.gz .sum-x264
-	rm -Rf $@-git
-	mkdir -p $@-git
-	$(ZCAT) "$<" | (cd $@-git && tar xv --strip-components=1)
+x264: x264-$(X264_HASH).tar.xz .sum-x264
+	rm -Rf $@-$(X264_HASH)
+	mkdir -p $@-$(X264_HASH)
+	(cd $@-$(X264_HASH) && tar xv --strip-components=1 -f ../$<)
 	$(APPLY) $(SRC)/x264/remove-align.patch
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)
-- 
GitLab