From: Good Guy <good1.2guy@gmail.com>
Date: Sun, 24 Nov 2024 17:53:01 +0000 (-0700)
Subject: Credit Andrew-R updates needed for building NetBSD 10.0
X-Git-Url: https://git.cinelerra-gg.org/git/?a=commitdiff_plain;h=e95a13ef26007757c4702d066c271a03c17e7249;p=goodguy%2Fcinelerra.git

Credit Andrew-R updates needed for building NetBSD 10.0
---

diff --git a/cinelerra-5.1/blds/netbsd.bld b/cinelerra-5.1/blds/netbsd.bld
index 0e2c97a6..b121e0f8 100755
--- a/cinelerra-5.1/blds/netbsd.bld
+++ b/cinelerra-5.1/blds/netbsd.bld
@@ -1,6 +1,6 @@
-#!/bin/bash
+#!/usr/pkg/bin/bash
 #patch not needed anymore
-export CONFIG_SHELL=/bin/bash
+export CONFIG_SHELL=/usr/pkg/bin/bash
 export MAKE=gmake
 export C_INCLUDE_PATH=/usr/local/include:/usr/X11R7/include:/usr/pkg/include:/usr/pkg/include/ffmpeg6
 export CPLUS_INCLUDE_PATH=/usr/local/include
@@ -9,7 +9,7 @@ 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
+( bash ./autogen.sh
   BSD=1 CC=gcc CXX=g++ CFLAGS=" ${CFLAGS1} -g -fpermissive -O2" \
   ./configure --with-single-user \
     --disable-static-build --without-lv2 --disable-lame --disable-twolame \
diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile
index e8eb1d5b..f79f78cb 100644
--- a/cinelerra-5.1/cinelerra/Makefile
+++ b/cinelerra-5.1/cinelerra/Makefile
@@ -438,7 +438,7 @@ LIBS += -lavfilter -lavformat -lavcodec -lavutil
 LIBS += -lswresample -lswscale
 PLATFORM = $(shell uname -s)
 ifneq (, $(filter $(PLATFORM), NetBSD))
-LIBS += -lintl
+LIBS += -lintl -liconv
 endif
 ifneq (, $(filter $(PLATFORM), FreeBSD))
 LIBS += -lintl -liconv
diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index a1b1dabd..d7236c68 100644
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -1203,8 +1203,11 @@ AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
 
 exec > global_config
-
+if test [ "$(uname)"] = "NetBSD" ; then
+echo "SHELL := /usr/pkg/bin/bash"
+else
 echo "SHELL := /bin/bash"
+fi
 echo "export SHELL"
 echo "WANT_JOBS := $WANT_JOBS"
 if test "x$WANT_CLANG" = "xyes" ; then
@@ -1304,6 +1307,8 @@ echo "system_libs += -L/usr/pkg/lib/"
 echo "system_libs += -lpng16"
 echo "system_libs += -lintl"
 echo "system_libs += -lossaudio"
+echo "system_libs += -rpath=/usr/pkg/lib/ffmpeg6"
+echo "system_libs += -rpath=/usr/pkg/lib/"
 echo "CFLAGS += -I/usr/X11R7/include"
 echo "CFLAGS += -I/usr/pkg/include/ffmpeg6"
 echo "CFLAGS += $(pkg-config --cflags xft)"
diff --git a/cinelerra-5.1/guicast/Makefile b/cinelerra-5.1/guicast/Makefile
index 49bd154c..67116252 100644
--- a/cinelerra-5.1/guicast/Makefile
+++ b/cinelerra-5.1/guicast/Makefile
@@ -130,7 +130,11 @@ python = $(shell which python)
 endif
 
 ifeq ($(python),)
-python += $(shell which python3.9)
+python = $(shell which python3.9)
+endif
+
+ifeq ($(python),)
+python = $(shell which python3.12)
 endif