diff options
| -rw-r--r-- | user/x265/APKBUILD | 8 | ||||
| -rw-r--r-- | user/x265/build-on-any-non-x86.patch | 24 | ||||
| -rw-r--r-- | user/x265/work-on-any-non-x86.patch | 11 |
3 files changed, 28 insertions, 15 deletions
diff --git a/user/x265/APKBUILD b/user/x265/APKBUILD index cf8090f45..b992a0e6a 100644 --- a/user/x265/APKBUILD +++ b/user/x265/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=x265 -pkgver=2.8 +pkgver=2.9 pkgrel=0 pkgdesc="Open Source H265/HEVC video encoder" url="http://x265.org" @@ -11,7 +11,7 @@ license="GPL-2.0-only" makedepends="cmake yasm" # 2.6+ will use nasm instead of yasm subpackages="$pkgname-dev" source="$pkgname-$pkgver.tar.gz::https://bitbucket.org/multicoreware/$pkgname/downloads/${pkgname}_${pkgver}.tar.gz - work-on-any-non-x86.patch + build-on-any-non-x86.patch x265-unbreak-my-arm.patch" builddir="$srcdir/${pkgname}_$pkgver" @@ -48,6 +48,6 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c2a8eaec64aa022badcbcd2a96304a9abd9d08489300b6a9c4c9d76066f3d9848e6948238c84ae16ea91bff0b2fac528a67ee29950d94dcd0ea7c0e9e7baa714 x265-2.8.tar.gz -cbd0372fe5d83047314be71da89694ccd28dab6f183ae55bafed4a1bf81861d47877c77838ab6dc72e54f268390f8ae4076be17ece1cf721147c2c4bbf3c2900 work-on-any-non-x86.patch +sha512sums="270818c7fd84947fde371e32bef225c1880cfb0bcd95378d95b51f50577a134d7cd585fcdfa43b103a24d76c5ad826b09509a07eb9e208e8f2b56f2f77365cf3 x265-2.9.tar.gz +453acad171d572fdff283cc8b4cdf3707839ae9f13de610416e1298375b218c77dc9870c7367385f7fefaa3d3e66d8c5db76966e66004fa8dde7c40648b0af45 build-on-any-non-x86.patch ac3ecc613fe4da11672de8f397b5541fe2af29b7dd91a48859bfe8824934a5966c41ca30de242564c46f1a0cdd2a0da9331d9f547fc21120066fb3c45347c4c4 x265-unbreak-my-arm.patch" diff --git a/user/x265/build-on-any-non-x86.patch b/user/x265/build-on-any-non-x86.patch new file mode 100644 index 000000000..f92395629 --- /dev/null +++ b/user/x265/build-on-any-non-x86.patch @@ -0,0 +1,24 @@ +--- x265_2.9/source/common/cpu.cpp.orig 2018-10-05 12:14:40.000000000 +0000 ++++ x265_2.9/source/common/cpu.cpp 2018-10-19 02:24:48.780000000 +0000 +@@ -59,6 +59,10 @@ + + namespace X265_NS { + static bool enable512 = false; ++bool detect512() ++{ ++ return(enable512); ++} + const cpu_name_t cpu_names[] = + { + #if X265_ARCH_X86 +@@ -123,10 +127,6 @@ + #pragma warning(disable: 4309) // truncation of constant value + #endif + +-bool detect512() +-{ +- return(enable512); +-} + uint32_t cpu_detect(bool benableavx512 ) + { + diff --git a/user/x265/work-on-any-non-x86.patch b/user/x265/work-on-any-non-x86.patch deleted file mode 100644 index cdfbed72f..000000000 --- a/user/x265/work-on-any-non-x86.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- x265_2.8/source/common/param.cpp.old 2018-05-21 08:33:10.000000000 +0000 -+++ x265_2.8/source/common/param.cpp 2018-07-18 06:18:41.120000000 +0000 -@@ -633,7 +633,7 @@ - if (bValueWasNull) - p->cpuid = atobool(value); - else -- p->cpuid = parseCpuName(value, bError); -+ p->cpuid = parseCpuName(value, bError, false); - #endif - } - OPT("fps") |