ср, 20 дек. 2023 г., 12:35 Andrea paz <[email protected]>:
> I tried compiling the multibit version with Phyllis' instructions > (which are also found in the manual: > > https://cinelerra-gg.org/download/CinelerraGG_Manual/Multibit_build_x265_8_10_12.html > ). > With Andrew's new patch "x265-17122023" I have a crash. I attach the > cin5_patch.log. > Without the new patch the build works. I have a Ryzen 5900XT 12c/24t. > I generally compile in just over 3 min. Multibit took a little over 4 > min. > NOTE: By applying the "compile_multibit_X265.txt" there is no need to > manually edit ../thirdparty/Makefile, it is done automatically. > well, depend on patching order? If you apply x265- 17122023 update first it will fail .. I tried to update git patch, see attached. only compile-tested on termux/aarch64 > I compared the appimage (without new patch) multibit with the build > (without new patch) multibit: I get the same rendering results. The > only difference, as Phyllis had explained, is that in my build the > hevc.mp4 preset also works while in the appimage it does not. >
From 9bda08470b306aa5d2e4915f76ddd6fd8b009577 Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu <[email protected]> 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 +- .../thirdparty/src/x265-17122023.patch1 | 4 ++ .../thirdparty/src/x265-17122023.patch2 | 7 +++ .../thirdparty/src/x265-17122023.patch3 | 57 +++++++++++++++++++ 4 files changed, 71 insertions(+), 2 deletions(-) create mode 100644 cinelerra-5.1/thirdparty/src/x265-17122023.patch1 create mode 100644 cinelerra-5.1/thirdparty/src/x265-17122023.patch2 create mode 100644 cinelerra-5.1/thirdparty/src/x265-17122023.patch3 diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile index 3a7b603e..641ce3f3 100644 --- a/cinelerra-5.1/thirdparty/Makefile +++ b/cinelerra-5.1/thirdparty/Makefile @@ -265,8 +265,9 @@ tiff.cfg_params+= --disable-libdeflate --disable-lerc --enable-shared=no --disab $(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 -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 -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/src/x265-17122023.patch1 b/cinelerra-5.1/thirdparty/src/x265-17122023.patch1 new file mode 100644 index 00000000..23d7e84f --- /dev/null +++ b/cinelerra-5.1/thirdparty/src/x265-17122023.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-17122023.patch2 b/cinelerra-5.1/thirdparty/src/x265-17122023.patch2 new file mode 100644 index 00000000..72459e66 --- /dev/null +++ b/cinelerra-5.1/thirdparty/src/x265-17122023.patch2 @@ -0,0 +1,7 @@ +--- /dev/null 2020-03-14 06:02:18.586124011 +0300 ++++ ./Makefile 2020-03-18 00:04:59.388807329 +0300 +@@ -0,0 +1,4 @@ ++#$(shell cd build/linux ; ./multilib.sh) ++.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-17122023.patch3 b/cinelerra-5.1/thirdparty/src/x265-17122023.patch3 new file mode 100644 index 00000000..26fa121b --- /dev/null +++ b/cinelerra-5.1/thirdparty/src/x265-17122023.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 +@@ -0,0 +1,54 @@ ++#!/bin/sh ++ ++mkdir -p 8bit 10bit 12bit ++ ++ ++cd 12bit ++if [ $(uname -m) == 'x86_64' ]; then ++ # 64-bit stuff here ++cmake ../source -DHIGH_BIT_DEPTH=ON -DENABLE_ASSEMBLY=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DMAIN12=ON ++else ++ # 32-bit stuff here ++cmake ../source -DHIGH_BIT_DEPTH=ON -DENABLE_ASSEMBLY=OFF -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DMAIN12=ON ++fi ++make ++ ++cd ../10bit ++if [ $(uname -m) == 'x86_64' ]; then ++ # 64-bit stuff here ++cmake ../source -DHIGH_BIT_DEPTH=ON -DENABLE_ASSEMBLY=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF ++else ++ # 32-bit stuff here ++cmake ../source -DHIGH_BIT_DEPTH=ON -DENABLE_ASSEMBLY=OFF -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF ++fi ++make ++ ++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 ++make ++ ++# rename the 8bit library, then combine all three into libx265.a ++mv libx265.a libx265_main.a ++ ++uname=`uname` ++if [ "$uname" = "Linux" ] ++then ++ ++# On Linux, we use GNU ar to combine the static libraries together ++ar -M <<EOF ++CREATE libx265.a ++ADDLIB libx265_main.a ++ADDLIB libx265_main10.a ++ADDLIB libx265_main12.a ++SAVE ++END ++EOF ++ ++else ++ ++# Mac/BSD libtool ++libtool -static -o libx265.a libx265_main.a libx265_main10.a libx265_main12.a 2>/dev/null ++ ++fi -- 2.43.0
-- Cin mailing list [email protected] https://lists.cinelerra-gg.org/mailman/listinfo/cin
