summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO4
-rw-r--r--0001-Disable-neon.patch19
-rw-r--r--PKGBUILD136
3 files changed, 60 insertions, 99 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a5958ddccb01..df19dd81898c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = android-x86-64-x265
pkgdesc = Open Source H265/HEVC video encoder (Android x86-64)
pkgver = 3.5
- pkgrel = 2
+ pkgrel = 3
url = https://bitbucket.org/multicoreware/x265_git
arch = any
license = GPL
@@ -13,8 +13,6 @@ pkgbase = android-x86-64-x265
options = staticlibs
options = !emptydirs
source = https://bitbucket.org/multicoreware/x265_git/downloads/x265_3.5.tar.gz
- source = 0001-Disable-neon.patch
md5sums = deb5df5cb2ec17bdbae6ac6bbc3b1eef
- md5sums = fffb730725e5848d6f1fd87e50530452
pkgname = android-x86-64-x265
diff --git a/0001-Disable-neon.patch b/0001-Disable-neon.patch
deleted file mode 100644
index aaab6cab8215..000000000000
--- a/0001-Disable-neon.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/source/CMakeLists.txt 2021-03-16 09:53:00.000000000 -0300
-+++ b/source/CMakeLists.txt 2021-07-06 19:13:30.236573538 -0300
-@@ -248,7 +248,6 @@
- elseif(ARM)
- if(ARM64)
- set(ARM_ARGS -fPIC)
-- add_definitions(-DHAVE_NEON)
- else()
- find_package(Neon)
- if(CPU_HAS_NEON)
-@@ -351,7 +350,7 @@
-
- find_package(Nasm)
- if(ARM OR CROSS_COMPILE_ARM)
-- option(ENABLE_ASSEMBLY "Enable use of assembly coded primitives" ON)
-+ option(ENABLE_ASSEMBLY "Enable use of assembly coded primitives" OFF)
- elseif(NASM_FOUND AND X86)
- if (NASM_VERSION_STRING VERSION_LESS "2.13.0")
- message(STATUS "Nasm version ${NASM_VERSION_STRING} is too old. 2.13.0 or later required")
diff --git a/PKGBUILD b/PKGBUILD
index 189d274da1dd..ba8a3a17ed91 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ _android_arch=x86-64
pkgname=android-${_android_arch}-x265
pkgver=3.5
-pkgrel=2
+pkgrel=3
arch=('any')
pkgdesc="Open Source H265/HEVC video encoder (Android ${_android_arch})"
license=('GPL')
@@ -13,91 +13,73 @@ depends=('android-ndk')
makedepends=('android-cmake'
'nasm')
options=(!strip !buildflags staticlibs !emptydirs)
-source=("https://bitbucket.org/multicoreware/x265_git/downloads/x265_${pkgver}.tar.gz"
- "0001-Disable-neon.patch")
-md5sums=('deb5df5cb2ec17bdbae6ac6bbc3b1eef'
- 'fffb730725e5848d6f1fd87e50530452')
-
-prepare() {
- cd "${srcdir}"/x265_${pkgver}
-
- case "$_android_arch" in
- aarch64)
- patch -Np1 -i "../0001-Disable-neon.patch"
- ;;
- *)
- ;;
- esac
-}
+source=("https://bitbucket.org/multicoreware/x265_git/downloads/x265_${pkgver}.tar.gz")
+md5sums=('deb5df5cb2ec17bdbae6ac6bbc3b1eef')
build() {
cd "${srcdir}"/x265_${pkgver}
source android-env ${_android_arch}
- if [[ ${_android_arch} != x86 ]]; then
- android-${_android_arch}-cmake \
- -S source \
- -B build-12 \
- -DCMAKE_CXX_STANDARD=11 \
- -DLIB_INSTALL_DIR=lib \
- -DENABLE_SHARED=TRUE \
- -DENABLE_CLI=FALSE \
- -DHIGH_BIT_DEPTH=TRUE \
- -DMAIN12=TRUE \
- -DEXPORT_C_API=FALSE
- sed -i 's|-lpthread||g' build-12/CMakeFiles/x265-shared.dir/link.txt
- sed -i 's|-Wl,--no-undefined-version||g' build-12/CMakeFiles/x265-shared.dir/link.txt
- sed -i 's|-Wl,--no-undefined||g' build-12/CMakeFiles/x265-shared.dir/link.txt
- make -C build-12 $MAKEFLAGS
+ if [[ "${_android_arch}" = armv7a-eabi || "${_android_arch}" = x86 ]]; then
+ ENABLE_PIC=TRUE
+ else
+ ENABLE_PIC=FALSE
+ fi
- android-${_android_arch}-cmake \
- -S source \
- -B build-10 \
- -DCMAKE_CXX_STANDARD=11 \
- -DLIB_INSTALL_DIR=lib \
- -DENABLE_SHARED=TRUE \
- -DENABLE_CLI=FALSE \
- -DHIGH_BIT_DEPTH=TRUE \
- -DEXPORT_C_API=FALSE
- sed -i 's|-lpthread||g' build-10/CMakeFiles/x265-shared.dir/link.txt
- sed -i 's|-Wl,--no-undefined-version||g' build-10/CMakeFiles/x265-shared.dir/link.txt
- sed -i 's|-Wl,--no-undefined||g' build-10/CMakeFiles/x265-shared.dir/link.txt
- make -C build-10 $MAKEFLAGS
+ android-${_android_arch}-cmake \
+ -S source \
+ -B build-12 \
+ -DCMAKE_CXX_STANDARD=11 \
+ -DLIB_INSTALL_DIR=lib \
+ -DENABLE_SHARED=TRUE \
+ -DENABLE_PIC=${ENABLE_PIC} \
+ -DENABLE_ASSEMBLY=FALSE \
+ -DENABLE_CLI=FALSE \
+ -DHIGH_BIT_DEPTH=TRUE \
+ -DMAIN12=TRUE \
+ -DEXPORT_C_API=FALSE
+ sed -i 's|-lpthread||g' build-12/CMakeFiles/x265-shared.dir/link.txt
+ sed -i 's|-Wl,--no-undefined-version||g' build-12/CMakeFiles/x265-shared.dir/link.txt
+ sed -i 's|-Wl,--no-undefined||g' build-12/CMakeFiles/x265-shared.dir/link.txt
+ make -C build-12 $MAKEFLAGS
- mkdir -p build-8
- ln -s ../build-10/libx265.a build-8/libx265_main10.a
- ln -s ../build-12/libx265.a build-8/libx265_main12.a
+ android-${_android_arch}-cmake \
+ -S source \
+ -B build-10 \
+ -DCMAKE_CXX_STANDARD=11 \
+ -DLIB_INSTALL_DIR=lib \
+ -DENABLE_SHARED=TRUE \
+ -DENABLE_PIC=${ENABLE_PIC} \
+ -DENABLE_ASSEMBLY=FALSE \
+ -DENABLE_CLI=FALSE \
+ -DHIGH_BIT_DEPTH=TRUE \
+ -DEXPORT_C_API=FALSE
+ sed -i 's|-lpthread||g' build-10/CMakeFiles/x265-shared.dir/link.txt
+ sed -i 's|-Wl,--no-undefined-version||g' build-10/CMakeFiles/x265-shared.dir/link.txt
+ sed -i 's|-Wl,--no-undefined||g' build-10/CMakeFiles/x265-shared.dir/link.txt
+ make -C build-10 $MAKEFLAGS
- android-${_android_arch}-cmake \
- -S source \
- -B build-8 \
- -DCMAKE_CXX_STANDARD=11 \
- -DLIB_INSTALL_DIR=lib \
- -DENABLE_SHARED=TRUE \
- -DENABLE_CLI=FALSE \
- -DEXTRA_LIB='x265_main10.a;x265_main12.a' \
- -DEXTRA_LINK_FLAGS='-L.' \
- -DLINKED_10BIT=TRUE \
- -DLINKED_12BIT=TRUE
- sed -i 's|-lpthread||g' build-8/CMakeFiles/x265-shared.dir/link.txt
- sed -i 's|-Wl,--no-undefined-version||g' build-8/CMakeFiles/x265-shared.dir/link.txt
- sed -i 's|-Wl,--no-undefined||g' build-8/CMakeFiles/x265-shared.dir/link.txt
- make -C build-8 $MAKEFLAGS
- else
- mkdir build-8 && cd build-8
+ mkdir -p build-8
+ ln -s ../build-10/libx265.a build-8/libx265_main10.a
+ ln -s ../build-12/libx265.a build-8/libx265_main12.a
- android-${_android_arch}-cmake \
- -S source \
- -B build-8 \
- -DCMAKE_CXX_STANDARD=11 \
- -DLIB_INSTALL_DIR=lib \
- -DENABLE_SHARED=TRUE \
- -DENABLE_CLI=FALSE
- sed -i 's|-lpthread||g' build-8/CMakeFiles/x265-shared.dir/link.txt
- sed -i 's|-Wl,--no-undefined-version||g' build-8/CMakeFiles/x265-shared.dir/link.txt
- sed -i 's|-Wl,--no-undefined||g' build-8/CMakeFiles/x265-shared.dir/link.txt
- make -C build-8 $MAKEFLAGS
- fi
+ android-${_android_arch}-cmake \
+ -S source \
+ -B build-8 \
+ -DCMAKE_CXX_STANDARD=11 \
+ -DLIB_INSTALL_DIR=lib \
+ -DENABLE_SHARED=TRUE \
+ -DENABLE_PIC=${ENABLE_PIC} \
+ -DENABLE_ASSEMBLY=FALSE \
+ -DENABLE_CLI=FALSE \
+ -DEXTRA_LIB='x265_main10.a;x265_main12.a' \
+ -DEXTRA_LINK_FLAGS='-L.' \
+ -DLINKED_10BIT=TRUE \
+ -DLINKED_12BIT=TRUE
+ sed -i 's|-lpthread||g' build-8/CMakeFiles/x265-shared.dir/link.txt
+ sed -i 's|-Wl,--no-undefined-version||g' build-8/CMakeFiles/x265-shared.dir/link.txt
+ sed -i 's|-Wl,--no-undefined||g' build-8/CMakeFiles/x265-shared.dir/link.txt
+ make -C build-8 $MAKEFLAGS
}
package() {