From: Good Guy <good1.2guy@gmail.com>
Date: Fri, 6 May 2022 17:11:47 +0000 (-0600)
Subject: termux and bsd accomodations by Andrew
X-Git-Tag: 2022-05~11
X-Git-Url: https://git.cinelerra-gg.org/git/?a=commitdiff_plain;h=ff4d1a70685f6721081fb3277a11834ad35cdd21;p=goodguy%2Fcinelerra.git

termux and bsd accomodations by Andrew
---

diff --git a/cinelerra-5.1/blds/bsd.bld b/cinelerra-5.1/blds/bsd.bld
index 165cc00b..b6ec27b3 100755
--- a/cinelerra-5.1/blds/bsd.bld
+++ b/cinelerra-5.1/blds/bsd.bld
@@ -1,19 +1,19 @@
-#!/bin/bash
+#!/usr/local/bin/bash
 #use: patch -p2 < bsd.patch
 export CONFIG_SHELL=/bin/bash
 export MAKE=gmake
 export C_INCLUDE_PATH=/usr/local/include
-export CPLUS_INCLUDE_PATH=/usr/local/include
+export CPLUS_INCLUDE_PATH=/usr/local/include:/usr/local/include/OpenEXR:/usr/local/include/Imath
 export LIBRARY_PATH=/usr/local/lib
 alias make=gmake
 ( ./autogen.sh
-  BSD=1 CC=clang CXX=clang++ CFLAGS="-g -O2 -DFFMPEG3" \
+  BSD=1 CC=clang CXX=clang++ CFLAGS="-g -O2 " \
   ./configure --with-single-user \
     --disable-static-build --without-lv2 --disable-lame --disable-twolame \
     --with-oss --without-alsa --without-firewire --without-dv --without-dvb \
     --without-video4linux2 --without-xxf86vm --without-ladspa-build \
     --without-libzmpeg --without-commercial --without-thirdparty \
     --without-vaapi --without-vdpau --without-shuttle --without-shuttle-usb \
-    --without-x10tv --without-wintv
+    --without-x10tv --with-jobs=4 --without-wintv
    gmake
    gmake install ) 2>&1 | tee log
diff --git a/cinelerra-5.1/blds/termux_dyn.bld b/cinelerra-5.1/blds/termux_dyn.bld
new file mode 100755
index 00000000..5e5d35b8
--- /dev/null
+++ b/cinelerra-5.1/blds/termux_dyn.bld
@@ -0,0 +1,6 @@
+#!/bin/sh
+./configure --with-single-user --without-thirdparty \
+    --without-dvb --without-video4linux2 --without-dv \
+    --without-firewire --without-libzmpeg --without-vaapi \
+    --without-vdpau --without-lv2 --without-openexr --without-ogg \
+    --without-gl
diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile
index 65df2f4a..9f5f8afd 100644
--- a/cinelerra-5.1/cinelerra/Makefile
+++ b/cinelerra-5.1/cinelerra/Makefile
@@ -436,9 +436,11 @@ LIBS := $(LIBRARIES)
 ifeq ($(WANT_CIN_3RDPARTY),no)
 LIBS += -lavcodec -lavdevice -lavfilter -lavformat -lavutil
 LIBS += -lswresample -lswscale
+PLATFORM = $(shell uname -s)
+ifneq (, $(filter $(PLATFORM), FreeBSD NetBSD))
 LIBS += -lintl -liconv
 LIBS += -lexecinfo
-
+endif
 LIBS += $(shared_libs)
 LIBS += $(system_libs)
 else
diff --git a/cinelerra-5.1/opencv_build b/cinelerra-5.1/opencv_build
index 736e1d90..7be18228 100644
--- a/cinelerra-5.1/opencv_build
+++ b/cinelerra-5.1/opencv_build
@@ -49,6 +49,7 @@ jobs:=-j$(shell echo $$(($(cpus) + $(cpus)/2 +2)))
 #opencv4 breaks SIFT/SURF findobj
 CFLAGS += -I$(opencv_prefix)/include/opencv4
 CFLAGS += -I$(opencv_prefix)/include
+CFLAGS += -std=c++11
 
 ifeq ($(src),git)
 $(opencv).src:
@@ -83,6 +84,9 @@ $(opencv)/build: $(opencv).src
   -DINSTALL_C_EXAMPLES=OFF \
   -DINSTALL_PYTHON_EXAMPLES=OFF \
   -DBUILD_EXAMPLES=OFF .. \
+  -DBUILD_PERF_TESTS=OFF \
+  -DBUILD_TESTS=OFF \
+  -DBUILD_opencv_apps=OFF \
   -DBUILD_opencv_python3=no \
   -DCMAKE_INSTALL_PREFIX=/usr/local \
   -DOPENCV_EXTRA_MODULES_PATH="$(opencv)_contrib/modules/"
@@ -106,10 +110,13 @@ $(opencv)/build: $(opencv).src
   -DINSTALL_PYTHON_EXAMPLES=ON \
   -DBUILD_EXAMPLES=ON .. \
   -DBUILD_opencv_python3=no \
+  -DBUILD_PERF_TESTS=OFF \
+  -DBUILD_TESTS=OFF \
+  -DBUILD_opencv_apps=OFF \
   -DCMAKE_INSTALL_PREFIX=/usr/local \
   -DOPENCV_EXTRA_MODULES_PATH="$(opencv)_contrib/modules/"
 
-SYSLIB := $(lastword $(wildcard /usr/lib /usrlib32 /usr/lib64))
+SYSLIB := $(lastword $(wildcard /usr/lib /usr/lib32 /usr/lib64))
 CVLIBS := $(dir $(shell find $(opencv_prefix) -name libopencv_core.so))
 LFLAGS += -L$(CVLIBS) $(patsubst $(CVLIBS)/lib%.so,-l%,$(wildcard $(CVLIBS)/libopencv_*.so))
 LFLAGS += $(patsubst $(SYSLIB)/lib%.so,-l%,$(wildcard $(SYSLIB)/lib{Half,Imath,Ilm,Iex}*.so))
@@ -118,7 +125,7 @@ static_incs :=
 else ifeq ($(bld),sys)
 $(opencv)/build:
 
-SYSLIB := $(lastword $(wildcard /usr/lib /usrlib32 /usr/lib64))
+SYSLIB := $(lastword $(wildcard /usr/lib /usr/lib32 /usr/lib64))
 LFLAGS += $(patsubst $(SYSLIB)/lib%.so,-l%,$(wildcard $(SYSLIB)/libopencv_*.so))
 LFLAGS += $(patsubst $(SYSLIB)/lib%.so,-l%,$(wildcard $(SYSLIB)/lib{Half,Imath,Ilm,Iex}*.so))
 static_libs :=
diff --git a/cinelerra-5.1/plugins/Makefile b/cinelerra-5.1/plugins/Makefile
index c4a5fd43..e6718432 100644
--- a/cinelerra-5.1/plugins/Makefile
+++ b/cinelerra-5.1/plugins/Makefile
@@ -37,7 +37,6 @@ DIRS = $(OPENCV_OBJS) \
 	brightness \
 	burn \
 	C41 \
-	cdripper \
 	chorus \
 	chromakey \
 	chromakeyhsv \
@@ -173,6 +172,11 @@ DIRS = $(OPENCV_OBJS) \
 	theme_unflat \
 	theme_cakewalk \
 
+PLATFORM = $(shell uname -o)
+ifneq ($(PLATFORM), FreeBSD)
+DIRS += cdripper
+endif
+
 # not maintained
 #	motion-cv \
 #	motion-hv \