X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fconfigure.ac;h=da5aadec94318d8275513c2902f7714e361be8fb;hb=51fdff4109828a112ac1006a92bdbdd1ba9b18a5;hp=e55a1b6cb241b4c498db70f9e51639203bb16b87;hpb=0d49253b107e67067b6143958fee3f8e4c0e0b6c;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index e55a1b6c..da5aadec 100644
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -13,7 +13,9 @@ CFG_CFLAGS+=" -pthread -Wall -Wno-unused-result"
 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/OpenEXR"
 
 AC_DEFUN([CHECK_WITH], [
 AC_ARG_WITH([$1],
@@ -94,6 +96,11 @@ PKG_3RD([a52dec],[yes],
   [ liba52/.libs/liba52.a ],
   [ include ])
 
+PKG_3RD([djbfft],[yes],
+  [djbfft-0.76],
+  [ libdjbfft.a ],
+  [ . ])
+
 PKG_3RD([audiofile],[no],
   [audiofile-0.3.6],
   [ libaudiofile/.libs/libaudiofile.a \
@@ -112,25 +119,13 @@ PKG_3RD([esound],[no],
     .libs/libesddsp.a ],
   [ . ])
 
-PKG_3RD([faac],[auto],
-  [faac-1.28],
-  [ libfaac/.libs/libfaac.a \
-    common/mp4v2/libmp4v2.a ],
-  [ include ])
-
-PKG_3RD([faad2],[auto],
-  [faad2-2.7],
-  [ libfaad/.libs/libfaad.a \
-    common/mp4ff/libmp4ff.a ],
-  [ include ])
-
 PKG_3RD([fdk],[auto],
-  [fdk-aac-0.1.4],
+  [fdk-aac-0.1.5],
   [ .libs/libfdk-aac.a ],
   [ libAACdec/include libAACenc/include libSYS/include ])
 
 PKG_3RD([ffmpeg],[yes],
-  [ffmpeg-3.0],
+  [ffmpeg-3.3],
   [ libavutil/libavutil.a \
     libavcodec/libavcodec.a \
     libpostproc/libpostproc.a \
@@ -142,7 +137,7 @@ PKG_3RD([ffmpeg],[yes],
   [ . ])
 
 PKG_3RD([fftw],[auto],
-  [fftw-3.3.4],
+  [fftw-3.3.6-pl2],
   [ .libs/libfftw3.a \
     libbench2/libbench2.a \
     rdft/scalar/r2cb/.libs/librdft_scalar_r2cb.a \
@@ -161,7 +156,7 @@ PKG_3RD([fftw],[auto],
   [ api ])
 
 PKG_3RD([flac],[auto],
-  [flac-1.3.1],
+  [flac-1.3.2],
   [ src/libFLAC/.libs/libFLAC.a \
     src/libFLAC++/.libs/libFLAC++.a \
     src/share/replaygain_analysis/.libs/libreplaygain_analysis.a \
@@ -172,7 +167,7 @@ PKG_3RD([flac],[auto],
   [ include ])
 
 PKG_3RD([giflib],[yes],
-  [giflib-5.1.2],
+  [giflib-5.1.4],
   [ lib/.libs/libgif.a \
     util/libgetarg.a ],
   [ lib ])
@@ -202,7 +197,7 @@ PKG_3RD([libavc1394],[auto],
   [ . ])
 
 PKG_3RD([libraw1394],[auto],
-  [libraw1394-2.0.5],
+  [libraw1394-2.1.2],
   [ src/.libs/libraw1394.a ],
   [ . ])
 
@@ -217,13 +212,13 @@ PKG_3RD([libdv],[auto],
   [ . ])
 
 PKG_3RD([libjpeg],[auto],
-  [libjpeg-turbo-1.4.0],
+  [libjpeg-turbo-1.5.1],
   [ .libs/libjpeg.a \
     .libs/libturbojpeg.a \
     simd/.libs/libsimd.a ],
   [ . ])
 
-PKG_3RD([openjpeg],[yes],
+PKG_3RD([openjpeg],[auto],
   [openjpeg-2.1.0-20160221],
   [ bin/libopenjp2.a ],
   [ src/lib/openjp2 ])
@@ -234,7 +229,7 @@ PKG_3RD([libogg],[auto],
   [ include ])
 
 PKG_3RD([libsndfile],[auto],
-  [libsndfile-1.0.26],
+  [libsndfile-1.0.28],
   [ src/.libs/libsndfile.a \
     src/.libs/libcommon.a \
     src/G72x/.libs/libg72x.a \
@@ -287,7 +282,7 @@ PKG_3RD([openexr],[auto],
 #  [])
 #
 PKG_3RD([tiff],[auto],
-  [tiff-3.8.2],
+  [tiff-4.0.6],
   [ libtiff/.libs/libtiff.a \
     libtiff/.libs/libtiffxx.a \
     port/.libs/libport.a ],[
@@ -298,18 +293,18 @@ PKG_3RD([twolame],[auto],
   [ libtwolame/.libs/libtwolame.a ],
   [  libtwolame ])
 
-PKG_3RD([x264],[yes],
-  [x264-snapshot-20160220-2245-stable],
+PKG_3RD([x264],[auto],
+  [x264-snapshot-20170416-2245-stable],
   [ libx264.a ],
   [ . ])
 
-PKG_3RD([x265],[yes],
-  [x265_1.9],
+PKG_3RD([x265],[auto],
+  [x265_2.3],
   [ libx265.a ],
   [ . source ])
 
 PKG_3RD([libvpx],[auto],
-  [libvpx-1.5.0],
+  [libvpx-1.6.1],
   [ libvpx.a ],
   [ . ])
 
@@ -347,6 +342,7 @@ if test "x$FATAL_ERROR" != "x"; then
  AC_MSG_ERROR("fatal eror.")
 fi
 CHECK_PROG(PACTL, [pactl])
+WANT_PACTL=$PROG_PACTL
 
 AC_CHECK_DECL([X_HAVE_UTF8_STRING],,[no_utf=yes],[#include <X11/Xlib.h>])
 if test "$no_utf" = "yes"; then
@@ -417,7 +413,7 @@ CHECK_LIB([libjpeg], [jpeg], [jpeg_start_decompress])
 CHECK_HEADERS([libjpeg], [jpeg headers], [stdio.h jpeglib.h])
 CHECK_LIB([libogg], [ogg], [ogg_stream_init])
 CHECK_HEADERS([libogg], [ogg headers], [ogg/ogg.h])
-CHECK_LIB([openjpeg], [openjpeg], [opj_version])
+CHECK_LIB([openjpeg], [openjp2], [opj_version])
 CHECK_HEADERS([openjpeg], [openjpeg headers], [openjpeg.h])
 CHECK_LIB([libsndfile], [sndfile], [sf_open])
 CHECK_HEADERS([libsndfile], [sndfile headers], [sndfile.h])
@@ -431,6 +427,8 @@ CHECK_LIB([libvorbis], [vorbisfile], [ov_open])
 CHECK_HEADERS([libvorbis], [vorbis file headers], [vorbis/vorbisfile.h])
 CHECK_LIB([libvpx], [vpx], [vpx_codec_decode])
 CHECK_HEADERS([libvpx], [vpx headers], [vpx/vpx_decoder.h])
+CHECK_LIB([mjpegtools], [mjpegutils], [mjpeg_info])
+CHECK_HEADERS([mjpegtools], [mjpegtools headers], [mjpegtools/mjpeg_types.h])
 CHECK_LIB([tiff], [tiff], [TIFFOpen])
 CHECK_HEADERS([tiff], [tiff headers], [tiff.h tiffio.h])
 CHECK_LIB([twolame], [twolame], [twolame_encode_buffer_float32_interleaved])
@@ -443,15 +441,14 @@ CHECK_LIB([a52dec], [a52], [a52_init])
 CHECK_HEADERS([a52dec], [a52 headers], [a52.h])
 CHECK_LIB([encore], [encore], [encore])
 CHECK_HEADERS([encore], [encore headers], [encore.h])
-CHECK_LIB([faac], [faac], [faacEncOpen])
-CHECK_HEADERS([faac], [faac headers], [faac.h])
-CHECK_LIB([faad2], [faad], [faacDecInit])
-CHECK_HEADERS([faad2], [faad headers], [faad.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])
 
+#if test "x$HAVE_mjpegtools" = "xyes"; then
+#CFG_CFLAGS+=" -I/usr/include/mjpegtools"
+#fi
 
 AC_DEFUN([CHECK_WANT], [
 RESULT=yes
@@ -584,15 +581,14 @@ AC_DEFUN([PKG_FORCED],[PKG_STATIC([$1],[forced])])
 
 # order matters
 for dep in \
-        ffmpeg/faac ffmpeg/faad2 ffmpeg/twolame ffmpeg/lame ffmpeg/openjpeg \
-        ffmpeg/libvorbis ffmpeg/libtheora ffmpeg/x264 ffmpeg/fdk \
+        ffmpeg/twolame ffmpeg/lame ffmpeg/openjpeg \
+        ffmpeg/libvorbis ffmpeg/libtheora ffmpeg/x264 ffmpeg/x265 ffmpeg/fdk \
         libiec61883/libraw1394 libavc1394/librom1394 \
         openexr/ilmbase ilmbase/libogg \
         libtheora/libogg libtheora/libvorbis ; do
-  lib=`dirname $dep`
-  eval pkg_lib="\$PKG_$lib"; eval have_lib="\$HAVE_$lib";
-  if test "x$pkg_lib" != "xno" ; then
-    needs=`basename $dep`
+  lib=`dirname $dep`;  needs=`basename $dep`
+  eval pkg_lib="\$PKG_$lib"; eval needs_lib="\$HAVE_$needs";
+  if test "x$pkg_lib" != "xno"; then
     eval "PKG_$needs=yes"
   fi
 done
@@ -614,11 +610,10 @@ fi
 ])
 
 PKG_PROVIDE([a52dec])
+PKG_PROVIDE([djbfft])
 PKG_PROVIDE([encore])
 PKG_PROVIDE([audiofile],[$WANT_ESOUND])
 PKG_PROVIDE([esound],[$WANT_ESOUND])
-PKG_PROVIDE([faac])
-PKG_PROVIDE([faad2])
 PKG_PROVIDE([fdk])
 PKG_PROVIDE([ffmpeg])
 PKG_PROVIDE([fftw])
@@ -656,7 +651,7 @@ AC_SUBST(SYSTEM_LIBS)
 
 echo ""
 for v in GL XFT XXF86VM OSS ALSA FIREWIRE DV DVB \
-	 VIDEO4LINUX2 ESOUND; do
+	 VIDEO4LINUX2 ESOUND PACTL; do
   eval vv="\$WANT_$v"
   if test "x$vv" != "xno"; then
     CFG_CFLAGS+=" -DHAVE_$v"
@@ -694,10 +689,6 @@ AC_SUBST(FFMPEG_EXTRA_CFG)
 AC_SUBST(WANT_X264_HIDEPTH)
 AC_SUBST(WANT_X265_HIDEPTH)
 
-if test "x$BUILD_openexr" = "x0"; then
-  CFG_CFLAGS+=" -I/usr/include/OpenEXR"
-fi
-
 AC_SUBST(CFG_CFLAGS)
 AC_SUBST(CFG_CXXFLAGS)
 
@@ -756,7 +747,7 @@ 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"
+  echo "x265.cfg_params := -DENABLE_SHARED=no -DHIGH_BIT_DEPTH:BOOL=ON" # -DMAIN12:BOOL=ON"
 fi
 
 for pkg in $STATIC_PKGS; do echo "static_pkgs += $pkg"; done