x265: update to 2.9.

[ci skip]
This commit is contained in:
Christian Buschau 2019-01-10 02:42:06 +01:00 committed by Helmut Pozimski
parent ce3069e826
commit 74fd6dcf23
4 changed files with 35 additions and 17 deletions

View file

@ -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.160 x265-2.8_1
libx265.so.165 x265-2.9_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

View file

@ -1,11 +0,0 @@
--- 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")

View file

@ -0,0 +1,29 @@
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 )
{

View file

@ -1,10 +1,9 @@
# Template file for 'x265'
pkgname=x265
reverts="2.9_1"
version=2.8
revision=3
build_wrksrc=source
version=2.9
revision=1
wrksrc="x265_${version}"
build_wrksrc=source
build_style=cmake
configure_args="-DENABLE_PIC=1"
hostmakedepends="yasm"
@ -13,7 +12,7 @@ maintainer="Juan RP <xtraeme@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://x265.org/"
distfiles="https://bitbucket.org/multicoreware/x265/downloads/x265_${version}.tar.gz"
checksum=6e59f9afc0c2b87a46f98e33b5159d56ffb3558a49d8e3d79cb7fdc6b7aaa863
checksum=ebae687c84a39f54b995417c52a2fdde65a4e2e7ebac5730d251471304b91024
pre_configure() {
if [ "$CROSS_BUILD" ]; then
@ -27,6 +26,7 @@ x265-devel_package() {
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
vmove "usr/lib/*.a"
}
}