add libtool prereq, tweak cmake config in 3rdparty, segv dragging silence

diff --git a/cinelerra-5.1/blds/PKGBUILD b/cinelerra-5.1/blds/PKGBUILD
index ac483e8d034d642d9b24a7225b3fa0f3290c66d0..d1b88827ae4f5b0d9c84a32656c20be035ad36e2 100644 (file)
--- a/cinelerra-5.1/blds/PKGBUILD
+++ b/cinelerra-5.1/blds/PKGBUILD
@@ -18,7 +18,7 @@ DEPENDS=( 'alsa-lib' 'atk' 'bzip2' 'cairo' 'expat' 'fftw' 'flac'
  'pango' 'pcre' 'pixman' 'xz' 'zlib' 'xorg-server' 'libva'
  'xorg-fonts-misc' 'ttf-dejavu' 'inkscape' 'dvdauthor' 'udftools' )
 
  'pango' 'pcre' 'pixman' 'xz' 'zlib' 'xorg-server' 'libva'
  'xorg-fonts-misc' 'ttf-dejavu' 'inkscape' 'dvdauthor' 'udftools' )
 

-makedepends=( 'autoconf' 'automake' 'yasm' 'nasm' 'cmake'
+makedepends=( 'autoconf' 'automake' 'yasm' 'nasm' 'cmake' 'libtool'

         'libxml2' 'perl-xml-libxml' 'perl-xml-parser'
         'xorg-mkfontdir' 'xorg-mkfontscale' )
 
         'libxml2' 'perl-xml-libxml' 'perl-xml-parser'
         'xorg-mkfontdir' 'xorg-mkfontscale' )
 

diff --git a/cinelerra-5.1/blds/cinelerra.spec b/cinelerra-5.1/blds/cinelerra.spec
index 0456616651ee4594e7d7465deab5d1ffd2f8d28e..bdbc400a9c4d3fa96ab11a4177604e8bf3769e60 100644 (file)
--- a/cinelerra-5.1/blds/cinelerra.spec
+++ b/cinelerra-5.1/blds/cinelerra.spec
@@ -44,6 +44,7 @@ BuildRequires: libXft-devel
 BuildRequires: libXinerama-devel
 BuildRequires: libXv-devel
 BuildRequires: nasm
 BuildRequires: libXinerama-devel
 BuildRequires: libXv-devel
 BuildRequires: nasm

+BuildRequires: libtool

 BuildRequires: ncurses-devel
 BuildRequires: texinfo
 BuildRequires: udftools
 BuildRequires: ncurses-devel
 BuildRequires: texinfo
 BuildRequires: udftools

diff --git a/cinelerra-5.1/blds/debian/control b/cinelerra-5.1/blds/debian/control
index a82747713773ca31f717b03ebf4db55a643caf91..822e36ee674333447ebb5e75d152313e0f629bb6 100644 (file)
--- a/cinelerra-5.1/blds/debian/control
+++ b/cinelerra-5.1/blds/debian/control
@@ -11,7 +11,7 @@ Build-Depends: nasm, yasm, g++, gdb, build-essential, e2fsprogs,
  libncurses5-dev, libxinerama-dev, libfreetype6-dev, libxft-dev,
  ttf-bitstream-vera, xfonts-75dpi, xfonts-100dpi, fonts-dejavu,
  libflac-dev, inkscape, texinfo, libpng-dev,
  libncurses5-dev, libxinerama-dev, libfreetype6-dev, libxft-dev,
  ttf-bitstream-vera, xfonts-75dpi, xfonts-100dpi, fonts-dejavu,
  libflac-dev, inkscape, texinfo, libpng-dev,

- cmake, udftools, libxml2-utils, git, gettext,
+ cmake, udftools, libxml2-utils, git, gettext, libtool,

  autoconf, automake
 
 Package: cin
  autoconf, automake
 
 Package: cin

diff --git a/cinelerra-5.1/cinelerra/edl.C b/cinelerra-5.1/cinelerra/edl.C
index f7cf1b7cf3aad34259e6a4bba102903452f81505..ddda393dfdc00a43399e7e31bee2af253e3c53d7 100644 (file)
--- a/cinelerra-5.1/cinelerra/edl.C
+++ b/cinelerra-5.1/cinelerra/edl.C
@@ -829,8 +829,8 @@ void EDL::delete_edits(ArrayList<Edit*> *edits, int collapse)
                                edit->startproject -= length;
                }
                delete dead_edit;
                                edit->startproject -= length;
                }
                delete dead_edit;

-               track->edits->optimize();

        }
        }

+       optimize();

 }
 
 class Range {
 }
 
 class Range {

diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile
index 2151f69b12e32e261de80d55aae58d381432b209..2296e4c2ca19b7ddc612c4d0df07e44229c23812 100644 (file)
--- a/cinelerra-5.1/thirdparty/Makefile
+++ b/cinelerra-5.1/thirdparty/Makefile
@@ -154,7 +154,8 @@ ffmpeg.cfg_params= \
                -Wl,--end-group -lm -lstdc++ -pthread \
                $(EXTRA_LIBS)" $(FFMPEG_EXTRA_CFG) \
 
                -Wl,--end-group -lm -lstdc++ -pthread \
                $(EXTRA_LIBS)" $(FFMPEG_EXTRA_CFG) \
 

-cmake_config=echo "exec cmake \$$$$@ $(1)" > ./configure; chmod +x ./configure;
+#cmake_config=echo "exec cmake \$$$$@ $(1)" > ./configure; chmod +x ./configure;
+cmake_config=echo "exec cmake $(1) \$$$$@" > ./configure; chmod +x ./configure;

 a52dec.mak_params?= ; cd $(call bld_path,a52dec,include); ln -sf . a52dec
 a52dec.cfg_vars?= CFLAGS+=" -U__FreeBSD__ $(call inc_path,djbfft)" LIBS+=" $(call ld_path,djbfft)"
 a52dec.cfg_params?=--enable-djbfft
 a52dec.mak_params?= ; cd $(call bld_path,a52dec,include); ln -sf . a52dec
 a52dec.cfg_vars?= CFLAGS+=" -U__FreeBSD__ $(call inc_path,djbfft)" LIBS+=" $(call ld_path,djbfft)"
 a52dec.cfg_params?=--enable-djbfft