X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fconfigure.ac;h=131116b593c8c4b12f58a36baba5eb49a5c0af3d;hp=72cb4eeb04857afebaa14e6cc7e0d6ccb172fdd8;hb=a19a685a46ddc630010788707d9e5b9d2342af46;hpb=4df355ca6b59270613adae72f34cad54912e9e2e

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index 72cb4eeb..131116b5 100644
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -11,15 +11,21 @@ AC_PROG_CXX
 CFG_CFLAGS+=" -fno-omit-frame-pointer -fno-math-errno -fno-signed-zeros"
 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"
 CFG_CFLAGS+=" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
-CFG_CFLAGS+=" -I/usr/include/freetype2"
+CFG_CFLAGS+=" -I/usr/include -I/usr/local/include"
+CFG_CFLAGS+=" -I/usr/include/freetype2 -I/usr/local/include/freetype2"
+CFG_CFLAGS+=" -I/usr/include/uuid -I/usr/local/include/uuid"
+CFG_CFLAGS+=" -I/usr/include/mjpegtools -I/usr/local/include/mjpegtools"
 
 AC_DEFUN([CHECK_WITH], [
 AC_ARG_WITH([$1],
@@ -33,7 +39,6 @@ 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([lv2ui],[lv2 ui support],[LV2UI],[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])
@@ -42,27 +47,31 @@ 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])
+CHECK_WITH([booby],[window lock trace booby trap],[BOOBY],[no])
+CHECK_WITH([libzmpeg],[build libzmpeg],[LIBZMPEG],[yes])
+CHECK_WITH([commercial],[enable commercial capture],[COMMERCIAL],[yes])
+CHECK_WITH([thirdparty],[use thirdparty build],[CIN_3RDPARTY],[yes])
 
 if test "x$WANT_LV2" != "xno"; then
-  if test "x$WANT_LV2UI" != "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([LV2UI requires gtk+-2.0 support.])
-    fi
+  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_COMMERCIAL" = "xyes" -a "x$WANT_LIBZMPEG" != "xyes" ; then
+  AC_MSG_ERROR([commercial requires libzmpeg support.])
+fi
+
 if test "x$WANT_CINBIN_BUILD" = "xyes"; then
   WANT_LOCALE_DIR='$$CIN_LIB/locale'
   test "x$WANT_CINDAT_DIR" = "xauto" && WANT_CINDAT_DIR='$$CIN_PATH'
   test "x$WANT_CINLIB_DIR" = "xauto" && WANT_CINLIB_DIR='$$CIN_PATH'
   test "x$WANT_PLUGIN_DIR" = "xauto" && WANT_PLUGIN_DIR='$$CIN_LIB/plugins'
   test "x$WANT_LADSPA_DIR" = "xauto" && WANT_LADSPA_DIR='$$CIN_LIB/ladspa'
-  sinstall=dinstall
-  suninstall=duninstall
 else
   lcldir=`test "x$prefix" = "xNONE" && prefix=$ac_default_prefix; \
     test "x$exec_prefix" = "xNONE" && exec_prefix="${prefix}"; \
@@ -85,11 +94,38 @@ else
   test "x$WANT_CINLIB_DIR" = "xauto" && WANT_CINLIB_DIR="$usrlib/$WANT_CIN"
   test "x$WANT_PLUGIN_DIR" = "xauto" && WANT_PLUGIN_DIR="$WANT_CINLIB_DIR/plugins"
   test "x$WANT_LADSPA_DIR" = "xauto" && WANT_LADSPA_DIR="$WANT_CINLIB_DIR/ladspa"
-  sinstall=cinstall
-  suninstall=cuninstall
 fi
-AC_SUBST(sinstall)
-AC_SUBST(suninstall)
+
+CIN_INSTALLS=""
+CIN_UNINSTALLS=""
+if test "x$WANT_LIBZMPEG" = "xyes"; then
+  CIN_INSTALLS+=" zmp_install"
+  CIN_UNINSTALLS+=" zmp_uninstall"
+fi
+if test "x$WANT_COMMERCIAL" = "xyes"; then
+  CIN_INSTALLS+=" com_install"
+  CIN_UNINSTALLS+=" com_uninstall"
+fi
+if test "x$WANT_LADSPA_BUILD" = "xyes"; then
+  CIN_INSTALLS+=" lad_install "
+  CIN_UNINSTALLS+=" lad_uninstall "
+fi
+if test "x$WANT_LV2" = "xyes"; then
+  CIN_INSTALLS+=" lv2_install "
+  CIN_UNINSTALLS+=" lv2_uninstall "
+fi
+AC_SUBST(CIN_INSTALLS)
+AC_SUBST(CIN_UNINSTALLS)
+
+if test "x$WANT_CINBIN_BUILD" = "xyes"; then
+  MAK_INSTALLS="dvl_install"
+  MAK_UNINSTALLS="dvl_uninstall"
+else
+  MAK_INSTALLS=" sys_install"
+  MAK_UNINSTALLS="sys_uninstall"
+fi
+AC_SUBST(MAK_INSTALLS)
+AC_SUBST(MAK_UNINSTALLS)
 
 if test "x$WANT_JOBS" = "xauto"; then
   CPUS=`grep -c "^proc" /proc/cpuinfo`
@@ -140,11 +176,6 @@ PKG_3RD([esound],[no],
     .libs/libesddsp.a ],
   [ . ])
 
-PKG_3RD([fdk],[auto],
-  [fdk-aac-0.1.5],
-  [ .libs/libfdk-aac.a ],
-  [ libAACdec/include libAACenc/include libSYS/include ])
-
 PKG_3RD([ffmpeg],[yes],
   [ffmpeg-4.0],
   [ libavutil/libavutil.a \
@@ -248,7 +279,7 @@ PKG_3RD([opus],[auto],
   [ include ])
 
 PKG_3RD([openjpeg],[auto],
-  [openjpeg-2.1.0-20160221],
+  [openjpeg-2.3.0],
   [ bin/libopenjp2.a ],
   [ src/lib/openjp2 ])
 
@@ -328,7 +359,7 @@ PKG_3RD([x264],[auto],
   [ . ])
 
 PKG_3RD([x265],[auto],
-  [x265_2.7],
+  [x265_2.8],
   [ libx265.a ],
   [ . source ])
 
@@ -377,6 +408,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 10bit], [no])
 
 test "x$WANT_STATIC_BUILD" = "xauto" && WANT_STATIC_BUILD=$WANT_CINBIN_BUILD
 
@@ -515,13 +547,11 @@ CHECK_LIB([encore], [encore], [encore])
 CHECK_HEADERS([encore], [encore headers], [encore.h])
 CHECK_LIB([giflib], [gif], [DGifOpen])
 CHECK_HEADERS([giflib], [gif lib headers], [gif_lib.h])
-CHECK_LIB([fdk], [fdk-aac], [faacDecInit])
-CHECK_HEADERS([fdk], [fdk headers], [fdk-aac/genericStds.h])
 CHECK_LIB([jbig], [jbig], [jbg_dec_init])
 CHECK_LIB([vdpau], [vdpau], [vdp_device_create_x11])
 
 #if test "x$HAVE_mjpegtools" = "xyes"; then
-#CFG_CFLAGS+=" -I/usr/include/mjpegtools"
+#CFG_CFLAGS+=" -I/usr/include/mjpegtools -I/usr/local/include/mjpegtools"
 #fi
 
 AC_DEFUN([CHECK_WANT], [
@@ -588,7 +618,7 @@ CHECK_WANT([ESOUND], [no], [use esd], [
  CHECK_LIB([audiofile], [audiofile], [afOpenFile])
  CHECK_HEADERS([audiofile], [audiofile headers], [audiofile.h])])
 
-CHECK_WANT([LIBOPUS], [auto], [use libopus], [
+CHECK_WANT([OPUS], [auto], [use libopus], [
  CHECK_LIB([opus], [opus], [opus_multistream_decoder_create])
  CHECK_HEADERS([opus], [libopus headers], [opus/opus_multistream.h])])
 
@@ -598,18 +628,11 @@ CHECK_WANT([LV2], [auto], [use lv2], [
  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"
+ CFLAGS="-I/usr/include/lilv-0 -I/usr/local/include/lilv-0"
  CHECK_HEADERS([lv2], [lilv headers], [lilv/lilv.h])
- CFLAGS="$saved_CFLAGS"])
-
-if test "x$WANT_LV2" = "xno"; then
- WANT_LV2UI=no
-fi
-
-CHECK_WANT([LV2UI], [auto], [use lv2ui], [
  CHECK_LIB([suil], [suil-0], [suil_instance_new])
- CFLAGS="-I/usr/include/suil-0"
- CHECK_HEADERS([lv2ui], [suil headers], [suil/suil.h])
+ CFLAGS="-I/usr/include/suil-0 -I/usr/local/include/suil-0"
+ CHECK_HEADERS([lv2], [suil headers], [suil/suil.h])
  CFLAGS="$saved_CFLAGS"])
 
 CHECK_WANT([DL], [auto], [system has libdl], [
@@ -629,7 +652,7 @@ CHECK_WANT([OPENEXR], [auto], [use openexr], [
  saved_CXXFLAGS="$CXXFLAGS"
  # ilmbase libs
  LIBS=" -lIlmImf -lIlmThread -lIex -lpthread"
- CXXFLAGS="-I/usr/include/OpenEXR"
+ CXXFLAGS="-I/usr/include/OpenEXR -I/usr/local/include/OpenEXR"
  AC_LANG_PUSH(C++)
  AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #include "ImfChannelList.h"
@@ -650,7 +673,7 @@ EXROStream() : Imf::OStream("mypath") {} };
  RESULT="$HAVE_OPENEXR"
  if test "x$RESULT" = "xyes"; then
    SHARED_openexr="$LIBS"
-   CFG_CFLAGS+=" -I/usr/include/OpenEXR"
+   CFG_CFLAGS+=" -I/usr/include/OpenEXR -I/usr/local/include/OpenEXR"
  fi
  LIBS="$saved_LIBS"
  CXXFLAGS="$saved_CXXFLAGS"
@@ -678,19 +701,24 @@ AC_DEFUN([PKG_SHARED],[
  SHARED_LIBS+="$SHARED_$1"
  echo "AC_HELP_STRING([shared],[$1])"
 ])
+
 AC_DEFUN([PKG_STATIC],[
- PKG_$1="yes"
- BUILD_$1=1
- AC_SUBST(BUILD_$1)
- STATIC_BLDS+=" [$1]"
- echo "AC_HELP_STRING([$2],[$1])"
+ if test "x$WANT_CIN_3RDPARTY" != "xno"; then
+  PKG_$1="yes"
+  BUILD_$1=1
+  AC_SUBST(BUILD_$1)
+  STATIC_BLDS+=" [$1]"
+  echo "AC_HELP_STRING([$2],[$1])"
+ fi
 ])
+
 AC_DEFUN([PKG_FORCED],[PKG_STATIC([$1],[forced])])
 
+if test "x$WANT_CIN_3RDPARTY" != "xno"; then
 # order matters
 for dep in \
         ffmpeg/twolame ffmpeg/lame ffmpeg/openjpeg \
-        ffmpeg/libvorbis ffmpeg/libtheora ffmpeg/x264 ffmpeg/x265 ffmpeg/fdk \
+        ffmpeg/libvorbis ffmpeg/libtheora ffmpeg/x264 ffmpeg/x265 \
         libiec61883/libraw1394 libavc1394/librom1394 \
         openexr/ilmbase ilmbase/libogg \
         libtheora/libogg libtheora/libvorbis ; do
@@ -700,13 +728,14 @@ for dep in \
     eval "PKG_$needs=yes"
   fi
 done
+fi
 
 AC_DEFUN([PKG_PROVIDE],[
 if test "x$BUILD_$1" = "x" ; then
- if test "x$2" = "xno" -o "x$PKG_$1" = "xno"; then
-  PKG_DISABLED([$1])
- elif test "x$PKG_$1" = "xyes"; then
+ if test "x$PKG_$1" = "xyes"; then
   PKG_FORCED([$1])
+ elif test "x$2" = "xno" -o "x$PKG_$1" = "xno"; then
+  PKG_DISABLED([$1])
  elif test "x$WANT_STATIC_BUILD" = "xyes"; then
   PKG_STATIC([$1],[static])
  elif test "x$HAVE_$1" = "xyes"; then
@@ -722,7 +751,6 @@ PKG_PROVIDE([djbfft])
 PKG_PROVIDE([encore])
 PKG_PROVIDE([audiofile],[$WANT_ESOUND])
 PKG_PROVIDE([esound],[$WANT_ESOUND])
-PKG_PROVIDE([fdk])
 PKG_PROVIDE([ffmpeg])
 PKG_PROVIDE([fftw])
 PKG_PROVIDE([flac])
@@ -754,10 +782,14 @@ PKG_PROVIDE([lilv], [$WANT_LV2])
 PKG_PROVIDE([sratom], [$WANT_LV2])
 PKG_PROVIDE([serd], [$WANT_LV2])
 PKG_PROVIDE([sord], [$WANT_LV2])
-PKG_PROVIDE([suil], [$WANT_LV2UI])
+PKG_PROVIDE([suil], [$WANT_LV2])
 
-test "x$WANT_LV2"   = "xyes" && test "x$BUILD_lilv" = "x0" && CFG_CFLAGS+=' -I/usr/include/lilv-0'
-test "x$WANT_LV2UI" = "xyes" && test "x$BUILD_suil" = "x0" && CFG_CFLAGS+=' -I/usr/include/suil-0'
+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/local/include/lilv-0'
+    CFG_CFLAGS+=' -I/usr/include/suil-0 -I/usr/local/include/suil-0'
+  fi
+fi
 
 AC_SUBST(STATIC_BLDS)
 AC_SUBST(SHARED_LIBS)
@@ -768,8 +800,12 @@ done
 AC_SUBST(SYSTEM_LIBS)
 
 echo ""
+if test "x$WANT_CIN_3RDPARTY" != "xno"; then
+  CFG_CFLAGS+=" -DHAVE_CIN_3RDPARTY"
+fi
 for v in GL XFT XXF86VM OSS ALSA FIREWIRE DV DVB \
-	 VIDEO4LINUX2 ESOUND PACTL OPENEXR LV2 LV2UI; do
+	 VIDEO4LINUX2 ESOUND PACTL OPENEXR LV2 \
+	 COMMERCIAL LIBZMPEG; do
   eval vv="\$WANT_$v"
   if test "x$vv" != "xno"; then
     CFG_CFLAGS+=" -DHAVE_$v"
@@ -792,7 +828,11 @@ 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 "  using: with-booby = $WANT_BOOBY"
+echo "  using: with-libzmpeg = $WANT_LIBZMPEG"
+echo "  using: with-commerical = $WANT_COMMERCIAL"
 echo ""
+echo "  using: thirdparty build = $WANT_CIN_3RDPARTY"
 echo "  using: single-user  = $WANT_CINBIN_BUILD"
 echo "  using: static-build = $WANT_STATIC_BUILD"
 echo "  using: ladspa-build = $WANT_LADSPA_BUILD"
@@ -811,10 +851,15 @@ if test "x$HAVE_DL" = "xyes"; then
   EXTRA_LIBS+=' -ldl'
   FFMPEG_EXTRA_CFG+=' --extra-ldflags="-ldl"'
 fi
-if test "x$HAVE_opus" = "xyes"; then
-  EXTRA_LIBS+=' -lopus'
-  CFG_CFLAGS+=' -I/usr/include/opus'
+if test "x$WANT_OPUS" = "xyes"; then
   FFMPEG_EXTRA_CFG+=' --enable-libopus'
+  if test "x$HAVE_opus" = "xyes" -a "x$BUILD_opus" = "x0"; then
+    EXTRA_LIBS+=' -lopus'
+    CFG_CFLAGS+=' -I/usr/include/opus -I/usr/local/include/opus'
+  fi
+fi
+if test "x$WANT_BOOBY" != "xno"; then
+  CFG_CFLAGS+=" -DBOOBY"
 fi
 
 # intel lock elision bugs
@@ -827,9 +872,11 @@ if test "x$WANT_NOELISION" != "xno"; then
   | tail -1`
 fi
 
+AC_SUBST(WANT_CIN_3RDPARTY)
 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)
@@ -861,6 +908,7 @@ echo "export THIRDPARTY EXTRA_LIBS FFMPEG_EXTRA_CFG"
 echo ""
 
 echo "WANT_CIN := $WANT_CIN"
+CFG_WANTS+=" CIN_3RDPARTY LIBZMPEG COMMERCIAL"
 for w in $CFG_WANTS; do ww=WANT_$w; echo "WANT_$w := ${!ww}"; done
 echo ""
 
@@ -886,9 +934,12 @@ echo ""
 for flg in $CFG_CXXFLAGS; do echo "CXXFLAGS += $flg"; done
 echo ""
 
-if test  $WANT_X264_HIDEPTH = "yes" ; then
+if test "x$WANT_X264_HIDEPTH" = "xyes" ; then
   X264_CFG_PARAMS="$X264_CFG_PARAMS --bit-depth=10"
 fi
+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
   eval pkg_lib="\$PKG_$pkg"
@@ -952,11 +1003,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$HAVE_opus" = "xyes"; then
-echo 'ffmpeg.cflags+=" -I/usr/include/opus"'
+if test "x$WANT_OPUS" = "xyes" -a "x$BUILD_opus" = "x0"; then
+  echo 'ffmpeg.cflags+=" -I/usr/include/opus -I/usr/local/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