BSD 14 mods - move to ffmpeg6, move to python39, fix OpenEXR build; add missing inclu...

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index 4814f8b879ce4151ef7463861f5617632c8f625d..f210281c8582adb378613e2daadafc2c3815dd4e 100644 (file)
--- 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 (file)
index 0000000..f4fb418
--- /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 (file)
index 0000000..a83465b
--- /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 (file)
index 0000000..347e43e
--- /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 (file)
index 0000000..49e1349
--- /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 423ba100d91665179cab9bbe76e6a1e70e8fb933..49bd154c6cb0859eff6b11205c21ffda43d4d135 100644 (file)
--- 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 f443e29c97091634fe666f588c3c57554b0c69b7..bc3feb195af11cc56a070c00dd9cc8f004efcd1b 100644 (file)
--- 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 a85760931df8ca9d615bb1c973b3c634564cf698..9ddf551e09fd4bae1891254e3af064a062c7b4b3 100644 (file)
--- 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 <fstream>
 #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 0dcfd6b4a3d0488b9ff03be94c7158ecd47ee2c0..bd3ee62b8a04061002de330340499fe654ce5a57 100644 (file)
--- a/cinelerra-5.1/tools/makeappimagetool/subprocess.cpp
+++ b/cinelerra-5.1/tools/makeappimagetool/subprocess.cpp
@@ -6,6 +6,7 @@
 #include <utility>
 #include <unistd.h>
 #include <thread>
+#include <array>
 
 // local headers
 #include "includes/subprocess.h"