[vlc-commits] contrib: x265: use an official link to get the tarball

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Fri Jul 10 09:27:47 2020 +0200| [17450bb7cf1bc433f030fad7a881a0a080895a45] | committer: Steve Lhomme

contrib: x265: use an official link to get the tarball

The official tarballs (with a proper extraction folder name) are in .tar.gz

The tarballs we used so far are git snapshots.

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

 contrib/src/x265/SHA512SUMS |  2 +-
 contrib/src/x265/rules.mak  | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/contrib/src/x265/SHA512SUMS b/contrib/src/x265/SHA512SUMS
index 68838ae2ae..c91764bede 100644
--- a/contrib/src/x265/SHA512SUMS
+++ b/contrib/src/x265/SHA512SUMS
@@ -1 +1 @@
-a808ffe0da5e13bba42e8f6d6e1bc5bd7e3dfe8515a8177b315565461a5830ce4cb40888e84240521064ba38c0b6676eeb0ecc371a6ca9407b22b90481937350  x265-2.7.tar.bz2
+58582ff5c282a8ca6213a98495b95fa941f323fa454924e4751dde6d2a0e87a08d6e8d98012164a3d83523f2b004e7a1420b60b64719fe30f460dd10ec075094  x265_2.7.tar.gz
diff --git a/contrib/src/x265/rules.mak b/contrib/src/x265/rules.mak
index 308eb4884d..0ed3de65d6 100644
--- a/contrib/src/x265/rules.mak
+++ b/contrib/src/x265/rules.mak
@@ -2,7 +2,7 @@
 
 #X265_GITURL := https://github.com/videolan/x265
 X265_VERSION := 2.7
-X265_SNAPURL := https://bitbucket.org/multicoreware/x265/get/$(X265_VERSION).tar.bz2
+X265_SNAPURL := https://bitbucket.org/multicoreware/x265/downloads/x265_$(X265_VERSION).tar.gz
 
 ifdef BUILD_ENCODERS
 ifdef GPL
@@ -19,15 +19,13 @@ endif
 $(TARBALLS)/x265-git.tar.xz:
 	$(call download_git,$(X265_GITURL))
 
-$(TARBALLS)/x265-$(X265_VERSION).tar.bz2:
+$(TARBALLS)/x265_$(X265_VERSION).tar.gz:
 	$(call download_pkg,$(X265_SNAPURL),x265)
 
-.sum-x265: x265-$(X265_VERSION).tar.bz2
+.sum-x265: x265_$(X265_VERSION).tar.gz
 
-x265: x265-$(X265_VERSION).tar.bz2 .sum-x265
-	rm -Rf $@-$(X265_VERSION)
-	mkdir -p $@-$(X265_VERSION)
-	tar xvjfo "$<" --strip-components=1 -C $@-$(X265_VERSION)
+x265: x265_$(X265_VERSION).tar.gz .sum-x265
+	$(UNPACK)
 	$(APPLY) $(SRC)/x265/x265-ldl-linking.patch
 	$(APPLY) $(SRC)/x265/x265-no-pdb-install.patch
 	$(call pkg_static,"source/x265.pc.in")