On Monday, December 6, 2021, Phyllis Smith via Cin <
[email protected]> wrote:
> MatN,
> For some reason this email went into my spam, but I got it now and will
> check into GIT next time I boot that desktop.
> Are there additional aarch64 specific mods that I might have missed? I
> checked randrik19 and found none but did not carefully check email
> attachments.
>
I made few more patches some days ago {attached} - can you check them on
x86(x86-64) too?
>
> Also, I hope you have a chance to test: https://cinelerra-gg.org/
> download/images/CinGG-20211130-i386-newer_distros.AppImage
>
> On Sat, Dec 4, 2021 at 2:48 PM mat via Cin <[email protected]>
> wrote:
>
>> When building for aarch64, in the guicast Makefile the aarch64 is
>> detected, but it then proceeds to produce 32 bit code anyway.
>> Andrew found that, the attached patch fixes it.
>>
>> MatN
>>
>> --
>> Cin mailing list
>> [email protected]
>> https://lists.cinelerra-gg.org/mailman/listinfo/cin
>>
>
From a1d2df52e1fcb40cbfc4b3b18407240202c57fd4 Mon Sep 17 00:00:00 2001
From: Andrew Randrianasulu <[email protected]>
Date: Fri, 26 Nov 2021 10:18:37 +0300
Subject: [PATCH 3/7] Add libavc1394 termux patch, mod thirdparty/Makefile for
regen libavc1394 buildsys and disable oss in liba52
---
cinelerra-5.1/thirdparty/Makefile | 6 +++---
cinelerra-5.1/thirdparty/src/libavc1394-0.5.4.patch1 | 8 ++++++++
2 files changed, 11 insertions(+), 3 deletions(-)
create mode 100644 cinelerra-5.1/thirdparty/src/libavc1394-0.5.4.patch1
diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile
index 63adb5be..330ac2cb 100644
--- a/cinelerra-5.1/thirdparty/Makefile
+++ b/cinelerra-5.1/thirdparty/Makefile
@@ -186,7 +186,7 @@ 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_params?=--enable-djbfft
+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; \
echo > ./configure; chmod +x ./configure;
@@ -214,10 +214,10 @@ 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)
+libavc1394.cfg_vars?= PKG_CONFIG_PATH="$(call bld_path,libraw1394)";autoreconf -ifv -I m4 && automake -caf;
libavc1394.cflags?="$(call inc_path,libraw1394)"
libavc1394.ldflags?="$(call ld_path,libraw1394,src/.libs)"
-libavc1394.cfg_params?= --enable-shared=no
+libavc1394.cfg_params?= PKG_CONFIG_PATH="$(call bld_path,libraw1394)" --enable-shared=no
libavc1394.mak_params?=; cd $(call bld_path,libavc1394); ln -sf ../librom1394/rom1394.h libavc1394/.
libdv.cfg_params?= --disable-gtk --enable-shared=no
libiec61883.cfg_vars?=PKG_CONFIG_PATH=$(call bld_path,libraw1394)
diff --git a/cinelerra-5.1/thirdparty/src/libavc1394-0.5.4.patch1 b/cinelerra-5.1/thirdparty/src/libavc1394-0.5.4.patch1
new file mode 100644
index 00000000..33dfab4f
--- /dev/null
+++ b/cinelerra-5.1/thirdparty/src/libavc1394-0.5.4.patch1
@@ -0,0 +1,8 @@
+--- ./Makefile.am.orig 2021-11-26 08:50:04.775736222 +0300
++++ ./Makefile.am 2021-11-26 08:50:18.707736223 +0300
+@@ -1,4 +1,4 @@
+-SUBDIRS = common libavc1394 librom1394 test
++SUBDIRS = common libavc1394 librom1394
+ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config.h.in \
+ stamp-h.in
+ EXTRA_DIST = libavc1394.pc libavc1394.spec
--
2.34.0
From 44461d1635ea47c87b4cc951c299fa3890914412 Mon Sep 17 00:00:00 2001
From: Andrew Randrianasulu <[email protected]>
Date: Sun, 28 Nov 2021 12:08:41 +0300
Subject: [PATCH 6/7] TEST: autoreconf for thirdparty libs (for new arches)
---
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 \
--without-libpng --without-dga --without-gtk --without-libsdl --without-sdlgfx
mjpegtools.mak_params?= all
-ladspa.cfg_vars?= CFLAGS+=' -Dinline="" '
+ladspa.cfg_vars?= CFLAGS+=' -Dinline="" '; autoreconf -ifv && automake -caf;
ladspa.mak_params?=; $(MAKE) -C ladspa* install DESTDIR=$(call bld_path,ladspa)
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
libavc1394.mak_params?=; cd $(call bld_path,libavc1394); ln -sf ../librom1394/rom1394.h libavc1394/.
+libdv.cfg_vars?= autoreconf -ifv -I m4 && automake -caf;
libdv.cfg_params?= --disable-gtk --enable-shared=no
-libiec61883.cfg_vars?=PKG_CONFIG_PATH=$(call bld_path,libraw1394)
+libiec61883.cfg_vars?=PKG_CONFIG_PATH=$(call bld_path,libraw1394); autoreconf -ifv && automake -caf;
libiec61883.cflags?="$(call inc_path,libraw1394)"
libiec61883.ldflags?="$(call ld_path,libraw1394,src/.libs)"
libiec61883.cfg_params?= --enable-shared=no
@@ -228,12 +229,15 @@ libiec61883.mak_params?=; cd $(call bld_path,libiec61883,src); ln -sf . libiec61
libjpeg.cfg_vars?= mkdir build && cd build && $(call cmake_config,..)
libjpeg.cfg_params?= -DENABLE_SHARED=no -DCMAKE_INSTALL_LIBDIR=lib
libjpeg.mak_params?= -C build all install DESTDIR=$(call bld_path,libjpeg)
+libogg.cfg_vars?= autoreconf -ifv -I m4 && automake -caf;
libogg.cfg_params?= --enable-shared=no
libraw1394.cfg_params?= --enable-shared=no; ln -sf src libraw1394
-libtheora.cfg_vars?=PKG_CONFIG_PATH=$(call bld_path,libogg):$(call bld_path,libvorbis)
+libtheora.cfg_vars?=PKG_CONFIG_PATH=$(call bld_path,libogg):$(call bld_path,libvorbis); autoreconf -ifv -I m4 && automake -caf;
+ libiec61883.cflags?="$(call inc_path,libraw1394)"
libtheora.cflags?="$(call inc_path,libogg) $(call inc_path,libvorbis)"
libtheora.ldflags?="$(call ld_path,libvorbis,lib/.libs) $(call ld_path,libogg,src/.libs)"
libtheora.cfg_params?= --disable-examples --disable-spec --enable-shared=no
+libuuid.cfg_vars?= autoreconf -ifv -I m4 && automake -caf;
libuuid.cfg_params?=--enable-shared=no
libvorbis.cfg_params?= --disable-oggtest --enable-shared=no
openjpeg.cfg_params?= -DBUILD_SHARED_LIBS:BOOL=OFF
@@ -245,7 +249,8 @@ openexr.cfg_vars?=true; \#
openexr.mak_vars?=true; \#
opus.cfg_params?= --disable-extra-programs
speech_tools.mak_params?=-j1
-tiff.cfg_vars+=LIBS+=" -lpthread"
+tiff.cfg_vars+=LIBS+=" -lpthread"; autoreconf -ifv -I m4 && automake -caf;
+ libiec61883.cflags?="$(call inc_path,libraw1394)"
tiff.cfg_params+= --enable-shared=no --disable-zstd $(call if_pkg,libwebp,\
--with-webp-include-dir=$(call pkg_incl,libwebp)\
--with-webp-lib-dir=$(call pkg_libs,libwebp))\
--
2.34.0
From e52a39e0810e819e99d70acf108a8f9802f74961 Mon Sep 17 00:00:00 2001
From: Andrew Randrianasulu <[email protected]>
Date: Mon, 29 Nov 2021 10:07:55 +0300
Subject: [PATCH 7/7] Less build in libtiff (req. autoreconf)
---
cinelerra-5.1/thirdparty/src/tiff-4.1.0.patch1 | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 cinelerra-5.1/thirdparty/src/tiff-4.1.0.patch1
diff --git a/cinelerra-5.1/thirdparty/src/tiff-4.1.0.patch1 b/cinelerra-5.1/thirdparty/src/tiff-4.1.0.patch1
new file mode 100644
index 00000000..6b7593d7
--- /dev/null
+++ b/cinelerra-5.1/thirdparty/src/tiff-4.1.0.patch1
@@ -0,0 +1,11 @@
+--- ./Makefile.am.orig 2021-11-29 09:48:57.020738370 +0300
++++ ./Makefile.am 2021-11-29 09:49:35.968738373 +0300
+@@ -60,7 +60,7 @@
+ rm -rf $(distdir)/_build/cmake
+ rm -rf $(distdir)/_inst/cmake
+
+-SUBDIRS = port libtiff tools build contrib test man html
++SUBDIRS = port libtiff build
+
+ release:
+ (rm -f $(top_srcdir)/RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE)
--
2.34.0
--
Cin mailing list
[email protected]
https://lists.cinelerra-gg.org/mailman/listinfo/cin
