From: Good Guy <good1.2guy@gmail.com>
Date: Thu, 25 Nov 2021 04:31:41 +0000 (-0700)
Subject: still more Andrew Termux/Android mods
X-Git-Tag: 2021-11~2
X-Git-Url: https://cinelerra-gg.org/git/?a=commitdiff_plain;h=939d0c172d032cb7e01a0c05ee4afcca75b97887;p=goodguy%2Fcinelerra.git

still more Andrew Termux/Android mods
---

diff --git a/cinelerra-5.1/libzmpeg3/Makefile b/cinelerra-5.1/libzmpeg3/Makefile
index aeade023..47a0596f 100644
--- a/cinelerra-5.1/libzmpeg3/Makefile
+++ b/cinelerra-5.1/libzmpeg3/Makefile
@@ -80,7 +80,7 @@ UTILS += $(OBJDIR)/zmpeg3cc2txt
 
 LIBS = -lm -lpthread
 
-LIBS += $(lib_a52dec) $(lib_djbfft)
+LIBS += $(lib_a52dec) $(lib_djbfft) $(lib_libbthread)
 
 ifeq ($(DYNAMIC_FONTS), 1)
 LIBS += -lX11
diff --git a/cinelerra-5.1/plugins/livevideo/livevideo.C b/cinelerra-5.1/plugins/livevideo/livevideo.C
index d928b7e8..888164a1 100644
--- a/cinelerra-5.1/plugins/livevideo/livevideo.C
+++ b/cinelerra-5.1/plugins/livevideo/livevideo.C
@@ -31,7 +31,7 @@
 #include "filexml.h"
 #include "guicast.h"
 #include "language.h"
-#ifdef HAVE_LIBDV
+#ifdef HAVE_DV
 #include "libdv.h"
 #endif
 #include "libmjpeg.h"
@@ -152,7 +152,7 @@ public:
 	int prev_channel;
 	int w, h;
 // Decompressors for different video drivers
-#ifdef HAVE_LIBDV
+#ifdef HAVE_DV
 	dv_t *dv;
 #endif
 	mjpeg_t *mjpeg;
@@ -354,7 +354,7 @@ LiveVideo::LiveVideo(PluginServer *server)
 	w = xS(320);
 	h = yS(640);
 	prev_channel = 0;
-#ifdef HAVE_LIBDV
+#ifdef HAVE_DV
 	dv = 0;
 #endif
 	mjpeg = 0;
@@ -376,7 +376,7 @@ LiveVideo::~LiveVideo()
 
 	delete channeldb;
 	delete temp;
-#ifdef HAVE_LIBDV
+#ifdef HAVE_DV
 	if(dv) dv_delete(dv);
 #endif
 	if(mjpeg) mjpeg_delete(mjpeg);
@@ -507,7 +507,7 @@ int LiveVideo::process_buffer(VFrame *frame,
 			{
 				switch(session->vconfig_in->driver)
 				{
-#ifdef HAVE_LIBDV
+#ifdef HAVE_DV
 					case CAPTURE_FIREWIRE:
 					case CAPTURE_IEC61883:
 // Decompress a DV frame from the driver
diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile
index 75d8e877..63adb5be 100644
--- a/cinelerra-5.1/thirdparty/Makefile
+++ b/cinelerra-5.1/thirdparty/Makefile
@@ -183,6 +183,7 @@ ffmpeg.cfg_params= \
 
 #cmake_config=echo "exec cmake \$$$$@ $(1)" > ./configure; chmod +x ./configure;
 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
@@ -317,6 +318,10 @@ else
 rules=$(eval $(1))
 endif
 
+uname := $(shell uname -o)
+ifeq ($(uname), Android)
+$(call rules,$(call std-build,libbthread))
+endif
 $(call rules,$(call std-build,a52dec,djbfft))
 $(call rules,$(call std-build,djbfft))
 $(call rules,$(call std-build,audiofile))
diff --git a/cinelerra-5.1/thirdparty/src/libbthread.patch1 b/cinelerra-5.1/thirdparty/src/libbthread.patch1
new file mode 100644
index 00000000..852d568a
--- /dev/null
+++ b/cinelerra-5.1/thirdparty/src/libbthread.patch1
@@ -0,0 +1,8 @@
+--- /dev/null	2021-05-22 06:52:04.572000000 +0300
++++ libbthread-master/Makefile	2021-05-23 10:18:06.719050843 +0300
+@@ -0,0 +1,4 @@
++all:
++	cat `ls *.c` > just-pt.c
++	g++ -c -o jpt.o just-pt.c -I.
++	ar crs jpt.a jpt.o
+\ No newline at end of file
diff --git a/cinelerra-5.1/thirdparty/src/libbthread.tar.gz b/cinelerra-5.1/thirdparty/src/libbthread.tar.gz
new file mode 100644
index 00000000..e642e366
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/libbthread.tar.gz differ