From 90e3dcd76cd8661a02734830617d921741cfc39a Mon Sep 17 00:00:00 2001 From: Good Guy Date: Thu, 2 Feb 2023 15:51:36 -0700 Subject: [PATCH] Credit Andrew - BSD fixes + a little more --- cinelerra-5.1/cinelerra/interfaceprefs.C | 2 +- cinelerra-5.1/configure.ac | 1 + cinelerra-5.1/guicast/Makefile | 15 +++++++++++---- cinelerra-5.1/plugins/Makefile | 14 +++++--------- cinelerra-5.1/thirdparty/Makefile | 2 +- cinelerra-5.1/thirdparty/src/tiff-4.4.0.patch2 | 12 ++++++++++++ 6 files changed, 31 insertions(+), 15 deletions(-) create mode 100644 cinelerra-5.1/thirdparty/src/tiff-4.4.0.patch2 diff --git a/cinelerra-5.1/cinelerra/interfaceprefs.C b/cinelerra-5.1/cinelerra/interfaceprefs.C index 8b67d133..bea12a4a 100644 --- a/cinelerra-5.1/cinelerra/interfaceprefs.C +++ b/cinelerra-5.1/cinelerra/interfaceprefs.C @@ -112,7 +112,7 @@ void InterfacePrefs::create_objects() text->create_objects(); text->context_help_set_keyword("Using the Drag Handle with Trim"); y += ys30; - add_subwindow(title = new BC_Title(x, y, _("MMB BT.2:"))); + add_subwindow(title = new BC_Title(x, y, _("MMB Bt.2:"))); title->context_help_set_keyword("Using the Drag Handle with Trim"); add_subwindow(text = new ViewBehaviourText(x1, y - ys5, diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index 8839af99..eb190103 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -900,6 +900,7 @@ EXROStream() : Imf::OStream("mypath") {} }; SHARED_LIBS+=" $LIBS" CFG_CFLAGS+=" -I/usr/include/OpenEXR -I/usr/local/include/OpenEXR" CFG_CFLAGS+=" $(pkg-config --cflags OpenEXR)" + CFG_CFLAGS+=" $(pkg-config --cflags Imath)" fi CFG_CFLAGS+=" $(pkg-config --cflags OpenEXR)" fi diff --git a/cinelerra-5.1/guicast/Makefile b/cinelerra-5.1/guicast/Makefile index 32ef3582..423ba100 100644 --- a/cinelerra-5.1/guicast/Makefile +++ b/cinelerra-5.1/guicast/Makefile @@ -121,11 +121,18 @@ $(shell echo $(CFLAGS) > $(OBJDIR)/c_flags) $(shell echo $(OBJS) > $(OBJDIR)/objs) all: $(OUTPUT) $(UTILS) -ifeq ($(uname -s), FreeBSD) -python = $(shell find /usrlocal/bin -name python3\* | head -n 1) -else -python = `which python` +PLATFORM = $(uname -s) +ifneq ($(PLATFORM), FreeBSD) +python = $(shell find /usr/local/bin -name python3\* | head -n 1) endif +ifneq ($(PLATFORM), Linux) +python = $(shell which python) +endif + +ifeq ($(python),) +python += $(shell which python3.8) +endif + $(BCXFER): bccmdl.py bcxfer.C bcxfer.h $(python) < ./bccmdl.py diff --git a/cinelerra-5.1/plugins/Makefile b/cinelerra-5.1/plugins/Makefile index 9c3a6a30..40d50c12 100644 --- a/cinelerra-5.1/plugins/Makefile +++ b/cinelerra-5.1/plugins/Makefile @@ -171,18 +171,14 @@ DIRS = $(OPENCV_OBJS) \ theme_cakewalk \ PLATFORM = $(shell uname) -ifneq ($(PLATFORM), NetBSD) +ifeq ($(PLATFORM), NetBSD) +DIRS += theme_blond theme_blue +else ifeq ($(PLATFORM), FreeBSD) +DIRS += theme_blond theme_blue +else ifeq ($(PLATFORM), Linux) DIRS += cdripper theme_blond theme_blue endif -ifneq ($(PLATFORM), FreeBSD) -DIRS += theme_blond theme_blue -endif - -ifeq ($(PLATFORM), Linux) -DIRS += cdripper -endif - # not maintained # motion-cv \ # motion-hv \ diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile index 06d64110..1568b615 100644 --- a/cinelerra-5.1/thirdparty/Makefile +++ b/cinelerra-5.1/thirdparty/Makefile @@ -244,7 +244,7 @@ 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 +openjpeg.cfg_params?= -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_CODEC:BOOL=OFF openjpeg.cfg_vars?=$(call cmake_config,.) openjpeg.mak_params?= ; cd $(call bld_path,openjpeg,src/lib/openjp2); ln -sf . openjpeg-2.1 opencv.cfg_vars?=$(call cmake_config,.) diff --git a/cinelerra-5.1/thirdparty/src/tiff-4.4.0.patch2 b/cinelerra-5.1/thirdparty/src/tiff-4.4.0.patch2 new file mode 100644 index 00000000..addd2791 --- /dev/null +++ b/cinelerra-5.1/thirdparty/src/tiff-4.4.0.patch2 @@ -0,0 +1,12 @@ +--- ./configure.ac.orig 2023-01-30 20:35:40.839847499 +0300 ++++ ./configure.ac 2023-01-30 20:48:27.751778042 +0300 +@@ -838,7 +838,8 @@ + if test "x$enable_webp" != "xno" ; then + + if test "x$with_webp_lib_dir" != "x" ; then +- LDFLAGS="-L$with_webp_lib_dir $LDFLAGS" ++ LIBS="-lpthread $LIBS" ++ LDFLAGS="-L$with_webp_lib_dir $LDFLAGS " + fi + + AC_CHECK_LIB(webp, WebPDecode, [webp_lib=yes], [webp_lib=no],) -- 2.26.2