two more patches, should fix interpreter in configure automagically, add termux conditionals in configure.ac, and mjpegtools patches should be buildable again on standard Linux (added ifdef for bthread.h include)
On Sunday, May 23, 2021, Andrew Randrianasulu <[email protected]> wrote: > updated series a bit more, hopefully now it has both my configure params > and launch params as shell scripts, added dv ifdefs to livevideo plugin (so > it can be compiled with - - without-dv) > > > > On Sunday, May 23, 2021, Andrew Randrianasulu <[email protected]> > wrote: > >> fixed (hopefully) 0001 patch, added mjpegtools and ffmpeg 4.4 >> termux-specific patches... also added libbthread source and simple Makefile >> (might be useful if i manage to include resulted library in >> libzmpeg-related files) >> >> >> >> On Wednesday, May 19, 2021, Andrew Randrianasulu <[email protected]> >> wrote: >> >>> probably not very complete (mjpegtools had their own problems) but >>> should give you some idea where I am >>> >>> patch 0001 still not fixed.. (as in, it reintroduced ff->video_probe and >>> this one still leaks..) >>> >>> configured with >>> >>> $ ./configure --without-lv2 --without-vdpau --without-vaapi >>> --without-firewire --without-nv --without-shuttle --without-shuttle_usb >>> --with-single-user --without-libzmpeg --with-clang --with-booby >>> --without-dv --without-dvb --without-video4linux2 --disable-dav1d >>> >>> >>>
From bbaa3852a7071c497bd0a44d67ed2d38d8ad7838 Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu <[email protected]> Date: Tue, 25 May 2021 18:57:03 +0300 Subject: [PATCH 30/31] Add support for conditional Termux-related libraries, auto-fix configure script because it demand bash --- cinelerra-5.1/autogen.sh | 4 ++++ cinelerra-5.1/configure.ac | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/cinelerra-5.1/autogen.sh b/cinelerra-5.1/autogen.sh index f9eb0ddf..50f3a13d 100755 --- a/cinelerra-5.1/autogen.sh +++ b/cinelerra-5.1/autogen.sh @@ -7,6 +7,10 @@ rm -rf autom4te.cache m4 if [ "$1" = "clean" ]; then exit 0; fi +#autoupdate mkdir m4 autoreconf --install +if [ "$(uname -o)" = "Android" ] || [ -e "/system/bin/app_process" ]; then +sed -i 's/usr\/bin\/sh/usr\/bin\/bash/' configure +fi \ No newline at end of file diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index 84bd1218..e61a2c01 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -451,10 +451,14 @@ PKG_3RD([ffnvcodec],[auto], [ ], [ . ]) +if test [ "$(uname -o)"] = "Android" ; then + PKG_3RD([libbthread],[auto], [libbthread-master], [ *.a ], [ . ]) +fi + AC_SUBST(STATIC_PKGS) @@ -1048,8 +1052,10 @@ if test "x$WANT_BOOBY" != "xno"; then CFG_CFLAGS+=" -DBOOBY" fi +if test [ "$(uname -o)"] = "Android" ; then # termux EXTRA_LIBS+=' -liconv' +fi # intel lock elision bugs if test "x$WANT_NOELISION" != "xno"; then -- 2.31.1
From 93d4e2f2006f6f09fd3f5ad346d52cb278fc707b Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu <[email protected]> Date: Tue, 25 May 2021 19:12:59 +0300 Subject: [PATCH 31/31] Fix mjpegtools-2.1.0.patch6 for conditional bthread.h include --- cinelerra-5.1/thirdparty/src/mjpegtools-2.1.0.patch6 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cinelerra-5.1/thirdparty/src/mjpegtools-2.1.0.patch6 b/cinelerra-5.1/thirdparty/src/mjpegtools-2.1.0.patch6 index 42fed77d..d2d92f81 100644 --- a/cinelerra-5.1/thirdparty/src/mjpegtools-2.1.0.patch6 +++ b/cinelerra-5.1/thirdparty/src/mjpegtools-2.1.0.patch6 @@ -1,10 +1,12 @@ ---- mjpegtools-2.1.0/mpeg2enc/seqencoder.cc 2010-10-17 19:19:48.000000000 +0400 -+++ mjpegtools-2.1.0/mpeg2enc/seqencoder.cc 2021-05-23 09:24:18.791050651 +0300 -@@ -56,6 +56,7 @@ +--- mjpegtools-2.1.0/mpeg2enc/seqencoder.cc.orig 2021-05-25 19:04:26.332933944 +0300 ++++ mjpegtools-2.1.0/mpeg2enc/seqencoder.cc 2021-05-25 19:05:44.904933948 +0300 +@@ -56,6 +56,9 @@ #include "ratectl.hh" #include "tables.h" #include "channel.hh" ++#if defined(__TERMUX__) +#include "bthread.h" ++#endif // -------------------------------------------------------------------------------- -- 2.31.1
-- Cin mailing list [email protected] https://lists.cinelerra-gg.org/mailman/listinfo/cin
