From 663d2357d00791229ff3263c4b121d34c7f67265 Mon Sep 17 00:00:00 2001 From: Good Guy Date: Thu, 26 Jan 2023 16:22:05 -0700 Subject: [PATCH] Credit Andrew with NetBSD build fixes --- cinelerra-5.1/blds/netbsd.bld | 2 +- cinelerra-5.1/cinelerra/Makefile | 5 ++++- cinelerra-5.1/cinelerra/bdcreate.C | 9 +++++++++ cinelerra-5.1/cinelerra/dvdcreate.C | 9 +++++++++ cinelerra-5.1/cinelerra/exportedl.C | 2 +- cinelerra-5.1/configure.ac | 16 ++++++++++++++++ cinelerra-5.1/guicast/Makefile | 2 +- cinelerra-5.1/guicast/filesystem.h | 2 +- cinelerra-5.1/plugins/Makefile | 12 ++++++++++-- 9 files changed, 52 insertions(+), 7 deletions(-) diff --git a/cinelerra-5.1/blds/netbsd.bld b/cinelerra-5.1/blds/netbsd.bld index b6c5f96b..5d961ee9 100644 --- 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 e293d3dd..5c358569 100644 --- 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 16c655a5..cc6b40b7 100644 --- a/cinelerra-5.1/cinelerra/bdcreate.C +++ b/cinelerra-5.1/cinelerra/bdcreate.C @@ -26,12 +26,21 @@ #include #if !defined(__FreeBSD__) #include +#if !defined(__NetBSD__) #include +#endif #else #include #include #endif +#if defined(__NetBSD__) +#include +#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 175ef547..72259b27 100644 --- a/cinelerra-5.1/cinelerra/dvdcreate.C +++ b/cinelerra-5.1/cinelerra/dvdcreate.C @@ -26,12 +26,21 @@ #include #if !defined(__FreeBSD__) #include +#if !defined(__NetBSD__) #include +#endif #else #include #include #endif +#if defined(__NetBSD__) +#include +#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 108c2ad6..69174635 100644 --- 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 #endif #include diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index f7415a2b..8839af99 100644 --- 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 04d5a2e5..32ef3582 100644 --- 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 b6cece2d..90885554 100644 --- 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 227faf80..9c3a6a30 100644 --- 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 -- 2.26.2