Credit Andrew with getting x265 snapshot 17122023 and multibit patch; name of x265_3...

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index f210281c8582adb378613e2daadafc2c3815dd4e..1d74d031735d379899acf386391e690a31e62721 100644 (file)
--- 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_3.517122023],
   [ libx265.a ],
   [ . source ])
 

diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile
index 8c7aaf91e0af8886e58fe86e53cd8ed2b25d86da..3a7b603e4bff9d314ca6c4bd9d825396d3720718 100644 (file)
--- 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;
 

diff --git a/cinelerra-5.1/thirdparty/compile_multibit_X265.txt b/cinelerra-5.1/thirdparty/compile_multibit_X265.txt
index b41d2f02dc786c0feb323b61edf2bb491bf5fe51..915d612106d9010427ad508a0c6bad1a193e4e80 100644 (file)
--- a/cinelerra-5.1/thirdparty/compile_multibit_X265.txt
+++ b/cinelerra-5.1/thirdparty/compile_multibit_X265.txt
@@ -1,46 +1,47 @@
+From 9bda08470b306aa5d2e4915f76ddd6fd8b009577 Mon Sep 17 00:00:00 2001
 From: Andrew Randrianasulu <[email protected]>
-Date: Sun, 20 Jun 2021 10:35:26 +0300
-Subject: [PATCH 32/67] Add multilib x265 (slower compilation, but you can
- render 10 bit h265 out of the box)
+Date: Wed, 20 Dec 2023 15:16:40 +0300
+Subject: [PATCH 13/14] Multibit x265 patches updated for x265-17122023
 
 ---
- cinelerra-5.1/thirdparty/Makefile            |  5 +-
- cinelerra-5.1/thirdparty/src/x265_3.5.patch1 |  4 ++
- cinelerra-5.1/thirdparty/src/x265_3.5.patch2 |  7 +++
- cinelerra-5.1/thirdparty/src/x265_3.5.patch3 | 57 ++++++++++++++++++++
+ cinelerra-5.1/thirdparty/Makefile             |  5 +-
+ .../thirdparty/src/x265_3.517122023.patch1       |  4 ++
+ .../thirdparty/src/x265_3.517122023.patch2       |  7 +++
+ .../thirdparty/src/x265_3.517122023.patch3       | 57 +++++++++++++++++++
  4 files changed, 71 insertions(+), 2 deletions(-)
- create mode 100644 cinelerra-5.1/thirdparty/src/x265_3.5.patch1
- create mode 100644 cinelerra-5.1/thirdparty/src/x265_3.5.patch2
- create mode 100644 cinelerra-5.1/thirdparty/src/x265_3.5.patch3
+ create mode 100644 cinelerra-5.1/thirdparty/src/x265_3.517122023.patch1
+ create mode 100644 cinelerra-5.1/thirdparty/src/x265_3.517122023.patch2
+ create mode 100644 cinelerra-5.1/thirdparty/src/x265_3.517122023.patch3
 
-diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile
 --- a/cinelerra-5.1/thirdparty/Makefile
 +++ b/cinelerra-5.1/thirdparty/Makefile
-@@ -259,8 +259,9 @@ tiff.cfg_params+= --disable-libdeflate --enable-shared=no --disable-zstd $(call
+@@ -265,8 +265,9 @@
   $(call if_npkg,libwebp,--disable-webp)
  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
 +x265.cfg_vars?=chmod +x ./configure; chmod +x ./multilib.sh;
 +#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;
  
- DS:=$$$$$$$$
-diff --git a/cinelerra-5.1/thirdparty/src/x265_3.5.patch1 b/cinelerra-5.1/thirdparty/src/x265_3.5.patch1
+diff --git a/cinelerra-5.1/thirdparty/src/x265_3.517122023.patch1 b/cinelerra-5.1/thirdparty/src/x265_3.517122023.patch1
 new file mode 100644
+index 00000000..23d7e84f
 --- /dev/null
-+++ b/cinelerra-5.1/thirdparty/src/x265_3.5.patch1
++++ b/cinelerra-5.1/thirdparty/src/x265_3.517122023.patch1
 @@ -0,0 +1,4 @@
 +--- /dev/null 2020-03-14 06:02:18.586124011 +0300
 ++++ ./configure       2020-03-18 00:04:59.360807192 +0300
 +@@ -0,0 +1 @@
 ++/bin/true
-diff --git a/cinelerra-5.1/thirdparty/src/x265_3.5.patch2 b/cinelerra-5.1/thirdparty/src/x265_3.5.patch2
+diff --git a/cinelerra-5.1/thirdparty/src/x265_3.517122023.patch2 b/cinelerra-5.1/thirdparty/src/x265_3.517122023.patch2
 new file mode 100644
+index 00000000..72459e66
 --- /dev/null
-+++ b/cinelerra-5.1/thirdparty/src/x265_3.5.patch2
++++ b/cinelerra-5.1/thirdparty/src/x265_3.517122023.patch2
 @@ -0,0 +1,7 @@
 +--- /dev/null 2020-03-14 06:02:18.586124011 +0300
 ++++ ./Makefile        2020-03-18 00:04:59.388807329 +0300
@@ -49,10 +50,11 @@ new file mode 100644
 ++.NOTPARALLEL:
 ++all:
 ++     $(shell ./multilib.sh ; cp 8bit/libx265.a . ; cp 8bit/x265.pc . ; cp 8bit/x265_config.h .)
-diff --git a/cinelerra-5.1/thirdparty/src/x265_3.5.patch3 b/cinelerra-5.1/thirdparty/src/x265_3.5.patch3
+diff --git a/cinelerra-5.1/thirdparty/src/x265_3.517122023.patch3 b/cinelerra-5.1/thirdparty/src/x265_3.517122023.patch3
 new file mode 100644
+index 00000000..26fa121b
 --- /dev/null
-+++ b/cinelerra-5.1/thirdparty/src/x265_3.5.patch3
++++ b/cinelerra-5.1/thirdparty/src/x265_3.517122023.patch3
 @@ -0,0 +1,57 @@
 +--- /dev/null 2020-07-19 09:07:01.788494015 +0300
 ++++ ./multilib.sh     2020-08-02 02:34:58.444933214 +0300
@@ -85,7 +87,7 @@ new file mode 100644
 ++cd ../8bit
 ++ln -sf ../10bit/libx265.a libx265_main10.a
 ++ln -sf ../12bit/libx265.a libx265_main12.a
-++cmake ../source -DEXTRA_LIB="x265_main10.a;x265_main12.a" -DENABLE_SHARED=OFF -DEXTRA_LINK_FLAGS=-L. -DLINKED_10BIT=ON -DLINKED_12BIT=ON
+++cmake ../source -DEXTRA_LIB="x265_main10.a;x265_main12.a" -DENABLE_SHARED=OFF -DEXTRA_LINK_FLAGS=-L. -DLINKED_10BIT=ON -DLINKED_12BIT=ON -DENABLE_CLI=OFF
 ++make
 ++
 ++# rename the 8bit library, then combine all three into libx265.a
@@ -111,3 +113,6 @@ new file mode 100644
 ++libtool -static -o libx265.a libx265_main.a libx265_main10.a libx265_main12.a 2>/dev/null
 ++
 ++fi
+-- 
+2.43.0
+

diff --git a/cinelerra-5.1/thirdparty/src/x265_3.517122023.tar.gz b/cinelerra-5.1/thirdparty/src/x265_3.517122023.tar.gz
new file mode 100644 (file)
index 0000000..19b5bab
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/x265_3.517122023.tar.gz differ