[vlc-commits] contrib: x264: Use a unique file name for the x264 snapshot tarball download

[Martin Storsjö]

vlc/vlc-3.0 | branch: master | Martin Storsjö <martin at martin.st> | Wed Mar 28 10:24:29 2018 +0300| [d5c4366c1be7fcf0db37527675a8e65afd929093] | committer: Jean-Baptiste Kempf

contrib: x264: Use a unique file name for the x264 snapshot tarball download

Treat x264 as an (almost) normal package to download, except for not
checking for the download in http://downloads.videolan.org/pub/contrib.

This fixes building contribs with a prepopulated tarballs directory,
even if the x264 snapshot version changes.

Alternatively, the x264 contrib could be changed to use download_git
with proper support for pinning to a specific git hash.

(Not touching the x262 part since that doesn't seem to be working
at all right now. Downloading x262 fails since it tries to download
from an undefined X262_SNAPURL.)

(cherry picked from commit 0845207525933a4da28238b56ef7e77daff00c54)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 contrib/src/x264/SHA512SUMS | 1 +
 contrib/src/x264/rules.mak  | 9 ++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/contrib/src/x264/SHA512SUMS b/contrib/src/x264/SHA512SUMS
new file mode 100644
index 0000000000..7fc97eeed0
--- /dev/null
+++ b/contrib/src/x264/SHA512SUMS
@@ -0,0 +1 @@
+cc8f47cb553787a294fba11ca5ca05e2448348e3bde1f5d9c9c297901c8b86e11d7a0e18a518f9dc3a47f06fdc557727f9900c209cecd5179596e13e83fef381  x264-snapshot-20180324-2245.tar.bz2
diff --git a/contrib/src/x264/rules.mak b/contrib/src/x264/rules.mak
index 9d7e7a657f..ce2128dba9 100644
--- a/contrib/src/x264/rules.mak
+++ b/contrib/src/x264/rules.mak
@@ -3,6 +3,7 @@
 X264_GITURL := git://git.videolan.org/x264.git
 X264_SNAPURL := http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20171224-2245-stable.tar.bz2
 X262_GITURL := git://git.videolan.org/x262.git
+X264_BASENAME := $(notdir $(X264_SNAPURL))
 
 ifdef BUILD_ENCODERS
 ifdef GPL
@@ -58,7 +59,7 @@ $(TARBALLS)/x262-git.tar.gz:
 $(TARBALLS)/x264-git.tar.xz:
 	$(call download_git,$(X264_GITURL))
 
-$(TARBALLS)/x264-git.tar.bz2:
+$(TARBALLS)/$(X264_BASENAME):
 	$(call download,$(X264_SNAPURL))
 
 .sum-x262: x262-git.tar.gz
@@ -68,11 +69,9 @@ $(TARBALLS)/x264-git.tar.bz2:
 .sum-x26410b: .sum-x264
 	touch $@
 
-.sum-x264: x264-git.tar.bz2
-	$(warning $@ not implemented)
-	touch $@
+.sum-x264: $(X264_BASENAME)
 
-x264 x26410b: %: x264-git.tar.bz2 .sum-%
+x264 x26410b: %: $(X264_BASENAME) .sum-%
 	rm -Rf $*-git
 	mkdir -p $*-git
 	tar xvjf "$<" --strip-components=1 -C $*-git