X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fconfigure.ac;h=d3a03d4b0f0c4cd3925a7b494e2d8c3f8b9e3029;hb=1baa507d5e5bff7918b9b579f018fd74636797fe;hp=9d54bc7dab7e7b9b26d68a6884312ba3839dd51c;hpb=4fedf98530b3a6ff1ada6d2b9fbbc470e3df300c;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index 9d54bc7d..d3a03d4b 100644
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -9,7 +9,15 @@ AC_LANG_C
 AC_PROG_CXX
 
 CFG_CFLAGS+=" -fno-omit-frame-pointer -fno-math-errno -fno-signed-zeros"
-CFG_CFLAGS+=" -pthread -Wall -Wno-unused-result -Wno-format-truncation"
+CFG_CFLAGS+=" -pthread -Wall"
+# misguided pedantic warnings
+CFG_CFLAGS+=" -Wno-unknown-warning"
+CFG_CFLAGS+=" -Wno-unused-result"
+CFG_CFLAGS+=" -Wno-stringop-overflow"
+CFG_CFLAGS+=" -Wno-format-truncation"
+CFG_CFLAGS+=" -Wno-format-overflow"
+CFG_CFLAGS+=" -Wno-parentheses"
+CFG_CFLAGS+=" -Wno-stringop-truncation"
 CFG_CFLAGS+=" -D__STDC_CONSTANT_MACROS"
 CFG_CFLAGS+=" -D__STDC_LIMIT_MACROS"
 CFG_CFLAGS+=" -DPNG_SKIP_SETJMP_CHECK=1"
@@ -27,6 +35,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])
@@ -34,6 +43,17 @@ CHECK_WITH([ladspa-dir],[ladspa install dir],[LADSPA_DIR],[auto])
 CHECK_WITH([config-dir],[.bcast config dir],[CONFIG_DIR],[$$HOME/.bcast5])
 CHECK_WITH([browser],[cin_browser path],[CIN_BROWSER],[firefox])
 CHECK_WITH([git-ffmpeg],[git ffmpeg using url],[GIT_FFMPEG],[no])
+CHECK_WITH([noelision],[use noelision/libpthread],[NOELISION],[auto])
+
+if test "x$WANT_LV2" != "xno"; then
+  GTK2_LIBS=`pkg-config --libs gtk+-2.0`
+  AC_CHECK_LIB([m], [gtk_init], [HAVE_gtk=yes], [HAVE_gtk=no], [$GTK2_LIBS])
+  test "x$HAVE_gtk" != "xno" && test -z "`pkg-config --cflags gtk+-2.0`" && HAVE_gtk=no
+  test "x$HAVE_gtk" != "xno" && test -z "`pkg-config --libs gtk+-2.0`" && HAVE_gtk=no
+  if test "x$HAVE_gtk" = "xno"; then
+    AC_MSG_ERROR([LV2 requires gtk+-2.0 support.])
+  fi
+fi
 
 if test "x$WANT_CINBIN_BUILD" = "xyes"; then
   WANT_LOCALE_DIR='$$CIN_LIB/locale'
@@ -126,7 +146,7 @@ PKG_3RD([fdk],[auto],
   [ libAACdec/include libAACenc/include libSYS/include ])
 
 PKG_3RD([ffmpeg],[yes],
-  [ffmpeg-3.3.4],
+  [ffmpeg-4.0],
   [ libavutil/libavutil.a \
     libavcodec/libavcodec.a \
     libpostproc/libpostproc.a \
@@ -142,7 +162,7 @@ if test "x$WANT_GIT_FFMPEG" != "xno" ; then
 fi
 
 PKG_3RD([fftw],[auto],
-  [fftw-3.3.6-pl2],
+  [fftw-3.3.7],
   [ .libs/libfftw3.a \
     libbench2/libbench2.a \
     rdft/scalar/r2cb/.libs/librdft_scalar_r2cb.a \
@@ -156,8 +176,7 @@ PKG_3RD([fftw],[auto],
     dft/scalar/.libs/libdft_scalar.a \
     dft/.libs/libdft.a \
     kernel/.libs/libkernel.a \
-    simd-support/.libs/libsimd_support.a \
-    simd-support/.libs/libsimd_sse2_nonportable.a ],
+    simd-support/.libs/libsimd_support.a ],
   [ api ])
 
 PKG_3RD([flac],[auto],
@@ -178,7 +197,7 @@ PKG_3RD([giflib],[yes],
   [ lib ])
 
 PKG_3RD([ilmbase],[auto],
-  [ilmbase-2.2.0],
+  [ilmbase-2.2.1],
   [ Iex/.libs/libIex.a \
     IexMath/.libs/libIexMath.a \
     Half/.libs/libHalf.a \
@@ -189,7 +208,7 @@ PKG_3RD([ilmbase],[auto],
 PKG_DEF([ladspa], [ladspa-0.4.17], [], [])
 
 PKG_3RD([lame],[auto],
-  [lame-3.99.5],
+  [lame-3.100],
   [ libmp3lame/.libs/libmp3lame.a \
     mpglib/.libs/libmpgdecoder.a ],
   [ include ])
@@ -223,8 +242,13 @@ PKG_3RD([libjpeg],[auto],
     simd/.libs/libsimd.a ],
   [ . ])
 
+PKG_3RD([opus],[auto],
+  [opus-1.2.1],
+  [ .libs/libopus.a ],
+  [ include ])
+
 PKG_3RD([openjpeg],[auto],
-  [openjpeg-2.1.0-20160221],
+  [openjpeg-2.3.0],
   [ bin/libopenjp2.a ],
   [ src/lib/openjp2 ])
 
@@ -272,7 +296,7 @@ PKG_3RD([mjpegtools],[yes],
   [ .  lavtools utils ])
 
 PKG_3RD([openexr],[auto],
-  [openexr-2.2.0],
+  [openexr-2.2.1],
   [ IlmImf/.libs/libIlmImf.a \
     IlmImfUtil/.libs/libIlmImfUtil.a ],
   [ IlmImf config ])
@@ -287,7 +311,7 @@ PKG_3RD([openexr],[auto],
 #  [])
 #
 PKG_3RD([tiff],[auto],
-  [tiff-4.0.6],
+  [tiff-4.0.9],
   [ libtiff/.libs/libtiff.a \
     libtiff/.libs/libtiffxx.a \
     port/.libs/libport.a ],[
@@ -299,20 +323,50 @@ PKG_3RD([twolame],[auto],
   [  libtwolame ])
 
 PKG_3RD([x264],[auto],
-  [x264-snapshot-20170426-2245],
+  [x264-snapshot-20180118-2245],
   [ libx264.a ],
   [ . ])
 
 PKG_3RD([x265],[auto],
-  [x265_2.5],
+  [x265_2.8],
   [ libx265.a ],
   [ . source ])
 
 PKG_3RD([libvpx],[auto],
-  [libvpx-1.6.1],
+  [libvpx-1.7.0],
   [ libvpx.a ],
   [ . ])
 
+PKG_3RD([lv2],[auto],
+  [lv2-1.14.0],
+  [ ],
+  [ usr/local/include usr/local/lib64/lv2 usr/local/lib/lv2 ])
+
+PKG_3RD([sratom],[auto],
+  [sratom-0.6.0],
+  [ usr/local/lib/libsratom-0.a ],
+  [ usr/local/include ])
+
+PKG_3RD([serd],[auto],
+  [serd-0.28.0],
+  [ usr/local/lib/libserd-0.a ],
+  [ usr/local/include ])
+
+PKG_3RD([sord],[auto],
+  [sord-0.16.0],
+  [ usr/local/lib/libsord-0.a ],
+  [ usr/local/include ])
+
+PKG_3RD([lilv],[auto],
+  [lilv-0.24.2],
+  [ usr/local/lib/liblilv-0.a ],
+  [ usr/local/include ])
+
+PKG_3RD([suil],[auto],
+  [suil-0.8.4],
+  [ usr/local/lib/libsuil-0.a ],
+  [ usr/local/include ])
+
 AC_SUBST(STATIC_PKGS)
 
 AC_DEFUN([CHECK_ENABLE], [
@@ -323,7 +377,7 @@ 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])
+CHECK_ENABLE([x265_hidepth], [X265_HIDEPTH], [build x265 10bit], [no])
 
 test "x$WANT_STATIC_BUILD" = "xauto" && WANT_STATIC_BUILD=$WANT_CINBIN_BUILD
 
@@ -349,6 +403,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.])
@@ -397,6 +464,7 @@ CHECK_LIB([XINERAMA], [Xinerama], [XineramaQueryExtension])
 CHECK_HEADERS([XINERAMA], [Xinerama headers], [X11/extensions/Xinerama.h])
 CHECK_LIB([XV], [Xv], [XvQueryExtension])
 CHECK_HEADERS([XV], [Xlib Xv extention], [X11/Xlib.h X11/extensions/Xvlib.h])
+CHECK_LIB([XFIXES], [Xfixes], [XFixesQueryVersion])
 CHECK_LIB([BZ2], [bz2], [BZ2_bzDecompress])
 CHECK_LIB([FONTCONFIG], [fontconfig], [FcInit])
 CHECK_LIB([FREETYPE], [freetype], [FT_Init_FreeType])
@@ -459,11 +527,11 @@ CHECK_LIB([vdpau], [vdpau], [vdp_device_create_x11])
 
 AC_DEFUN([CHECK_WANT], [
 RESULT=yes
+# WANT_$1
+if test "x$WANT_$1" != "xyes" -a "x$WANT_$1" != "xno" ; then
 AC_ARG_WITH(m4_tolower([$1]),
  AC_HELP_STRING([m4_join([-],[--with],m4_tolower([$1]))], [$3] (auto)),
   [WANT_$1=$withval],[WANT_$1=$2])
-# WANT_$1
-if test "x$WANT_$1" != "xno" ; then
  m4_quote($4)
  if test "x$RESULT" = "xno" -a "x$PKG_$1" = "x"; then
   echo "=== want $1 Failed."
@@ -521,12 +589,29 @@ CHECK_WANT([ESOUND], [no], [use esd], [
  CHECK_LIB([audiofile], [audiofile], [afOpenFile])
  CHECK_HEADERS([audiofile], [audiofile headers], [audiofile.h])])
 
+CHECK_WANT([OPUS], [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], [
+ saved_CFLAGS="$CFLAGS"
+ CHECK_LIB([lilv], [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])
+ CFLAGS="-I/usr/include/lilv-0"
+ CHECK_HEADERS([lv2], [lilv headers], [lilv/lilv.h])
+ CHECK_LIB([suil], [suil-0], [suil_instance_new])
+ CFLAGS="-I/usr/include/suil-0"
+ CHECK_HEADERS([lv2], [suil headers], [suil/suil.h])
+ CFLAGS="$saved_CFLAGS"])
+
 CHECK_WANT([DL], [auto], [system has libdl], [
  CHECK_LIB([DL], [dl], [dlopen])])
 
 CHECK_WANT([EXR], [auto], [use exr], [])
+
 CHECK_WANT([OPENCV], [no], [opencv=sys/sta/dyn,git/tar=url], [
- WANT_OPENCV="$withval"
 ])
 
 CHECK_WANT([NUMA], [auto], [system has libnuma], [
@@ -537,7 +622,7 @@ CHECK_WANT([OPENEXR], [auto], [use openexr], [
  saved_LIBS="$LIBS"
  saved_CXXFLAGS="$CXXFLAGS"
  # ilmbase libs
- LIBS=" -lIlmImf -lIlmThread -lIex"
+ LIBS=" -lIlmImf -lIlmThread -lIex -lpthread"
  CXXFLAGS="-I/usr/include/OpenEXR"
  AC_LANG_PUSH(C++)
  AC_LINK_IFELSE([AC_LANG_PROGRAM([[
@@ -657,6 +742,19 @@ PKG_PROVIDE([twolame])
 PKG_PROVIDE([x264])
 PKG_PROVIDE([x265])
 PKG_PROVIDE([libvpx])
+PKG_PROVIDE([opus], [$WANT_OPUS])
+PKG_PROVIDE([lv2], [$WANT_LV2])
+PKG_PROVIDE([lilv], [$WANT_LV2])
+PKG_PROVIDE([sratom], [$WANT_LV2])
+PKG_PROVIDE([serd], [$WANT_LV2])
+PKG_PROVIDE([sord], [$WANT_LV2])
+PKG_PROVIDE([suil], [$WANT_LV2])
+
+if test "x$WANT_LV2" = "xyes"; then
+  if test "x$HAVE_lv2" = "xyes" -a "x$BUILD_lilv" = "x0"; then
+    CFG_CFLAGS+=' -I/usr/include/lilv-0 -I/usr/include/suil-0'
+  fi
+fi
 
 AC_SUBST(STATIC_BLDS)
 AC_SUBST(SHARED_LIBS)
@@ -668,7 +766,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"
@@ -690,6 +788,7 @@ echo "  using: with-plugin-dir = $WANT_PLUGIN_DIR"
 echo "  using: with-ladspa-dir = $WANT_LADSPA_DIR"
 echo "  using: with-opencv = $WANT_OPENCV"
 echo "  using: with-git-ffmpeg = $WANT_GIT_FFMPEG"
+echo "  using: with-noelision = $WANT_NOELISION"
 echo ""
 echo "  using: single-user  = $WANT_CINBIN_BUILD"
 echo "  using: static-build = $WANT_STATIC_BUILD"
@@ -709,6 +808,24 @@ if test "x$HAVE_DL" = "xyes"; then
   EXTRA_LIBS+=' -ldl'
   FFMPEG_EXTRA_CFG+=' --extra-ldflags="-ldl"'
 fi
+if test "x$WANT_OPUS" = "xyes"; then
+  FFMPEG_EXTRA_CFG+=' --enable-libopus'
+  if "x$HAVE_OPUS" = "xyes" -a "x$BUILD_opus" = "x0"; then
+    EXTRA_LIBS+=' -lopus'
+    CFG_CFLAGS+=' -I/usr/include/opus'
+  fi
+fi
+
+# intel lock elision bugs
+if test "x$WANT_NOELISION" != "xno"; then
+  CFG_RPATH=`ls -1fd 2> /dev/null \
+ /usr/lib/noelision \
+ /lib/noelision \
+ /usr/lib64/noelision \
+ /lib64/noelision \
+  | tail -1`
+fi
+
 AC_SUBST(EXTRA_LIBS)
 AC_SUBST(FFMPEG_EXTRA_CFG)
 AC_SUBST(WANT_X264_HIDEPTH)
@@ -769,11 +886,11 @@ echo ""
 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"
+if test "x$WANT_X264_HIDEPTH" = "xyes" ; then
+  X264_CFG_PARAMS="$X264_CFG_PARAMS --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"
+if test "x$WANT_X265_HIDEPTH" = "xyes" ; then
+  X265_CFG_PARAMS="$X265_CFG_PARAMS -DHIGH_BIT_DEPTH:BOOL=ON" # -DMAIN12:BOOL=ON"
 fi
 
 for pkg in $STATIC_PKGS; do
@@ -812,6 +929,11 @@ echo "export static_pkgs static_blds shared_libs system_libs"
 echo ""
 
 echo "thirdparty_libraries := \$(static_libs) \$(shared_libs)"
+
+if test "x$CFG_RPATH" != "x"; then
+  echo "libraries+= -Wl,-rpath=$CFG_RPATH"
+fi
+
 echo "libraries += -Wl,--start-group"
 echo "libraries += \$(thirdparty_libraries)"
 echo "libraries += \$(system_libs)"
@@ -833,5 +955,14 @@ if test "x$HAVE_tiff" = "xyes"; then
 fi
 
 if test "x$WANT_GIT_FFMPEG" != "xno"; then
-echo "ffmpeg.git := $WANT_GIT_FFMPEG"
+  echo "ffmpeg.git := $WANT_GIT_FFMPEG"
+fi
+if test "x$WANT_OPUS" = "xyes" -a "x$BUILD_opus" = "x0"; 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
+if test "x$X265_CFG_PARAMS" != "x" ; then
+  echo "x265.cfg_params :=$X265_CFG_PARAMS -DENABLE_SHARED=no"
 fi