From: Good Guy Date: Sun, 1 Mar 2020 17:03:09 +0000 (-0700) Subject: bsd patch tweak, shortcut tweak X-Git-Tag: 2020-03~22 X-Git-Url: https://cinelerra-gg.org/git/?a=commitdiff_plain;h=807576fd9fa76b3dbc3704f0c40d5b7da6222236;p=goodguy%2Fcinelerra.git bsd patch tweak, shortcut tweak --- diff --git a/cinelerra-5.1/blds/bsd.bld b/cinelerra-5.1/blds/bsd.bld index 4189b16c..165cc00b 100755 --- a/cinelerra-5.1/blds/bsd.bld +++ b/cinelerra-5.1/blds/bsd.bld @@ -13,7 +13,7 @@ alias make=gmake --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-vaapi --without-vdpau --without-shuttle --without-shuttle-usb \ --without-x10tv --without-wintv gmake gmake install ) 2>&1 | tee log diff --git a/cinelerra-5.1/blds/bsd.patch b/cinelerra-5.1/blds/bsd.patch index fa339232..ecc6939b 100644 --- a/cinelerra-5.1/blds/bsd.patch +++ b/cinelerra-5.1/blds/bsd.patch @@ -12,10 +12,10 @@ index 5531330..ad671f5 100644 MAKEJ := $(MAKE) $(jobs) diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile -index f8e5fd8..d26ba05 100644 +index f4e536b..9b76136 100644 --- a/cinelerra-5.1/cinelerra/Makefile +++ b/cinelerra-5.1/cinelerra/Makefile -@@ -510,7 +510,7 @@ all: $(OUTPUT) $(CUTADS) $(BDWRITE) $(LV2UI) +@@ -512,7 +512,7 @@ all: $(OUTPUT) $(CUTADS) $(BDWRITE) $(LV2UI) $(OUTPUT): $(OBJS) $(THEME_DATA) $(DCRAW) $(LIBRARIES) $(LINKER) `cat $(OBJDIR)/objs` $(if $(findstring -g,$(CFLAGS)),objcopy --only-keep-debug $(OUTPUT) $(OUTPUT_G)) @@ -107,10 +107,10 @@ index f4587fc..dd0c883 100644 #define DVD_PAL_4x3 0 diff --git a/cinelerra-5.1/cinelerra/file.C b/cinelerra-5.1/cinelerra/file.C -index 1fec188..c9180a0 100644 +index f9571c9..d1197c3 100644 --- a/cinelerra-5.1/cinelerra/file.C +++ b/cinelerra-5.1/cinelerra/file.C -@@ -1545,7 +1545,10 @@ int File::record_fd() +@@ -1589,7 +1589,10 @@ int File::record_fd() void File::get_exe_path(char *result, char *bnp) { // Get executable path, basename @@ -138,7 +138,7 @@ index 87b8853..ad75d24 100644 // check for isofs volume_id for dvd/cdrom diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac -index bfb39ed..a9856e5 100644 +index ee75006..071d8e7 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -18,8 +18,18 @@ CFG_CFLAGS+=" -Wno-unused-result" @@ -169,7 +169,7 @@ index bfb39ed..a9856e5 100644 WANT_JOBS=`expr $CPUS + $CPUS / 2 + 2` fi -@@ -1091,6 +1101,11 @@ if test "x$CFG_LDFLAGS" != "x" ; then +@@ -1132,6 +1142,11 @@ if test "x$CFG_LDFLAGS" != "x" ; then echo "" fi @@ -179,9 +179,9 @@ index bfb39ed..a9856e5 100644 + echo "CFLAGS += -DNO_GDB" +fi if test "x$CYGWIN" != "x" ; then - echo 'FF_DIR ?= /usr/local' - echo 'CFLAGS += -I$(FF_DIR)/include' -@@ -1106,11 +1121,6 @@ if test "x$CYGWIN" != "x" ; then + echo 'FF_PATH ?= /usr/local' + echo 'LDFLAGS += -L$(FF_PATH)/lib' +@@ -1147,11 +1162,6 @@ if test "x$CYGWIN" != "x" ; then else LDFLAGS+=" -z noexecstack" fi @@ -492,7 +492,7 @@ index 50b52a4..321ab4f 100644 thread->finished = true; if( !thread->synchronous ) { diff --git a/cinelerra-5.1/plugins/Makefile b/cinelerra-5.1/plugins/Makefile -index 22bc7dd..3459bd0 100644 +index e63682d..072653b 100644 --- a/cinelerra-5.1/plugins/Makefile +++ b/cinelerra-5.1/plugins/Makefile @@ -36,7 +36,6 @@ DIRS = $(OPENCV_OBJS) \ @@ -503,7 +503,7 @@ index 22bc7dd..3459bd0 100644 chorus \ chromakey \ chromakeyhsv \ -@@ -176,6 +175,8 @@ DIRS = $(OPENCV_OBJS) \ +@@ -177,6 +176,8 @@ DIRS = $(OPENCV_OBJS) \ # denoisemjpeg \ # duplicate # vocoder \ diff --git a/cinelerra-5.1/doc/shortcuts.html b/cinelerra-5.1/doc/shortcuts.html index 29120cd4..a4d84fea 100644 --- a/cinelerra-5.1/doc/shortcuts.html +++ b/cinelerra-5.1/doc/shortcuts.html @@ -459,7 +459,7 @@
Delete last track - 'd' + 'Ctrl-Shift-D' Delete last track