so, I tested them on Slackware 15.0 i586 (static link w/ ffmpeg 6.1 and dynamic with ffmpeg 4.4) Termux aarch64 (dynamic so far) Freebsd 14.0 amd64 updated to latest packages NetBSD 9.2 i386 updated to latest user packages Ubuntu 16.04 amd64 - static ffmpeg 6.1 without dav1d
currently testing: Debian 11.0 amd64
From b4a8729ea8b9ad5a862e09b24fc385b707ef94f6 Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu <[email protected]> Date: Sun, 26 Nov 2023 17:28:51 +0000 Subject: [PATCH 2/4] Fix OpenEXR build on freebsd 14 --- cinelerra-5.1/configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index 4814f8b8..27a2d298 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -909,6 +909,7 @@ EXROStream() : Imf::OStream("mypath") {} }; fi LIBS="$saved_LIBS" CXXFLAGS="$saved_CXXFLAGS" + CXXFLAGS+=" $(pkg-config --cflags OpenEXR)" AC_LANG_POP(C++) AC_MSG_RESULT([$HAVE_OPENEXR]) ]) -- 2.35.7
From 59c7c43e2ec1951bda03b58be53bdfc774826b3a Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu <[email protected]> Date: Sun, 26 Nov 2023 17:27:42 +0000 Subject: [PATCH 1/4] Fix freebsd 14 build, moved to python39 --- cinelerra-5.1/guicast/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.35.7
From ca9e91202c24e1a491703a7a00f701198da2a33e Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu <[email protected]> Date: Mon, 27 Nov 2023 03:14:59 +0000 Subject: [PATCH 3/4] Better fix for freebsd 14 OpenEXR cflags pkg-config does not work for some reason/ --- cinelerra-5.1/configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index 27a2d298..6e70fb18 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 @@ -909,7 +909,6 @@ EXROStream() : Imf::OStream("mypath") {} }; fi LIBS="$saved_LIBS" CXXFLAGS="$saved_CXXFLAGS" - CXXFLAGS+=" $(pkg-config --cflags OpenEXR)" AC_LANG_POP(C++) AC_MSG_RESULT([$HAVE_OPENEXR]) ]) -- 2.35.7
From 289a77239a2f19f14a0d0f21db0bcfb984402019 Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu <[email protected]> Date: Sun, 26 Nov 2023 11:24:45 +0000 Subject: [PATCH 4/4] Change NetBSD build script/configure to ffmpeg v6 --- cinelerra-5.1/blds/netbsd.bld | 10 +++++----- cinelerra-5.1/configure.ac | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cinelerra-5.1/blds/netbsd.bld b/cinelerra-5.1/blds/netbsd.bld index 5d961ee9..0e2c97a6 100755 --- a/cinelerra-5.1/blds/netbsd.bld +++ b/cinelerra-5.1/blds/netbsd.bld @@ -1,16 +1,16 @@ #!/bin/bash -#use: patch -p2 < bsd.patch +#patch not needed anymore export CONFIG_SHELL=/bin/bash export MAKE=gmake -export C_INCLUDE_PATH=/usr/local/include:/usr/X11R7/include:/usr/pkg/include:/usr/pkg/include/ffmpeg4 +export C_INCLUDE_PATH=/usr/local/include:/usr/X11R7/include:/usr/pkg/include:/usr/pkg/include/ffmpeg6 export CPLUS_INCLUDE_PATH=/usr/local/include export LIBRARY_PATH=/usr/local/lib -export LDFLAGS="-L/usr/X11R7/lib -L/usr/pkg/lib" -export CFLAGS="-I/usr/pkg/include -I/usr/pkg/include/ffmpeg4 -pthread -I/usr/pkg/include -I/usr/pkg/include/OpenEXR -I/usr/pkg/include -I/usr/pkg/include/Imath" +export LDFLAGS="-L/usr/X11R7/lib -L/usr/pkg/lib -L/usr/pkg/lib/ffmpeg6 " +export CFLAGS1="-I/usr/pkg/include -I/usr/pkg/include/ffmpeg6 -pthread -I/usr/pkg/include -I/usr/pkg/include/OpenEXR -I/usr/pkg/include -I/usr/pkg/include/Imath" alias make=gmake ( ./autogen.sh - BSD=1 CC=gcc CXX=g++ CFLAGS="-g -fpermissive -O2 -DFFMPEG3" \ + BSD=1 CC=gcc CXX=g++ CFLAGS=" ${CFLAGS1} -g -fpermissive -O2" \ ./configure --with-single-user \ --disable-static-build --without-lv2 --disable-lame --disable-twolame \ --with-oss --without-alsa --without-firewire --without-dv --without-dvb \ diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index 6e70fb18..f210281c 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -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" -- 2.35.7
-- Cin mailing list [email protected] https://lists.cinelerra-gg.org/mailman/listinfo/cin
