From: Good Guy Date: Mon, 16 May 2022 22:40:52 +0000 (-0600) Subject: a few more bsd building mods from Andrew X-Git-Tag: 2022-05~4 X-Git-Url: https://git.cinelerra-gg.org/git/?a=commitdiff_plain;h=a7c2a5fffa5bde1d4ae1d1ec381a0764c934741f;p=goodguy%2Fcinelerra.git a few more bsd building mods from Andrew --- diff --git a/cinelerra-5.1/blds/bsd.bld b/cinelerra-5.1/blds/bsd.bld index b6ec27b3..3a6c024c 100755 --- a/cinelerra-5.1/blds/bsd.bld +++ b/cinelerra-5.1/blds/bsd.bld @@ -9,11 +9,11 @@ alias make=gmake ( ./autogen.sh BSD=1 CC=clang CXX=clang++ CFLAGS="-g -O2 " \ ./configure --with-single-user \ - --disable-static-build --without-lv2 --disable-lame --disable-twolame \ + --disable-static-build --without-libzmpeg --disable-lame --disable-twolame \ --with-oss --without-alsa --without-firewire --without-dv --without-dvb \ --without-video4linux2 --without-xxf86vm --without-ladspa-build \ - --without-libzmpeg --without-commercial --without-thirdparty \ - --without-vaapi --without-vdpau --without-shuttle --without-shuttle-usb \ + --without-commercial --without-thirdparty \ + --without-shuttle --without-libdpx --without-shuttle-usb \ --without-x10tv --with-jobs=4 --without-wintv gmake gmake install ) 2>&1 | tee log diff --git a/cinelerra-5.1/cinelerra/commercials.h b/cinelerra-5.1/cinelerra/commercials.h index 443cf6c7..9fc8df5d 100644 --- a/cinelerra-5.1/cinelerra/commercials.h +++ b/cinelerra-5.1/cinelerra/commercials.h @@ -1,4 +1,5 @@ #if defined(__i386__) || defined(__x86_64__) +#if defined (__linux__) #ifndef _COMMERCIALS_H_ #define _COMMERCIALS_H_ @@ -203,4 +204,5 @@ public: #endif +#endif // linux #endif /* x86 */ \ No newline at end of file diff --git a/cinelerra-5.1/cinelerra/dbwindow.h b/cinelerra-5.1/cinelerra/dbwindow.h index 103beb6d..aadbfb07 100644 --- a/cinelerra-5.1/cinelerra/dbwindow.h +++ b/cinelerra-5.1/cinelerra/dbwindow.h @@ -1,4 +1,5 @@ #if defined(__i386__) || defined(__x86_64__) +#if defined (__linux__) #ifndef _DBWINDOW_H_ #define _DBWINDOW_H_ @@ -297,4 +298,5 @@ public: #endif +#endif // linux #endif /* x86 */ \ No newline at end of file diff --git a/cinelerra-5.1/cinelerra/mediadb.h b/cinelerra-5.1/cinelerra/mediadb.h index f55cc6b0..3b816c4e 100644 --- a/cinelerra-5.1/cinelerra/mediadb.h +++ b/cinelerra-5.1/cinelerra/mediadb.h @@ -1,4 +1,5 @@ #if defined(__i386__) || defined(__x86_64__) +#if defined (__linux__) #ifndef _MEDIA_DB_H_ #define _MEDIA_DB_H_ @@ -240,4 +241,5 @@ public: }; #endif +#endif // linux #endif /* x86 */ \ No newline at end of file diff --git a/cinelerra-5.1/db/tdb.h b/cinelerra-5.1/db/tdb.h index 24c8617c..b746b640 100644 --- a/cinelerra-5.1/db/tdb.h +++ b/cinelerra-5.1/db/tdb.h @@ -1,4 +1,5 @@ #if defined(__i386__) || defined(__x86_64__) +#if defined (__linux__) #ifndef __DB_H__ #define __DB_H__ #include @@ -1515,4 +1516,5 @@ public: }; #endif +#endif // linux #endif /* x86 */ \ No newline at end of file diff --git a/cinelerra-5.1/plugins/Makefile b/cinelerra-5.1/plugins/Makefile index e6718432..227faf80 100644 --- a/cinelerra-5.1/plugins/Makefile +++ b/cinelerra-5.1/plugins/Makefile @@ -160,9 +160,7 @@ DIRS = $(OPENCV_OBJS) \ yuvshift \ zoom \ zoomblur \ - theme_blond \ theme_blond_cv \ - theme_blue \ theme_blue_dot \ theme_bright \ theme_hulk \ @@ -174,7 +172,7 @@ DIRS = $(OPENCV_OBJS) \ PLATFORM = $(shell uname -o) ifneq ($(PLATFORM), FreeBSD) -DIRS += cdripper +DIRS += cdripper theme_blond theme_blue endif # not maintained