Enabled shared library.

2 files changed, 45 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dc6632c9a6e0..133d3d300578 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = android-x86-x265
-	pkgdesc = Open Source H265/HEVC video encoder (android)
+	pkgdesc = Open Source H265/HEVC video encoder (Android x86)
 	pkgver = 3.5
-	pkgrel = 1
+	pkgrel = 2
 	url = https://bitbucket.org/multicoreware/x265_git
 	arch = any
 	license = GPL
diff --git a/PKGBUILD b/PKGBUILD
index 333909be28e1..3642bb5b88c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,14 +4,15 @@ _android_arch=x86
 
 pkgname=android-${_android_arch}-x265
 pkgver=3.5
-pkgrel=1
+pkgrel=2
 arch=('any')
-pkgdesc='Open Source H265/HEVC video encoder (android)'
+pkgdesc="Open Source H265/HEVC video encoder (Android ${_android_arch})"
 license=('GPL')
 url='https://bitbucket.org/multicoreware/x265_git'
 depends=('android-ndk')
+makedepends=('android-cmake'
+             'nasm')
 options=(!strip !buildflags staticlibs !emptydirs)
-makedepends=('android-cmake' 'nasm')
 source=("https://bitbucket.org/multicoreware/x265_git/downloads/x265_${pkgver}.tar.gz"
         "0001-Disable-neon.patch")
 md5sums=('deb5df5cb2ec17bdbae6ac6bbc3b1eef'
@@ -32,66 +33,78 @@ prepare() {
 build() {
     cd "${srcdir}"/x265_${pkgver}
     source android-env ${_android_arch}
-    unset LDFLAGS CPPFLAGS
 
     if [[ ${_android_arch} != x86 ]]; then
-        mkdir build-12 && cd build-12
-
         android-${_android_arch}-cmake \
+            -S source \
+            -B build-12 \
             -DCMAKE_CXX_STANDARD=11 \
             -DLIB_INSTALL_DIR=lib \
-            -DENABLE_SHARED=FALSE \
+            -DENABLE_SHARED=TRUE \
             -DENABLE_CLI=FALSE \
             -DHIGH_BIT_DEPTH=TRUE \
             -DMAIN12=TRUE \
-            -DEXPORT_C_API=FALSE \
-            ../source
-        make $MAKEFLAGS
-
-        cd .. && mkdir build-10 && cd build-10
+            -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
 
         android-${_android_arch}-cmake \
+            -S source \
+            -B build-10 \
             -DCMAKE_CXX_STANDARD=11 \
             -DLIB_INSTALL_DIR=lib \
-            -DENABLE_SHARED=FALSE \
+            -DENABLE_SHARED=TRUE \
             -DENABLE_CLI=FALSE \
             -DHIGH_BIT_DEPTH=TRUE \
-            -DEXPORT_C_API=FALSE \
-            ../source
-        make $MAKEFLAGS
+            -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
 
-        cd .. && mkdir build-8 && cd build-8
-        ln -s ../build-10/libx265.a libx265_main10.a
-        ln -s ../build-12/libx265.a libx265_main12.a
+        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=FALSE \
+            -DENABLE_SHARED=TRUE \
             -DENABLE_CLI=FALSE \
             -DEXTRA_LIB='x265_main10.a;x265_main12.a' \
-            -DEXTRA_LINK_FLAGS='-L .' \
+            -DEXTRA_LINK_FLAGS='-L.' \
             -DLINKED_10BIT=TRUE \
-            -DLINKED_12BIT=TRUE \
-            ../source
-        make $MAKEFLAGS
+            -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
 
         android-${_android_arch}-cmake \
+            -S source \
+            -B build-8 \
             -DCMAKE_CXX_STANDARD=11 \
             -DLIB_INSTALL_DIR=lib \
-            -DENABLE_SHARED=FALSE \
-            -DENABLE_CLI=FALSE \
-            ../source
-        make $MAKEFLAGS
+            -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
 }
 
 package() {
-    cd "${srcdir}"/x265_${pkgver}/build-8
+    cd "${srcdir}"/x265_${pkgver}
     source android-env ${_android_arch}
 
-    make DESTDIR="$pkgdir" install
+    make -C build-8 DESTDIR="$pkgdir" install
+    ${ANDROID_STRIP} -g --strip-unneeded "${pkgdir}"/${ANDROID_PREFIX_LIB}/*.so
     ${ANDROID_STRIP} -g "$pkgdir"/${ANDROID_PREFIX_LIB}/*.a
 }