From 9dfad181d7c4f7077ee1339f287a16ff1aaab138 Mon Sep 17 00:00:00 2001 From: Christian Buschau Date: Thu, 24 Jan 2019 15:19:58 +0100 Subject: [PATCH] x265: update to 3.0. [ci skip] --- common/shlibs | 2 +- srcpkgs/x265/patches/x265-2.9-detect512.patch | 29 ------------------- srcpkgs/x265/template | 6 ++-- 3 files changed, 4 insertions(+), 33 deletions(-) delete mode 100644 srcpkgs/x265/patches/x265-2.9-detect512.patch diff --git a/common/shlibs b/common/shlibs index 53058d2106..35cf029b0f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1893,7 +1893,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.169 x265-3.0_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/x265-2.9-detect512.patch b/srcpkgs/x265/patches/x265-2.9-detect512.patch deleted file mode 100644 index 852f81b784..0000000000 --- a/srcpkgs/x265/patches/x265-2.9-detect512.patch +++ /dev/null @@ -1,29 +0,0 @@ -Source: https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/x265/files/x265-2.9-detect512.patch -Upstream: No -Reason: Fix cross build - ---- source/common/cpu.cpp -+++ source/common/cpu.cpp -@@ -110,6 +110,11 @@ - { "", 0 }, - }; - -+bool detect512() -+{ -+ return(enable512); -+} -+ - #if X265_ARCH_X86 - - extern "C" { -@@ -123,10 +128,6 @@ - #pragma warning(disable: 4309) // truncation of constant value - #endif - --bool detect512() --{ -- return(enable512); --} - uint32_t cpu_detect(bool benableavx512 ) - { - diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template index 2c28681ccc..5c872e2e7f 100644 --- a/srcpkgs/x265/template +++ b/srcpkgs/x265/template @@ -1,7 +1,7 @@ # Template file for 'x265' pkgname=x265 -version=2.9 -revision=2 +version=3.0 +revision=1 wrksrc="x265_${version}" build_wrksrc=source build_style=cmake @@ -12,7 +12,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 +checksum=c5b9fc260cabbc4a81561a448f4ce9cad7218272b4011feabc3a6b751b2f0662 pre_configure() { if [ "$CROSS_BUILD" ]; then