From 1fc14e42e3fc45c79b74013382e68557cab85729 Mon Sep 17 00:00:00 2001 From: Good Guy Date: Sun, 10 Dec 2023 11:48:22 -0700 Subject: [PATCH] BSD 14 mods - move to ffmpeg6, move to python39, fix OpenEXR build; add missing includes for newest distro to makeappimage tool; limit # of opencv modules to build; new render formats of HDR and WBMP --- cinelerra-5.1/configure.ac | 6 +++--- cinelerra-5.1/ffmpeg/video/hdr.dfl | 1 + cinelerra-5.1/ffmpeg/video/hdr.hdr | 3 +++ cinelerra-5.1/ffmpeg/video/wbmp.dfl | 1 + cinelerra-5.1/ffmpeg/video/wbmp.wbmp | 3 +++ cinelerra-5.1/guicast/Makefile | 2 +- cinelerra-5.1/opencv_build | 1 + cinelerra-5.1/tools/makeappimagetool/appdir_root_setup.cpp | 1 + cinelerra-5.1/tools/makeappimagetool/subprocess.cpp | 1 + 9 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 cinelerra-5.1/ffmpeg/video/hdr.dfl create mode 100644 cinelerra-5.1/ffmpeg/video/hdr.hdr create mode 100644 cinelerra-5.1/ffmpeg/video/wbmp.dfl create mode 100644 cinelerra-5.1/ffmpeg/video/wbmp.wbmp diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index 4814f8b8..f210281c 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -901,7 +901,7 @@ EXROStream() : Imf::OStream("mypath") {} }; if test "x$WANT_STATIC_BUILD" = "xno"; then SHARED_openexr="$LIBS" SHARED_LIBS+=" $LIBS" - CFG_CFLAGS+=" -I/usr/include/OpenEXR -I/usr/local/include/OpenEXR" + CFG_CFLAGS+=" -I/usr/local/include/Imath -I/usr/include/OpenEXR -I/usr/local/include/OpenEXR" CFG_CFLAGS+=" $(pkg-config --cflags OpenEXR)" CFG_CFLAGS+=" $(pkg-config --cflags Imath)" fi @@ -1281,13 +1281,13 @@ fi if test [ "$(uname)"] = "NetBSD" ; then echo "CFLAGS += -DNO_BTRACE" echo "CFLAGS += -DNO_CTX" -echo "system_libs += -L/usr/pkg/lib/ffmpeg4" +echo "system_libs += -L/usr/pkg/lib/ffmpeg6" echo "system_libs += -L/usr/pkg/lib/" echo "system_libs += -lpng16" echo "system_libs += -lintl" echo "system_libs += -lossaudio" echo "CFLAGS += -I/usr/X11R7/include" -echo "CFLAGS += -I/usr/pkg/include/ffmpeg4" +echo "CFLAGS += -I/usr/pkg/include/ffmpeg6" echo "CFLAGS += $(pkg-config --cflags xft)" echo "CFLAGS += -I/usr/pkg/include" echo "CFLAGS += -I/usr/pkg/include/uuid" diff --git a/cinelerra-5.1/ffmpeg/video/hdr.dfl b/cinelerra-5.1/ffmpeg/video/hdr.dfl new file mode 100644 index 00000000..f4fb418d --- /dev/null +++ b/cinelerra-5.1/ffmpeg/video/hdr.dfl @@ -0,0 +1 @@ +hdr.hdr diff --git a/cinelerra-5.1/ffmpeg/video/hdr.hdr b/cinelerra-5.1/ffmpeg/video/hdr.hdr new file mode 100644 index 00000000..a83465b6 --- /dev/null +++ b/cinelerra-5.1/ffmpeg/video/hdr.hdr @@ -0,0 +1,3 @@ +image2 hdr +# this codec creates a set of image files in a directory +# use an image2 file name like /dir/t%05d.tiff diff --git a/cinelerra-5.1/ffmpeg/video/wbmp.dfl b/cinelerra-5.1/ffmpeg/video/wbmp.dfl new file mode 100644 index 00000000..347e43e5 --- /dev/null +++ b/cinelerra-5.1/ffmpeg/video/wbmp.dfl @@ -0,0 +1 @@ +wbmp.wbmp diff --git a/cinelerra-5.1/ffmpeg/video/wbmp.wbmp b/cinelerra-5.1/ffmpeg/video/wbmp.wbmp new file mode 100644 index 00000000..49e13493 --- /dev/null +++ b/cinelerra-5.1/ffmpeg/video/wbmp.wbmp @@ -0,0 +1,3 @@ +image2 wbmp +# this codec creates a set of image files in a directory +# use an image2 file name like /dir/t%05d.tiff diff --git a/cinelerra-5.1/guicast/Makefile b/cinelerra-5.1/guicast/Makefile index 423ba100..49bd154c 100644 --- a/cinelerra-5.1/guicast/Makefile +++ b/cinelerra-5.1/guicast/Makefile @@ -130,7 +130,7 @@ python = $(shell which python) endif ifeq ($(python),) -python += $(shell which python3.8) +python += $(shell which python3.9) endif diff --git a/cinelerra-5.1/opencv_build b/cinelerra-5.1/opencv_build index f443e29c..bc3feb19 100644 --- a/cinelerra-5.1/opencv_build +++ b/cinelerra-5.1/opencv_build @@ -92,6 +92,7 @@ $(opencv)/build: $(opencv).src -DBUILD_TESTS=OFF \ -DBUILD_opencv_apps=OFF \ -DBUILD_opencv_python3=no \ + -DBUILD_LIST="calib3d,core,features2d,imgproc,objdetect,photo,video,xfeatures2d,ximgproc,videostab" \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DOPENCV_EXTRA_MODULES_PATH="$(opencv)_contrib/modules/" diff --git a/cinelerra-5.1/tools/makeappimagetool/appdir_root_setup.cpp b/cinelerra-5.1/tools/makeappimagetool/appdir_root_setup.cpp index a8576093..9ddf551e 100644 --- a/cinelerra-5.1/tools/makeappimagetool/appdir_root_setup.cpp +++ b/cinelerra-5.1/tools/makeappimagetool/appdir_root_setup.cpp @@ -1,4 +1,5 @@ // local headers +#include #include "includes/util.h" #include "includes/log.h" #include "includes/appdir_root_setup.h" diff --git a/cinelerra-5.1/tools/makeappimagetool/subprocess.cpp b/cinelerra-5.1/tools/makeappimagetool/subprocess.cpp index 0dcfd6b4..bd3ee62b 100644 --- a/cinelerra-5.1/tools/makeappimagetool/subprocess.cpp +++ b/cinelerra-5.1/tools/makeappimagetool/subprocess.cpp @@ -6,6 +6,7 @@ #include #include #include +#include // local headers #include "includes/subprocess.h" -- 2.26.2