| Message ID | 20210215094134.2250-1-sebastien.szymanski@armadeus.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | [v2,1/1] package/x265: update project URL | expand |
On Mon, 15 Feb 2021 10:41:34 +0100 Sébastien Szymanski <sebastien.szymanski@armadeus.com> wrote: > diff --git a/package/x265/x265.hash b/package/x265/x265.hash > index 3d70ac0c67..a2246fc84d 100644 > --- a/package/x265/x265.hash > +++ b/package/x265/x265.hash > @@ -1,5 +1,4 @@ > -# From https://mailman.videolan.org/pipermail/x265-devel/2020-February/012880.html > -md5 0c8c747b59b5411dea8cf557554636c1 x265_3.3.tar.gz > # Locally generated > -sha256 f26e148ed1f4dfb33fd1eb3ff5e60e08078d1b2017e88bcbb045b3fb58300b9c x265_3.3.tar.gz > +md5 be6ea7a139b01fa6f2614d5c1197492d x265_3.3.tar.gz > +sha256 c6d744a87eda55560da715f56f878640554ddc06e2d0fcbd822fa330affc22cc x265_3.3.tar.gz This will not work: the same file having two different hashes. 2020.11.x has the same 3.3 version. So if we merge this patch in next, we will have 2020.11.x and 2021.02.x using the old tarball with the old hash, and 2021.05.x using the new tarball with the new hash. Except that sources.buildroot.net can only store one of those tarballs... as they have the same name. Thomas
Am Mon, 15 Feb 2021 14:00:01 +0100 schrieb Thomas Petazzoni: > This will not work: the same file having two different hashes. 2020.11.x > has the same 3.3 version. Hi, what about bumping the package to version 3.4 https://bitbucket.org/multicoreware/x265_git/downloads/?tab=tags along with the change of the URL? Regards, Bernd
>>>>> "Sébastien" == Sébastien Szymanski <sebastien.szymanski@armadeus.com> writes: > The project moved to https://bitbucket.org/multicoreware/x265_git > The archive file has changed (but not its content) so update the hashes > too. > Signed-off-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com> > --- > Changes for v2: > - update hashes Sorry, but this is still not good. If I apply this, then the tarball on sources.buildroot.net no longer has the right sha256sum, and if we change the tarball then this breaks x265 download for all releases since March 2020. How about moving to the 3.4 release instead together with the change of URL? As we already have a copy on sources.buildroot.net of the 3.3 release it isn't so bad that the upstream location failed as we automatically fall back to sources.buildroot.net: make x265-legal-info >>> x265 3.3 Downloading --2021-02-15 22:39:21-- https://bitbucket.org/multicoreware/x265/downloads/x265_3.3.tar.gz Resolving bitbucket.org (bitbucket.org)... 104.192.141.1, 2406:da00:ff00::34cc:ea4a, 2406:da00:ff00::22c5:2ef4, ... Connecting to bitbucket.org (bitbucket.org)|104.192.141.1|:443... connected. HTTP request sent, awaiting response... 404 Not Found 2021-02-15 22:39:22 ERROR 404: Not Found. --2021-02-15 22:39:22-- http://sources.buildroot.net/x265/x265_3.3.tar.gz Resolving sources.buildroot.net (sources.buildroot.net)... 104.26.0.37, 172.67.72.56, 104.26.1.37, ... Connecting to sources.buildroot.net (sources.buildroot.net)|104.26.0.37|:80... connected. HTTP request sent, awaiting response... 200 OK Length: 1438685 (1,4M) [application/x-gtar-compressed] Saving to: ‘/home/peko/source/buildroot/output/build/.x265_3.3.tar.gz.qy2qSJ/output’ /home/peko/source/buildroot/out 100%[======================================================>] 1,37M --.-KB/s in 0,1s 2021-02-15 22:39:25 (9,66 MB/s) - ‘/home/peko/source/buildroot/output/build/.x265_3.3.tar.gz.qy2qSJ/output’ saved [1438685/1438685] x265_3.3.tar.gz: OK (md5: 0c8c747b59b5411dea8cf557554636c1) x265_3.3.tar.gz: OK (sha256: f26e148ed1f4dfb33fd1eb3ff5e60e08078d1b2017e88bcbb045b3fb58300b9c) >>> x265 3.3 Extracting gzip -d -c /var/lib/downloads/x265/x265_3.3.tar.gz | tar --strip-components=1 -C /home/peko/source/buildroot/output/build/x265-3.3 -xf - >>> x265 3.3 Patching Applying 0001-fix-gcc-options.patch using patch: patching file source/CMakeLists.txt Hunk #1 succeeded at 217 (offset 23 lines). Applying 0002-arm-asm-primitives.patch using patch: patching file source/common/arm/asm-primitives.cpp >>> x265 3.3 Collecting legal info COPYING: OK (sha256: d8afb1bcc7a2cfc603683b168d6987ef0a48e59e0da3693bf55c5d33b67e2b49)
diff --git a/package/x265/Config.in b/package/x265/Config.in index 180931db66..1067505d31 100644 --- a/package/x265/Config.in +++ b/package/x265/Config.in @@ -11,7 +11,7 @@ config BR2_PACKAGE_X265 General Public License (GPL) 2 license or a commercial license, similar to the x264 project. - https://bitbucket.org/multicoreware/x265/wiki/Home + https://bitbucket.org/multicoreware/x265_git/wiki/Home if BR2_PACKAGE_X265 diff --git a/package/x265/x265.hash b/package/x265/x265.hash index 3d70ac0c67..a2246fc84d 100644 --- a/package/x265/x265.hash +++ b/package/x265/x265.hash @@ -1,5 +1,4 @@ -# From https://mailman.videolan.org/pipermail/x265-devel/2020-February/012880.html -md5 0c8c747b59b5411dea8cf557554636c1 x265_3.3.tar.gz # Locally generated -sha256 f26e148ed1f4dfb33fd1eb3ff5e60e08078d1b2017e88bcbb045b3fb58300b9c x265_3.3.tar.gz +md5 be6ea7a139b01fa6f2614d5c1197492d x265_3.3.tar.gz +sha256 c6d744a87eda55560da715f56f878640554ddc06e2d0fcbd822fa330affc22cc x265_3.3.tar.gz sha256 d8afb1bcc7a2cfc603683b168d6987ef0a48e59e0da3693bf55c5d33b67e2b49 COPYING diff --git a/package/x265/x265.mk b/package/x265/x265.mk index 872753eea8..7bc1d11e19 100644 --- a/package/x265/x265.mk +++ b/package/x265/x265.mk @@ -6,7 +6,7 @@ X265_VERSION = 3.3 X265_SOURCE = x265_$(X265_VERSION).tar.gz -X265_SITE = https://bitbucket.org/multicoreware/x265/downloads +X265_SITE = https://bitbucket.org/multicoreware/x265_git/downloads X265_LICENSE = GPL-2.0+ X265_LICENSE_FILES = COPYING X265_CPE_ID_VENDOR = multicorewareinc @@ -19,7 +19,7 @@ X265_DEPENDENCIES += host-nasm endif # disable altivec, it has build issues -# https://bitbucket.org/multicoreware/x265/issues/320/ +# https://bitbucket.org/multicoreware/x265_git/issues/320/ ifeq ($(BR2_powerpc64)$(BR2_powerpc64le),y) X265_CONF_OPTS += -DENABLE_ALTIVEC=OFF endif
The project moved to https://bitbucket.org/multicoreware/x265_git The archive file has changed (but not its content) so update the hashes too. Signed-off-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com> --- Changes for v2: - update hashes package/x265/Config.in | 2 +- package/x265/x265.hash | 5 ++--- package/x265/x265.mk | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-)