summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2018-07-18 01:33:41 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2018-07-18 01:33:41 -0500
commitc7b734339515450c5e38329aa74618d224043e6c (patch)
tree4c16d626b6e34765f532c0c024fd2c5ce80af7c6
parenta33ccb6922dc4db426d1fe9393f320eead0e424f (diff)
downloadpackages-c7b734339515450c5e38329aa74618d224043e6c.tar.gz
packages-c7b734339515450c5e38329aa74618d224043e6c.tar.bz2
packages-c7b734339515450c5e38329aa74618d224043e6c.tar.xz
packages-c7b734339515450c5e38329aa74618d224043e6c.zip
user/x265: bump to 2.8, fix build, stuff
-rw-r--r--user/x265/APKBUILD17
-rw-r--r--user/x265/work-on-any-non-x86.patch11
2 files changed, 20 insertions, 8 deletions
diff --git a/user/x265/APKBUILD b/user/x265/APKBUILD
index 80f3fae39..cf8090f45 100644
--- a/user/x265/APKBUILD
+++ b/user/x265/APKBUILD
@@ -1,31 +1,31 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=x265
-pkgver=2.6
+pkgver=2.8
pkgrel=0
pkgdesc="Open Source H265/HEVC video encoder"
url="http://x265.org"
arch="all"
-license="GPL"
-options="textrels"
+options="textrel"
+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
x265-unbreak-my-arm.patch"
-builddir="$srcdir/${pkgname}_v$pkgver"
+builddir="$srcdir/${pkgname}_$pkgver"
build() {
cd "$builddir"/build/linux
- # It has textrel on x86 so we disable asm.
local cmake_opts=""
case "$CARCH" in
- x86) cmake_opts="-DENABLE_ASSEMBLY=OFF";;
+ # unfortunately, AltiVec code is very broken (more than 1000 errors)
ppc*) cmake_opts="-DENABLE_ALTIVEC=OFF -DCPU_POWER8=OFF";;
esac
cmake \
- -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_VERBOSE_MAKEFILE=ON \
$cmake_opts \
@@ -48,5 +48,6 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="35c3716313e3dfd1555dd725b60f2b3b00a615d8b8d8267439722b52021d47e34eebf94b837b92a92d40c7ffab7b3198d6391365d62672b257c0a87d1db8a736 x265-2.6.tar.gz
+sha512sums="c2a8eaec64aa022badcbcd2a96304a9abd9d08489300b6a9c4c9d76066f3d9848e6948238c84ae16ea91bff0b2fac528a67ee29950d94dcd0ea7c0e9e7baa714 x265-2.8.tar.gz
+cbd0372fe5d83047314be71da89694ccd28dab6f183ae55bafed4a1bf81861d47877c77838ab6dc72e54f268390f8ae4076be17ece1cf721147c2c4bbf3c2900 work-on-any-non-x86.patch
ac3ecc613fe4da11672de8f397b5541fe2af29b7dd91a48859bfe8824934a5966c41ca30de242564c46f1a0cdd2a0da9331d9f547fc21120066fb3c45347c4c4 x265-unbreak-my-arm.patch"
diff --git a/user/x265/work-on-any-non-x86.patch b/user/x265/work-on-any-non-x86.patch
new file mode 100644
index 000000000..cdfbed72f
--- /dev/null
+++ b/user/x265/work-on-any-non-x86.patch
@@ -0,0 +1,11 @@
+--- 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")