I'll try to remake 0006 without additional unneeded dependency
On Tuesday, December 7, 2021, Andrea paz <
gamberucci.andrea@gmail.com> wrote:
I have tried the 3 patches; patch 0006 does not apply:
$ LC_ALL=C git am
/home/paz/Download/patch/0006-TEST-autoreconf-for-thirdparty-libs-for-new-arches.patch
Applying: TEST: autoreconf for thirdparty libs (for new arches)
error: patch failed: cinelerra-5.1/thirdparty/Makefile:212
error: cinelerra-5.1/thirdparty/Makefile: patch does not apply
Patch failed at 0001 TEST: autoreconf for thirdparty libs (for new arches)
hint: Use 'git am --show-current-patch=diff' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Tried the suggestion, but don't understand it and don't know if it will help:
$ LC_ALL=C git am --show-current-patch=diff
---
cinelerra-5.1/thirdparty/Makefile | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/cinelerra-5.1/thirdparty/Makefile
b/cinelerra-5.1/thirdparty/Makefile
index 3b2a153d..db83efe9 100644
--- a/cinelerra-5.1/thirdparty/Makefile
+++ b/cinelerra-5.1/thirdparty/Makefile
@@ -185,7 +185,7 @@ ffmpeg.cfg_params= \
cmake_config=echo 'cmake "$$$$@" "$(1)"' > ./configure; chmod +x ./configure;
libbthread.cfg_vars?= echo "exec true" > ./configure; chmod +x ./configure;
a52dec.mak_params?= ; cd $(call bld_path,a52dec,include); ln -sf . a52dec
-a52dec.cfg_vars?= CFLAGS+=" -U__FreeBSD__ $(call inc_path,djbfft)"
LIBS+=" $(call ld_path,djbfft)"
+a52dec.cfg_vars?= CFLAGS+=" -U__FreeBSD__ $(call inc_path,djbfft)"
LIBS+=" $(call ld_path,djbfft)"; autoreconf -ifv && automake -caf;
a52dec.cfg_params?=--enable-djbfft --disable-oss
djbfft.cfg_vars?=echo "$(call bld_path,djbfft)" > conf-home; \
(CFLAGS="$(CFLAGS)"; $(CFG_VARS)$(if $(CFG_VARS),; )echo "$(CC)
$$$$CFLAGS") > conf-cc; \
@@ -212,15 +212,16 @@ mjpegtools.cfg_vars?= ./autogen.sh;
mjpegtools.cfg_params?= --enable-shared=no --without-libquicktime
--without-libdv \
:
I deleted the patch and installed the other 2: the compile works and
CinGG works fine.