From a317f4d2743b1d713cb359b64cf1e6bdbbd7109c Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sat, 6 Oct 2018 02:01:32 -0300 Subject: [PATCH] Revert "x265: update to 2.9." This reverts commit aeef520a2bdfad5e9e3f5ac5e60459c52472fe98. --- common/shlibs | 2 +- srcpkgs/x265/patches/fix-cross.patch | 11 +++++++++++ srcpkgs/x265/template | 8 ++++---- 3 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/x265/patches/fix-cross.patch diff --git a/common/shlibs b/common/shlibs index 77577957ede..89fc589e8a3 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1889,7 +1889,7 @@ libQt5EglFsKmsSupport.so.5 qt5-5.7.1_1 libQt5WebKit.so.5 qt5-webkit-5.6.0_1 libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1 libQt5TextToSpeech.so.5 qt5-speech-5.8.0_1 -libx265.so.165 x265-2.9_1 +libx265.so.160 x265-2.8_1 libQt5Xdg.so.3 libqtxdg-3.1.0_1 libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1 libqwt.so.6 qwt-6.1.3_1 diff --git a/srcpkgs/x265/patches/fix-cross.patch b/srcpkgs/x265/patches/fix-cross.patch new file mode 100644 index 00000000000..e31968a5a80 --- /dev/null +++ b/srcpkgs/x265/patches/fix-cross.patch @@ -0,0 +1,11 @@ +--- source/common/param.cpp.orig 2018-05-28 11:05:41.571934454 +0200 ++++ source/common/param.cpp 2018-05-28 11:05:47.109929916 +0200 +@@ -633,7 +633,7 @@ int x265_param_parse(x265_param* p, cons + if (bValueWasNull) + p->cpuid = atobool(value); + else +- p->cpuid = parseCpuName(value, bError); ++ p->cpuid = parseCpuName(value, bError, false); + #endif + } + OPT("fps") diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template index c5b01b0a575..dea99a44f56 100644 --- a/srcpkgs/x265/template +++ b/srcpkgs/x265/template @@ -1,7 +1,8 @@ # Template file for 'x265' pkgname=x265 -version=2.9 -revision=1 +reverts="2.9_1" +version=2.8 +revision=3 build_wrksrc=source wrksrc="x265_${version}" build_style=cmake @@ -12,8 +13,7 @@ maintainer="Juan RP " license="GPL-2.0-or-later" homepage="http://x265.org/" distfiles="https://bitbucket.org/multicoreware/x265/downloads/x265_${version}.tar.gz" -checksum=ebae687c84a39f54b995417c52a2fdde65a4e2e7ebac5730d251471304b91024 -nocross="libx265.so.165: undefined reference to x265::detect512()" +checksum=6e59f9afc0c2b87a46f98e33b5159d56ffb3558a49d8e3d79cb7fdc6b7aaa863 pre_configure() { if [ "$CROSS_BUILD" ]; then