From 91f7f1f941dc4a79e26fc4538ccab4718f5a008e Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu Date: Sun, 17 Dec 2023 08:05:31 +0300 Subject: [PATCH 2/2] Update x265 to git snapshot 17122023 --- cinelerra-5.1/blds/termux.bld | 2 +- cinelerra-5.1/configure.ac | 2 +- cinelerra-5.1/thirdparty/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cinelerra-5.1/blds/termux.bld b/cinelerra-5.1/blds/termux.bld index cf131545..a7a6e988 100755 --- a/cinelerra-5.1/blds/termux.bld +++ b/cinelerra-5.1/blds/termux.bld @@ -1,6 +1,6 @@ #!/bin/bash # Produced, tested, and used by Andrew-R on an Android tablet export FFMPEG_EXTRA_CFG="--disable-debug --target-os=android --enable-mediacodec --enable-jni --enable-opencl --disable-doc --disable-ffprobe --enable-libdav1d" -export EXTRA_LIBS="-ldav1d -lOpenCL -landroid" +export EXTRA_LIBS="-ldav1d -lOpenCL -landroid -landroid-posix-semaphore" ./configure --without-lv2 --without-vdpau --without-vaapi --without-ladspa-build \ --without-nv --with-single-user --with-clang --without-gl --disable-dav1d diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index b2b11014..ff8164e7 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -423,7 +423,7 @@ PKG_3RD([x264],[auto], [ . ]) PKG_3RD([x265],[auto], - [x265_3.5], + [x265-17122023], [ libx265.a ], [ . source ]) diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile index 8c7aaf91..3a7b603e 100644 --- a/cinelerra-5.1/thirdparty/Makefile +++ b/cinelerra-5.1/thirdparty/Makefile @@ -266,7 +266,7 @@ tiff.cfg_params+= --disable-libdeflate --disable-lerc --enable-shared=no --disab twolame.cfg_params?=--enable-shared=no x264.cfg_params?= --enable-static --enable-pic x265.cfg_vars?=$(call cmake_config,source) -x265.cfg_params?= -DENABLE_SHARED=no +x265.cfg_params?= -DENABLE_SHARED=no -DENABLE_CLI=no libvpx.cfg_params?= --enable-pic --disable-avx512 --enable-vp9-highbitdepth --disable-examples --disable-unit_tests libdpx.cfg_vars?= libtoolize; aclocal; autoconf; automake -a; -- 2.43.0