From: Good Guy <good1.2guy@gmail.com>
Date: Fri, 18 Nov 2016 23:14:19 +0000 (-0700)
Subject: update cv static thirdparty lib build
X-Git-Url: https://cinelerra-gg.org/git/?a=commitdiff_plain;h=3c944af1216990dd2d963a6b0231f94df0af7947;p=goodguy%2Fhistory.git

update cv static thirdparty lib build
---

diff --git a/cinelerra-5.1/cfg-cv.sh b/cinelerra-5.1/cfg-cv.sh
index 6da79b0f..35b1c7c3 100755
--- a/cinelerra-5.1/cfg-cv.sh
+++ b/cinelerra-5.1/cfg-cv.sh
@@ -1,14 +1,16 @@
 #!/bin/bash -x
 # cd cincv;  cfg_cv.sh /path/cin5
 cin="$1"
+THIRDPARTY=`pwd`/thirdparty
 
 rm -rf thirdparty; cp -a $cin/thirdparty .
 for f in configure.ac Makefile.am autogen.sh; do mv $f $f.cv; cp -a $cin/$f .; done
 mv m4 m4.cv
-mkdir libzmpeg3 db
+rm -rf ./libzmpeg3 ./db
+mkdir libzmpeg3 db db/utils
 
 ./autogen.sh
-./configure --disable-static \
+./configure --disable-static-build --without-ladspa-build \
   --enable-faac=yes --enable-faad2=yes --enable-a52dec=yes \
   --enable-mjpegtools=yes --enable-lame=yes --enable-x264=yes \
   --enable-libogg=auto --enable-libtheora=auto --enable-libvorbis=auto \
@@ -17,7 +19,7 @@ mkdir libzmpeg3 db
   --disable-audiofile --disable-encore --disable-esound --disable-fdk \
   --disable-ffmpeg --disable-fftw --disable-flac --disable-giflib --disable-ilmbase \
   --disable-libavc1394 --disable-libraw1394 --disable-libiec61883 --disable-libvpx \
-  --disable-openjpeg --disable-ladspa --disable-twolame --disable-x265
+  --disable-openjpeg --disable-twolame --disable-x265
 
 export CFG_VARS='CFLAGS+=" -fPIC"'; \
 export MAK_VARS='CFLAGS+=" -fPIC"'; \
@@ -41,7 +43,7 @@ sort -u | while read d; do
  echo -n " -L$d";
 done`
 
-export LIBS=`for f in $static_libs; do
+export LIBS=-lpthread `for f in $static_libs; do
   if [ ! -f "$f" ]; then continue; fi;
   ls $f
 done | sed -e 's;.*/;;' -e 's;lib\(.*\)\.a$;\1;' | \
@@ -68,7 +70,7 @@ export LIBX264_CFLAGS="-I$THIRDPARTY/x264-20151229/."
 export LIBX264_LIBS="-L$THIRDPARTY/x264-20151229/. -lx264"
 
 for f in $MJPEG_LIBS $LIBX264_LIBS; do
-  LIBS=`echo "$LIBS" | sed -e "s/[ ]*\<$f\>[ ]*/ /"`
+  LIBS=`echo "$LIBS" | sed -e "s;[ ]*\<$f\>[ ]*; ;"`
 done
 
 echo LDFLAGS=$LDFLAGS
diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index bdd1abb7..e0301ee8 100644
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -97,7 +97,7 @@ PKG_3RD([a52dec],[yes],
 
 PKG_3RD([djbfft],[yes],
   [djbfft-0.76],
-  [ djbfft.a ],
+  [ libdjbfft.a ],
   [ . ])
 
 PKG_3RD([audiofile],[no],
diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile
index 9a1ceee5..a7e7cd63 100644
--- a/cinelerra-5.1/thirdparty/Makefile
+++ b/cinelerra-5.1/thirdparty/Makefile
@@ -159,7 +159,9 @@ 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
-djbfft.cfg_vars?=echo "$(call bld_path,djbfft)" > conf-home; echo "$(CC) $(CFLAGS)" > conf-cc; echo > ./configure; chmod +x ./configure;
+djbfft.cfg_vars?=echo "$(call bld_path,djbfft)" > conf-home; \
+ (CFLAGS="$(CFLAGS)"; $(CFG_VARS); echo "$(CC) $$$$CFLAGS") > conf-cc; \
+ echo > ./configure; chmod +x ./configure;
 djbfft.mak_params?=; cd $(call bld_path,djbfft); ln -sf djbfft.a libdjbfft.a
 audiofile.cfg_params?=--enable-shared=no
 audiofile.mak_params?=LIBS="-lm -lstdc++"