From: Good Guy <good1.2guy@gmail.com>
Date: Thu, 7 Feb 2019 01:32:38 +0000 (-0700)
Subject: add libtool prereq, tweak cmake config in 3rdparty, segv dragging silence
X-Git-Tag: 2019-08~110
X-Git-Url: https://cinelerra-gg.org/git/?a=commitdiff_plain;h=c2e0e13ae922580f5eaa0953ade0f0958d1ab179;p=goodguy%2Fcinelerra.git

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 ac483e8d..d1b88827 100644
--- 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' )
 
-makedepends=( 'autoconf' 'automake' 'yasm' 'nasm' 'cmake'
+makedepends=( 'autoconf' 'automake' 'yasm' 'nasm' 'cmake' 'libtool'
 	 '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 04566166..bdbc400a 100644
--- 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: libtool
 BuildRequires: ncurses-devel
 BuildRequires: texinfo
 BuildRequires: udftools
diff --git a/cinelerra-5.1/blds/debian/control b/cinelerra-5.1/blds/debian/control
index a8274771..822e36ee 100644
--- 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,
- cmake, udftools, libxml2-utils, git, gettext,
+ cmake, udftools, libxml2-utils, git, gettext, libtool,
  autoconf, automake
 
 Package: cin
diff --git a/cinelerra-5.1/cinelerra/edl.C b/cinelerra-5.1/cinelerra/edl.C
index f7cf1b7c..ddda393d 100644
--- 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;
-		track->edits->optimize();
 	}
+	optimize();
 }
 
 class Range {
diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile
index 2151f69b..2296e4c2 100644
--- 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) \
 
-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