projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Credit ffmpeg team with upgrade to 6.1
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
thirdparty
/
compile_multibit_X265.txt
diff --git
a/cinelerra-5.1/thirdparty/compile_multibit_X265.txt
b/cinelerra-5.1/thirdparty/compile_multibit_X265.txt
index 6a14f16619691de044ede173e03300b07de01917..b41d2f02dc786c0feb323b61edf2bb491bf5fe51 100644
(file)
--- a/
cinelerra-5.1/thirdparty/compile_multibit_X265.txt
+++ b/
cinelerra-5.1/thirdparty/compile_multibit_X265.txt
@@
-16,7
+16,7
@@
Subject: [PATCH 32/67] Add multilib x265 (slower compilation, but you can
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
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
-@@ -25
0,8 +250,9 @@ tiff.cfg_params+= --enable-shared=no --disable-zstd $(call if_pkg,libwebp,\
+@@ -25
9,8 +259,9 @@ tiff.cfg_params+= --disable-libdeflate --enable-shared=no --disable-zstd $(call
$(call if_npkg,libwebp,--disable-webp)
twolame.cfg_params?=--enable-shared=no
x264.cfg_params?= --enable-static --enable-pic
$(call if_npkg,libwebp,--disable-webp)
twolame.cfg_params?=--enable-shared=no
x264.cfg_params?= --enable-static --enable-pic
@@
-25,7
+25,7
@@
diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefi
+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_vars?=chmod +x ./configure; chmod +x ./multilib.sh;
+#x265.cfg_vars?=$(call cmake_config,source)
+#x265.cfg_params?= -DENABLE_SHARED=no
- libvpx.cfg_params?= --enable-pic --disable-avx512
+ libvpx.cfg_params?= --enable-pic --disable-avx512
--enable-vp9-highbitdepth --disable-examples --disable-unit_tests
DS:=$$$$$$$$
diff --git a/cinelerra-5.1/thirdparty/src/x265_3.5.patch1 b/cinelerra-5.1/thirdparty/src/x265_3.5.patch1
DS:=$$$$$$$$
diff --git a/cinelerra-5.1/thirdparty/src/x265_3.5.patch1 b/cinelerra-5.1/thirdparty/src/x265_3.5.patch1