bsd patch tweak, shortcut tweak

diff --git a/cinelerra-5.1/blds/bsd.bld b/cinelerra-5.1/blds/bsd.bld
index 4189b16cd4adbcdc448599f3b6faed909f0de9f5..165cc00b88b931b1e9f7189d5f9f451136de890a 100755 (executable)
--- 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 \
     --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
     --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 fa3392322054e2873f81d2b99699cab99558cdc0..ecc6939be7217b4ab93742a8a6747ed3f6f7b0ff 100644 (file)
--- 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
  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
 --- 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))
  $(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
  
  #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
 --- 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
  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
  // 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"
 --- 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
  
    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
  
    echo ""
  fi
  


@@ -179,9 +179,9 @@ index bfb39ed..a9856e5 100644
 +  echo "CFLAGS += -DNO_GDB"
 +fi
  if test "x$CYGWIN" != "x" ; then
 +  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
  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
        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) \
 --- 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 \
        chorus \
        chromakey \
        chromakeyhsv \

-@@ -176,6 +175,8 @@ DIRS = $(OPENCV_OBJS) \
+@@ -177,6 +176,8 @@ DIRS = $(OPENCV_OBJS) \

  #     denoisemjpeg \
  # duplicate
  #     vocoder \
  #     denoisemjpeg \
  # duplicate
  #     vocoder \

diff --git a/cinelerra-5.1/doc/shortcuts.html b/cinelerra-5.1/doc/shortcuts.html
index 29120cd432251d45ae046a13105db4ee1f0b5df5..a4d84feab8cbd2a1a85451f64ea4ad098fb5b5de 100644 (file)
--- a/cinelerra-5.1/doc/shortcuts.html
+++ b/cinelerra-5.1/doc/shortcuts.html
@@ -459,7 +459,7 @@
        <tr>
                <td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
                <td align="left"><font face="Liberation Serif" size=4>Delete last track</font></td>
        <tr>
                <td height="26" align="left"><font face="Liberation Serif" size=4><br></font></td>
                <td align="left"><font face="Liberation Serif" size=4>Delete last track</font></td>

-               <td align="left"><font face="Liberation Serif" size=4>'d'</font></td>
+               <td align="left"><font face="Liberation Serif" size=4>'Ctrl-Shift-D'</font></td>

                <td align="left"><font face="Liberation Serif" size=4>Delete last track</font></td>
        </tr>
        <tr>
                <td align="left"><font face="Liberation Serif" size=4>Delete last track</font></td>
        </tr>
        <tr>