Credit Andrew with NetBSD build fixes

diff --git a/cinelerra-5.1/blds/netbsd.bld b/cinelerra-5.1/blds/netbsd.bld
index b6c5f96bd0ad5b3792fd5d9bba32998db6f72ace..5d961ee97f5c8d8b4d80891d9f790a9a9189c91c 100644 (file)
--- a/cinelerra-5.1/blds/netbsd.bld
+++ b/cinelerra-5.1/blds/netbsd.bld
@@ -17,6 +17,6 @@ alias make=gmake
     --without-video4linux2 --without-xxf86vm --without-ladspa-build \
     --without-libzmpeg --without-commercial --without-thirdparty \
     --without-vaapi --without-openexr --with-jobs=4 --without-vdpau --without-shuttle --without-shuttle-usb \
-    --without-x10tv --without-wintv
+    --without-x10tv --without-wintv --without-libdpx
    gmake
    gmake install ) 2>&1 | tee log

diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile
index e293d3dd0cb26950581b710e8f943d9940732a9e..5c35856920de9634381ede4bc0f95413cec345ca 100644 (file)
--- a/cinelerra-5.1/cinelerra/Makefile
+++ b/cinelerra-5.1/cinelerra/Makefile
@@ -437,7 +437,10 @@ ifeq ($(WANT_CIN_3RDPARTY),no)
 LIBS += -lavfilter -lavformat -lavcodec -lavutil
 LIBS += -lswresample -lswscale
 PLATFORM = $(shell uname -s)
-ifneq (, $(filter $(PLATFORM), FreeBSD NetBSD))
+ifneq (, $(filter $(PLATFORM), NetBSD))
+LIBS += -lintl
+endif
+ifneq (, $(filter $(PLATFORM), FreeBSD))
 LIBS += -lintl -liconv
 LIBS += -lexecinfo
 endif

diff --git a/cinelerra-5.1/cinelerra/bdcreate.C b/cinelerra-5.1/cinelerra/bdcreate.C
index 16c655a592c42595b2255816c72207742002a603..cc6b40b76d5e07320daeb0c8ecce9be64b7d8a86 100644 (file)
--- a/cinelerra-5.1/cinelerra/bdcreate.C
+++ b/cinelerra-5.1/cinelerra/bdcreate.C
@@ -26,12 +26,21 @@
 #include <errno.h>
 #if !defined(__FreeBSD__)
 #include <sys/stat.h>
+#if !defined(__NetBSD__)
 #include <sys/statfs.h>
+#endif
 #else
 #include <sys/param.h>
 #include <sys/mount.h>
 #endif
 
+#if defined(__NetBSD__)
+#include <sys/statvfs.h>
+#ifndef statfs
+#define statfs statvfs
+#endif
+#endif
+
 // BD Creation
 
 // selected by timezone

diff --git a/cinelerra-5.1/cinelerra/dvdcreate.C b/cinelerra-5.1/cinelerra/dvdcreate.C
index 175ef5477ceb24c39c5a5b680af513d163e3cc4f..72259b270ff1f517b6fd1a5366d9f2011fdc1dc3 100644 (file)
--- a/cinelerra-5.1/cinelerra/dvdcreate.C
+++ b/cinelerra-5.1/cinelerra/dvdcreate.C
@@ -26,12 +26,21 @@
 #include <errno.h>
 #if !defined(__FreeBSD__)
 #include <sys/stat.h>
+#if !defined(__NetBSD__)
 #include <sys/statfs.h>
+#endif
 #else
 #include <sys/param.h>
 #include <sys/mount.h>
 #endif
 
+#if defined(__NetBSD__)
+#include <sys/statvfs.h>
+#ifndef statfs
+#define statfs statvfs
+#endif
+#endif
+
 #define DVD_PAL_4x3    0
 #define DVD_PAL_16x9   1
 #define DVD_NTSC_4x3   2

diff --git a/cinelerra-5.1/cinelerra/exportedl.C b/cinelerra-5.1/cinelerra/exportedl.C
index 108c2ad6ec6a47ab577dcaa1b71162e0e53e1894..691746357c3fc8c6834c25d4e39b952a2528ca8a 100644 (file)
--- a/cinelerra-5.1/cinelerra/exportedl.C
+++ b/cinelerra-5.1/cinelerra/exportedl.C
@@ -39,7 +39,7 @@
 #include "exportedl.h"
 #include "tracks.h"
 #include "transition.h"
-#if defined (__FreeBSD__)
+#if defined (__FreeBSD__) || defined (__NetBSD__)
 #include <libgen.h>
 #endif
 #include <ctype.h>

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index f7415a2bf66c32c3af0a3f0e0c5820de9867a83b..8839af996dfc05fa7aed9d255db0304aac951f90 100644 (file)
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -1274,6 +1274,22 @@ if test "x$BSD" != "x" ; then
   echo "CFLAGS += -DNO_GDB"
 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/"
+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 += $(pkg-config --cflags xft)"
+echo "CFLAGS += -I/usr/pkg/include"
+echo "CFLAGS += -I/usr/pkg/include/uuid"
+
+fi
+
 if test "x$WANT_X264_HIDEPTH" = "xyes" ; then
   X264_CFG_PARAMS="$X264_CFG_PARAMS --bit-depth=10"
 fi

diff --git a/cinelerra-5.1/guicast/Makefile b/cinelerra-5.1/guicast/Makefile
index 04d5a2e58dc452c0f9b02a09b99f447bae5d0a15..32ef35828010c44d25648a3c33357d204824effd 100644 (file)
--- a/cinelerra-5.1/guicast/Makefile
+++ b/cinelerra-5.1/guicast/Makefile
@@ -115,7 +115,7 @@ OUTPUT = $(OBJDIR)/libguicast.a
 UTILS = $(OBJDIR)/bootstrap $(OBJDIR)/pngtoh $(OBJDIR)/pngtoraw
 BCXFER = xfer/$(OBJDIR)/xfer.stamp
 
-CFLAGS += $(static_incs)
+CFLAGS += $(static_incs) `pkg-config --cflags libpng` `pkg-config --cflags libjpeg`
 
 $(shell echo $(CFLAGS) > $(OBJDIR)/c_flags)
 $(shell echo $(OBJS) > $(OBJDIR)/objs)

diff --git a/cinelerra-5.1/guicast/filesystem.h b/cinelerra-5.1/guicast/filesystem.h
index b6cece2deb272b69e0df6e1b1faf1ae0acd74e24..90885554010394fc568c2f37e1087238d855a78e 100644 (file)
--- a/cinelerra-5.1/guicast/filesystem.h
+++ b/cinelerra-5.1/guicast/filesystem.h
@@ -26,7 +26,7 @@
 #include "bcwindowbase.inc"
 #include "sizes.h"
 
-#if defined (__FreeBSD__)
+#if defined (__FreeBSD__) || (__NetBSD__)
 #define dirent64 dirent
 #define readdir64 readdir
 #endif

diff --git a/cinelerra-5.1/plugins/Makefile b/cinelerra-5.1/plugins/Makefile
index 227faf808320d7942163c37623abb90bf5e3b1bb..9c3a6a30d68868ee6120b4324db53fc78d4edae7 100644 (file)
--- a/cinelerra-5.1/plugins/Makefile
+++ b/cinelerra-5.1/plugins/Makefile
@@ -170,9 +170,17 @@ DIRS = $(OPENCV_OBJS) \
        theme_unflat \
        theme_cakewalk \
 
-PLATFORM = $(shell uname -o)
+PLATFORM = $(shell uname)
+ifneq ($(PLATFORM), NetBSD)
+DIRS += cdripper theme_blond theme_blue
+endif
+
 ifneq ($(PLATFORM), FreeBSD)
-DIRS += cdripper theme_blond theme_blue 
+DIRS += theme_blond theme_blue 
+endif
+
+ifeq ($(PLATFORM), Linux)
+DIRS += cdripper
 endif
 
 # not maintained