X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcfg-cv.sh;h=35b1c7c36c4c325842489164ae03b470006eee67;hb=77815ec03df6a03ed75433e8cf8ae1e83fb76d6e;hp=0d2b5aea92a05de2f7fa3676e0040400c10acc9f;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cfg-cv.sh b/cinelerra-5.1/cfg-cv.sh
index 0d2b5aea..35b1c7c3 100755
--- a/cinelerra-5.1/cfg-cv.sh
+++ b/cinelerra-5.1/cfg-cv.sh
@@ -1,19 +1,39 @@
 #!/bin/bash -x
+# cd cincv;  cfg_cv.sh /path/cin5
+cin="$1"
+THIRDPARTY=`pwd`/thirdparty
 
-TOPDIR=`pwd`
-THIRDPARTY=$TOPDIR/thirdparty
-echo "TOPDIR=$TOPDIR" > global_config
-echo "THIRDPARTY=$TOPDIR/thirdparty" >> global_config
+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
+rm -rf ./libzmpeg3 ./db
+mkdir libzmpeg3 db db/utils
 
-cpus=`grep -c "^proc" /proc/cpuinfo`
-( cd $THIRDPARTY; ./configure cv; \
-  export CFG_VARS='CFLAGS+=" -fPIC"'; \
-  export MAK_VARS='CFLAGS+=" -fPIC"'; \
-  export CFG_PARAMS="--with-pic --enable-pic --disable-asm"; \
-  make -j$cpus >& log )
+./autogen.sh
+./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 \
+  --enable-openexr=auto --enable-libsndfile=auto --enable-libdv=auto \
+  --enable-libjpeg=auto --enable-tiff=auto --enable-x264=auto \
+  --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-twolame --disable-x265
 
-static_libs=`make -C $THIRDPARTY -s val-static_libraries`
-static_includes=`make -C $THIRDPARTY -s val-static_includes`
+export CFG_VARS='CFLAGS+=" -fPIC"'; \
+export MAK_VARS='CFLAGS+=" -fPIC"'; \
+export CFG_PARAMS="--with-pic --enable-pic --disable-asm"; \
+
+jobs=`make -s -C thirdparty val-WANT_JOBS`
+make -C thirdparty -j$jobs
+
+static_libs=`make -C thirdparty -s val-static_libs`
+static_incs=`make -C thirdparty -s val-static_incs`
+
+./autogen.sh clean
+for f in configure.ac Makefile.am autogen.sh; do rm -f $f; mv $f.cv $f; done
+mv m4.cv m4
 
 export LDFLAGS=`for f in $static_libs; do
   if [ ! -f "$f" ]; then continue; fi;
@@ -23,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;' | \
@@ -31,12 +51,10 @@ sort -u | while read a; do
  echo -n " -l$a";
 done`
 
-export CFLAGS="$static_includes"
-export CXXFLAGS="$static_includes"
+export CFLAGS="$static_incs"
+export CXXFLAGS="$static_incs"
 
-if [ ! -f configure ]; then
-  ./autogen.sh
-fi
+if [ ! -f configure ]; then ./autogen.sh; fi
 sed -e 's/^LIBX264_LIBS=""/#LIBX264_LIBS=""/' -i configure
 
 export MJPEG_LIBS="-L$THIRDPARTY/mjpegtools-2.1.0/utils/.libs -lmjpegutils \
@@ -52,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
@@ -61,3 +79,9 @@ echo CFLAGS=$CFLAGS
 
 ./configure
 
+#make -j$jobs >& log
+#make install DESTDIR=`pwd` >> log 2>&1
+#export LD_LIBRARY_PATH=`pwd`/usr/local/lib
+#cd cinelerra
+#gdb ./.libs/cinelerra
+