x265: version 3.5

[jeevatattva]

x265 library has a newer version, 3.5, available with overall improvements and some for aarch64. Needs a patch for dynamic HDR10 cmake file and cross-compiling toolchain. Anyone interested to submit a PR is welcome.

diff --git a/build/aarch64-linux/crosscompile.cmake b/build/aarch64-linux/crosscompile.cmake
index 41c8217f2..25629c19c 100644
--- a/build/aarch64-linux/crosscompile.cmake
+++ b/build/aarch64-linux/crosscompile.cmake
@@ -8,8 +8,8 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_PROCESSOR aarch64)
 
 # specify the cross compiler
-set(CMAKE_C_COMPILER aarch64-linux-gnu-gcc)
-set(CMAKE_CXX_COMPILER aarch64-linux-gnu-g++)
+set(CMAKE_C_COMPILER aarch64-linux-android-clang)
+set(CMAKE_CXX_COMPILER aarch64-linux-android-clang++)
 
 # specify the target environment
-SET(CMAKE_FIND_ROOT_PATH  /usr/aarch64-linux-gnu)
+SET(CMAKE_FIND_ROOT_PATH /home/builder/lib/android-ndk/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64)

diff --git a/source/dynamicHDR10/CMakeLists.txt b/source/dynamicHDR10/CMakeLists.txt
index 22fb79d44..e96996b5f 100644
--- a/source/dynamicHDR10/CMakeLists.txt
+++ b/source/dynamicHDR10/CMakeLists.txt
@@ -43,7 +43,11 @@ if(GCC)
         endif()
     endif()
     if(ARM AND CROSS_COMPILE_ARM)
-        set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC)
+        if(ARM64)
+            set(ARM_ARGS -fPIC)
+        else()
+            set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC)
+        endif()
     elseif(ARM)
         find_package(Neon)
         if(CPU_HAS_NEON)

TERMUX_PKG_HOMEPAGE=http://x265.org/
TERMUX_PKG_DESCRIPTION="H.265/HEVC video stream encoder library"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=3.5
TERMUX_PKG_SRCURL=https://bitbucket.org/multicoreware/x265_git/downloads/x265_$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=e70a3335cacacbba0b3a20ec6fecd6783932288ebc8163ad74bcc9606477cae8
TERMUX_PKG_DEPENDS="libc++"
TERMUX_PKG_BREAKS="libx265-dev"
TERMUX_PKG_REPLACES="libx265-dev"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
-DBIN_INSTALL_DIR=$TERMUX_PREFIX/bin
-DLIB_INSTALL_DIR=$TERMUX_PREFIX/lib
-DCMAKE_TOOLCHAIN_FILE=../src/build/aarch64-linux/crosscompile.cmake 
-G \"Unix Makefiles\"
-DHIGH_BIT_DEPTH=1 
-DENABLE_HDR10_PLUS=1 
-DMAIN12=1 
-DEXPORT_C_API=1
"

termux_step_pre_configure() {
        if [ $TERMUX_ARCH = "i686" ]; then
                # Avoid text relocations.
                TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DENABLE_ASSEMBLY=0"
        fi
        TERMUX_PKG_SRCDIR="$TERMUX_PKG_SRCDIR/source"
}

Note: I haven't tested this build.sh file at the moment due to unavailability of a build environment.

[jeevatattva]

Finally, I got around to build the package. Following are the changes required -

diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index a407271b4..d4d52d82d 100755
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -85,7 +85,10 @@ else()
 endif()
 
 if(UNIX)
-    list(APPEND PLATFORM_LIBS pthread)
+    find_library(LIBPTHREAD pthread)
+    if(LIBPTHREAD)
+         list(APPEND PLATFORM_LIBS pthread)
+    endif()
     find_library(LIBRT rt)
     if(LIBRT)
         list(APPEND PLATFORM_LIBS rt)
@@ -546,7 +549,7 @@ if((MSVC_IDE OR XCODE OR GCC) AND ENABLE_ASSEMBLY)
             add_custom_command(
                 OUTPUT ${ASM}.${SUFFIX}
                 COMMAND ${CMAKE_CXX_COMPILER}
-                ARGS ${ARM_ARGS} -c ${ASM_SRC} -o ${ASM}.${SUFFIX}
+                ARGS --target=@CCTERMUX_HOST_PLATFORM@ -fno-integrated-as ${ARM_ARGS} -c ${ASM_SRC} -o ${ASM}.${SUFFIX}
                 DEPENDS ${ASM_SRC})
         endforeach()
     elseif(X86)

Standard main, main10, mainstillpicture profile for hevc (working)

TERMUX_PKG_HOMEPAGE=http://x265.org/
TERMUX_PKG_DESCRIPTION="H.265/HEVC video stream encoder library"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=3.5
TERMUX_PKG_SRCURL=https://bitbucket.org/multicoreware/x265_git/downloads/x265_$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=e70a3335cacacbba0b3a20ec6fecd6783932288ebc8163ad74bcc9606477cae8
TERMUX_PKG_DEPENDS="libc++"
TERMUX_PKG_BREAKS="libx265-dev"
TERMUX_PKG_REPLACES="libx265-dev"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
-DCROSS_COMPILE_ARM=ON
"

termux_step_pre_configure() {
        if [ $TERMUX_ARCH = "i686" ]; then
                # Avoid text relocations.
                TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DENABLE_ASSEMBLY=OFF"
        fi

        sed -i "s/@CCTERMUX_HOST_PLATFORM@/${CCTERMUX_HOST_PLATFORM}/" \
            ${TERMUX_PKG_SRCDIR}/source/CMakeLists.txt 
        TERMUX_PKG_SRCDIR="$TERMUX_PKG_SRCDIR/source"
}

The following patch is not needed, unless ENABLE_HDR10_PLUS is ON.

diff --git a/source/dynamicHDR10/CMakeLists.txt b/source/dynamicHDR10/CMakeLists.txt
index 22fb79d44..e96996b5f 100644
--- a/source/dynamicHDR10/CMakeLists.txt
+++ b/source/dynamicHDR10/CMakeLists.txt
@@ -43,7 +43,11 @@ if(GCC)
         endif()
     endif()
     if(ARM AND CROSS_COMPILE_ARM)
-        set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC)
+        if(ARM64)
+            set(ARM_ARGS -fPIC)
+        else()
+            set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC)
+        endif()
     elseif(ARM)
         find_package(Neon)
         if(CPU_HAS_NEON)

[thunder-coding]

Anyone interested to submit a PR is welcome.

Why not you? Since you have done hard work patching it go for it

[jeevatattva]

At the time of initial post, I was not familiar with termux scripts nor had access to a build environment, and hoped someone else could fill in the gaps. Now that you've mentioned, I have just now spotted an error in the build.sh above.

TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
-DCROSS_COMPILE_ARM=ON
"

should've been set in termux_step_pre_configure() instead. I'll fix it up and send in a PR.
Thanks.

[jeevatattva]

Submitted PR #7401