X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fconfigure.ac;h=84a983d7005266037a13f797932eeba6779d3b93;hb=83fa73bc0a258573fbbe06965f36dde3f8325688;hp=ff203afe27627c00dd1c26aaad10c92417c942ec;hpb=418e8644335db47143bc421f11be2c2e68901d45;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index ff203afe..84a983d7 100644
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -12,7 +12,6 @@ CFG_CFLAGS+=" -fno-omit-frame-pointer -fno-math-errno -fno-signed-zeros"
 CFG_CFLAGS+=" -pthread -Wall"
 # misguided pedantic warnings
 CFG_CFLAGS+=" -Wno-unused-result"
-CFG_CFLAGS+=" -Wno-stringop-truncation"
 CFG_CFLAGS+=" -Wno-stringop-overflow"
 CFG_CFLAGS+=" -Wno-format-truncation"
 CFG_CFLAGS+=" -Wno-format-overflow"
@@ -33,6 +32,7 @@ CHECK_WITH([jobs],[parallel build jobs],[JOBS],[auto])
 CHECK_WITH([exec-name],[binary executable name],[CIN],[cin])
 CHECK_WITH([single-user],[to install cin in bin],[CINBIN_BUILD],[no])
 CHECK_WITH([ladspa-build],[build ladspa library],[LADSPA_BUILD],[yes])
+CHECK_WITH([lv2],[lv2 library support],[LV2],[yes])
 CHECK_WITH([cinlib],[cinelerra library path],[CINLIB_DIR],[auto])
 CHECK_WITH([cindat],[cinelerra share path],[CINDAT_DIR],[auto])
 CHECK_WITH([plugin-dir],[plugin install dir],[PLUGIN_DIR],[auto])
@@ -132,7 +132,7 @@ PKG_3RD([fdk],[auto],
   [ libAACdec/include libAACenc/include libSYS/include ])
 
 PKG_3RD([ffmpeg],[yes],
-  [ffmpeg-3.4.1],
+  [ffmpeg-4.0],
   [ libavutil/libavutil.a \
     libavcodec/libavcodec.a \
     libpostproc/libpostproc.a \
@@ -314,12 +314,12 @@ PKG_3RD([x264],[auto],
   [ . ])
 
 PKG_3RD([x265],[auto],
-  [x265_v2.6],
+  [x265_2.7],
   [ libx265.a ],
   [ . source ])
 
 PKG_3RD([libvpx],[auto],
-  [libvpx-1.6.1],
+  [libvpx-1.7.0],
   [ libvpx.a ],
   [ . ])
 
@@ -333,7 +333,6 @@ AC_ARG_ENABLE([$1],
 
 CHECK_ENABLE([static-build], [STATIC_BUILD], [build static], [auto])
 CHECK_ENABLE([x264_hidepth], [X264_HIDEPTH], [build x264 10bit], [no])
-CHECK_ENABLE([x265_hidepth], [X265_HIDEPTH], [build x265 10/12bit], [no])
 
 test "x$WANT_STATIC_BUILD" = "xauto" && WANT_STATIC_BUILD=$WANT_CINBIN_BUILD
 
@@ -359,6 +358,19 @@ fi
 CHECK_PROG(PACTL, [pactl])
 WANT_PACTL=$PROG_PACTL
 
+# libx264 nasm fix
+AC_MSG_CHECKING([nasm x264 compatible])
+echo "vmovdqa32 [[eax]]{k1}{z}, zmm0" > conftest.asm
+nasm conftest.asm -o conftest.o > /dev/null 2>&1
+if test $? != 0 ; then
+ AC_MSG_RESULT([no])
+ AC_MSG_WARN([libx264 built without assembly code])
+ X264_CFG_PARAMS="$X264_CFG_PARAMS --disable-asm"
+else
+ AC_MSG_RESULT([yes])
+fi
+rm -f conftest.asm conftest.o
+
 AC_CHECK_DECL([X_HAVE_UTF8_STRING],,[no_utf=yes],[#include <X11/Xlib.h>])
 if test "$no_utf" = "yes"; then
   AC_MSG_ERROR([Cinelerra requires utf8 support in X Windows.])
@@ -536,6 +548,16 @@ CHECK_WANT([LIBOPUS], [auto], [use libopus], [
  CHECK_LIB([opus], [opus], [opus_multistream_decoder_create])
  CHECK_HEADERS([opus], [libopus headers], [opus/opus_multistream.h])])
 
+CHECK_WANT([LV2], [auto], [use lv2], [
+ CHECK_LIB([lv2], [lilv-0], [lilv_world_new])
+ CHECK_LIB([sord], [sord-0], [sord_world_new])
+ CHECK_LIB([serd], [serd-0], [serd_reader_new])
+ CHECK_LIB([sratom], [sratom-0], [sratom_new])
+ saved_CFLAGS="$CXXFLAGS"
+ CFLAGS="-I/usr/include/lilv-0"
+ CHECK_HEADERS([lv2], [lilv headers], [lilv/lilv.h])
+ CFLAGS="$saved_CXXFLAGS"])
+
 CHECK_WANT([DL], [auto], [system has libdl], [
  CHECK_LIB([DL], [dl], [dlopen])])
 
@@ -684,7 +706,7 @@ AC_SUBST(SYSTEM_LIBS)
 
 echo ""
 for v in GL XFT XXF86VM OSS ALSA FIREWIRE DV DVB \
-	 VIDEO4LINUX2 ESOUND PACTL OPENEXR; do
+	 VIDEO4LINUX2 ESOUND PACTL OPENEXR LV2; do
   eval vv="\$WANT_$v"
   if test "x$vv" != "xno"; then
     CFG_CFLAGS+=" -DHAVE_$v"
@@ -730,11 +752,13 @@ if test "x$HAVE_opus" = "xyes"; then
   CFG_CFLAGS+=' -I/usr/include/opus'
   FFMPEG_EXTRA_CFG+=' --enable-libopus'
 fi
+if test "x$HAVE_lv2" = "xyes"; then
+  CFG_CFLAGS+=' -I/usr/include/lilv-0'
+fi
 
 AC_SUBST(EXTRA_LIBS)
 AC_SUBST(FFMPEG_EXTRA_CFG)
 AC_SUBST(WANT_X264_HIDEPTH)
-AC_SUBST(WANT_X265_HIDEPTH)
 
 AC_SUBST(CFG_CFLAGS)
 AC_SUBST(CFG_CXXFLAGS)
@@ -792,10 +816,7 @@ for flg in $CFG_CXXFLAGS; do echo "CXXFLAGS += $flg"; done
 echo ""
 
 if test  $WANT_X264_HIDEPTH = "yes" ; then
-  echo "x264.cfg_params := --enable-static --bit-depth=10"
-fi
-if test  $WANT_X265_HIDEPTH = "yes" ; then
-  echo "x265.cfg_params := -DENABLE_SHARED=no -DHIGH_BIT_DEPTH:BOOL=ON" # -DMAIN12:BOOL=ON"
+  X264_CFG_PARAMS="$X264_CFG_PARAMS --bit-depth=10"
 fi
 
 for pkg in $STATIC_PKGS; do
@@ -860,3 +881,6 @@ fi
 if test "x$HAVE_opus" = "xyes"; then
 echo 'ffmpeg.cflags+=" -I/usr/include/opus"'
 fi
+if test "x$X264_CFG_PARAMS" != "x" ; then
+  echo "x264.cfg_params :=$X264_CFG_PARAMS --enable-static --enable-pic"
+fi