ow, sorry 0006 was depending on 0004 and I think we do not need it... try to apply 0004 and then 0006..? (if you have time for yet another rebuild)
I'll try to remake 0006 without additional unneeded dependency On Tuesday, December 7, 2021, Andrea paz <[email protected]> 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. >
From 6d1f555bd4c157dc978c0775376c0e9c8fe52b56 Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu <[email protected]> Date: Fri, 26 Nov 2021 17:28:45 +0300 Subject: [PATCH 4/7] Test - try to fix autoreconf in libav1394 --- cinelerra-5.1/thirdparty/Makefile | 2 +- .../thirdparty/src/libavc1394-0.5.4.patch2 | 38 +++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 cinelerra-5.1/thirdparty/src/libavc1394-0.5.4.patch2 diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile index 330ac2cb..3b2a153d 100644 --- a/cinelerra-5.1/thirdparty/Makefile +++ b/cinelerra-5.1/thirdparty/Makefile @@ -214,7 +214,7 @@ mjpegtools.cfg_params?= --enable-shared=no --without-libquicktime --without-libd mjpegtools.mak_params?= all ladspa.cfg_vars?= CFLAGS+=' -Dinline="" ' ladspa.mak_params?=; $(MAKE) -C ladspa* install DESTDIR=$(call bld_path,ladspa) -libavc1394.cfg_vars?= PKG_CONFIG_PATH="$(call bld_path,libraw1394)";autoreconf -ifv -I m4 && automake -caf; +libavc1394.cfg_vars?= PKG_CONFIG_PATH="$(call bld_path,libraw1394)"; rm configure.in; env WARNINGS=none autoreconf -ifv -I m4 && env WARNINGS=none automake -caf; libavc1394.cflags?="$(call inc_path,libraw1394)" libavc1394.ldflags?="$(call ld_path,libraw1394,src/.libs)" libavc1394.cfg_params?= PKG_CONFIG_PATH="$(call bld_path,libraw1394)" --enable-shared=no diff --git a/cinelerra-5.1/thirdparty/src/libavc1394-0.5.4.patch2 b/cinelerra-5.1/thirdparty/src/libavc1394-0.5.4.patch2 new file mode 100644 index 00000000..3c54dd8f --- /dev/null +++ b/cinelerra-5.1/thirdparty/src/libavc1394-0.5.4.patch2 @@ -0,0 +1,38 @@ +--- /dev/null 2021-11-22 03:09:07.576000000 +0300 ++++ ./configure.ac 2021-11-26 15:44:37.463758493 +0300 +@@ -0,0 +1,35 @@ ++AC_INIT(Makefile.am) ++AM_INIT_AUTOMAKE(libavc1394, 0.5.4) ++AM_CONFIG_HEADER(config.h) ++AM_MAINTAINER_MODE ++ ++AC_PROG_CC ++AC_ISC_POSIX ++AC_PROG_LIBTOOL ++AM_PROG_LIBTOOL ++AC_PROG_INSTALL ++ ++AC_HEADER_STDC ++AC_CHECK_HEADERS(sys/time.h sys/types.h unistd.h string.h netinet/in.h stdio.h) ++PKG_CHECK_MODULES(LIBRAW1394, libraw1394 >= 1.0.0) ++ ++#set the libtool shared library version numbers ++lt_major=3 ++lt_revision=0 ++lt_age=3 ++ ++AC_SUBST(lt_major) ++AC_SUBST(lt_revision) ++AC_SUBST(lt_age) ++ ++CFLAGS="$CFLAGS -Wall -Wunused" ++ ++AC_OUTPUT([ ++Makefile ++common/Makefile ++libavc1394/Makefile ++librom1394/Makefile ++test/Makefile ++libavc1394.spec ++libavc1394.pc ++]) -- 2.34.0
-- Cin mailing list [email protected] https://lists.cinelerra-gg.org/mailman/listinfo/cin
