From 7a87e145711ff7fdbf5925637abc769b7864a504 Mon Sep 17 00:00:00 2001 From: Mattias Wadman Date: Tue, 15 Oct 2024 12:51:15 +0200 Subject: [PATCH] Use x265 releases again master seems unstable and hopefully there will be more regular releases now --- Dockerfile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index fe755f7..e2c6b1a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -874,19 +874,18 @@ RUN \ --disable-swscale && \ make -j$(nproc) install -# x265 release is over 1 years old and master branch has a lot of fixes and improvements, so we checkout commit so no hash is needed -# bump: x265 /X265_VERSION=([[:xdigit:]]+)/ gitrefs:https://bitbucket.org/multicoreware/x265_git.git|re:#^refs/heads/master$#|@commit +# bump: x265 /X265_VERSION=([\d.]+)/ https://bitbucket.org/multicoreware/x265_git.git|* # bump: x265 after ./hashupdate Dockerfile X265 $LATEST # bump: x265 link "Source diff $CURRENT..$LATEST" https://bitbucket.org/multicoreware/x265_git/branches/compare/$LATEST..$CURRENT#diff -ARG X265_VERSION=487105dcd21d0f36a7a9e0ec50de85577b9bed04 -ARG X265_SHA256=f77e093f4fd0a1867bace75357b7844e360b2ce460330558ac4ee85346123fbb -ARG X265_URL="https://bitbucket.org/multicoreware/x265_git/get/$X265_VERSION.tar.bz2" +ARG X265_VERSION=4.0 +ARG X265_SHA256=75b4d05629e365913de3100b38a459b04e2a217a8f30efaa91b572d8e6d71282 +ARG X265_URL="https://bitbucket.org/multicoreware/x265_git/downloads/x265_$X265_VERSION.tar.gz" # CMAKEFLAGS issue # https://bitbucket.org/multicoreware/x265_git/issues/620/support-passing-cmake-flags-to-multilibsh RUN \ wget $WGET_OPTS -O x265_git.tar.bz2 "$X265_URL" && \ echo "$X265_SHA256 x265_git.tar.bz2" | sha256sum -c - && \ - tar $TAR_OPTS x265_git.tar.bz2 && cd multicoreware-x265_git-*/build/linux && \ + tar $TAR_OPTS x265_git.tar.bz2 && cd x265_-*/build/linux && \ sed -i '/^cmake / s/$/ -G "Unix Makefiles" ${CMAKEFLAGS}/' ./multilib.sh && \ sed -i 's/ -DENABLE_SHARED=OFF//g' ./multilib.sh && \ MAKEFLAGS="-j$(nproc)" \