X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fconfigure.ac;h=576b1eeeb1dc5c051f2a1e4e4516919b47b87a19;hp=a665849d79e317f25a8a6a9770233bb91e679c74;hb=4b6c39e6cf4a3fd9c1b347db6de686ab55d6cac8;hpb=14c59195960203265f308a703e834e7c5f59f6d2 diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index a665849d..576b1eee 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -15,6 +15,7 @@ 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], @@ -32,6 +33,7 @@ CHECK_WITH([cindat],[cinelerra share path],[CINDAT_DIR],[auto]) CHECK_WITH([plugin-dir],[plugin install dir],[PLUGIN_DIR],[auto]) 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]) if test "x$WANT_CINBIN_BUILD" = "xyes"; then WANT_LOCALE_DIR='$$CIN_LIB/locale' @@ -118,24 +120,13 @@ PKG_3RD([esound],[no], .libs/libesddsp.a ], [ . ]) -PKG_3RD([faac],[auto], - [faac-1.28], - [ libfaac/.libs/libfaac.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.1.4], + [ffmpeg-3.3.2], [ libavutil/libavutil.a \ libavcodec/libavcodec.a \ libpostproc/libpostproc.a \ @@ -147,7 +138,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 \ @@ -166,7 +157,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 \ @@ -177,7 +168,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 ]) @@ -191,7 +182,7 @@ PKG_3RD([ilmbase],[auto], IlmThread/.libs/libIlmThread.a ], [ Iex Half Imath config IlmThread ]) -PKG_DEF([ladspa], [ladspa-05182015], [], []) +PKG_DEF([ladspa], [ladspa-0.4.17], [], []) PKG_3RD([lame],[auto], [lame-3.99.5], @@ -207,7 +198,7 @@ PKG_3RD([libavc1394],[auto], [ . ]) PKG_3RD([libraw1394],[auto], - [libraw1394-2.0.5], + [libraw1394-2.1.2], [ src/.libs/libraw1394.a ], [ . ]) @@ -222,13 +213,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 ]) @@ -239,7 +230,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 \ @@ -292,7 +283,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 ],[ @@ -304,17 +295,17 @@ PKG_3RD([twolame],[auto], [ libtwolame ]) PKG_3RD([x264],[auto], - [x264-snapshot-20160220-2245-stable], + [x264-snapshot-20170426-2245], [ libx264.a ], [ . ]) PKG_3RD([x265],[auto], - [x265_2.1], + [x265_2.4], [ libx265.a ], [ . source ]) PKG_3RD([libvpx],[auto], - [libvpx-1.5.0], + [libvpx-1.6.1], [ libvpx.a ], [ . ]) @@ -423,7 +414,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]) @@ -451,14 +442,12 @@ 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]) +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" @@ -595,14 +584,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/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`; needs=`basename $dep` eval pkg_lib="\$PKG_$lib"; eval needs_lib="\$HAVE_$needs"; - if test "x$pkg_lib" != "xno" -a "x$needs_lib" != "xyes" ; then + if test "x$pkg_lib" != "xno"; then eval "PKG_$needs=yes" fi done @@ -628,8 +617,6 @@ 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]) @@ -684,6 +671,7 @@ echo " using: exec-name = $WANT_CIN" echo " using: with-cinlib = $WANT_CINLIB_DIR" echo " using: with-cindat = $WANT_CINDAT_DIR" echo " using: with-config-dir = $WANT_CONFIG_DIR" +echo " using: with-browser = $WANT_CIN_BROWSER" echo " using: with-plugin-dir = $WANT_PLUGIN_DIR" echo " using: with-ladspa-dir = $WANT_LADSPA_DIR" echo "" @@ -693,6 +681,11 @@ echo " using: ladspa-build = $WANT_LADSPA_BUILD" echo "" # build extras +if test "x$HAVE_tiff" = "xyes"; then + if test "x$HAVE_jbig" = "xyes"; then + EXTRA_LIBS+=' -ljbig' + fi +fi if test "x$HAVE_NUMA" = "xyes"; then EXTRA_LIBS+=' -lnuma' fi @@ -705,10 +698,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) @@ -758,6 +747,7 @@ echo "CFLAGS += '-DCONFIG_DIR=\"$WANT_CONFIG_DIR\"'" echo "CFLAGS += '-DPLUGIN_DIR=\"$WANT_PLUGIN_DIR\"'" echo "CFLAGS += '-DLOCALE_DIR=\"$WANT_LOCALE_DIR\"'" echo "CFLAGS += '-DLADSPA_DIR=\"$WANT_LADSPA_DIR\"'" +echo "CFLAGS += '-DCIN_BROWSER=\"$WANT_CIN_BROWSER\"'" for flg in $CFG_CFLAGS; do echo "CFLAGS += $flg"; done echo "" for flg in $CFG_CXXFLAGS; do echo "CXXFLAGS += $flg"; done @@ -767,7 +757,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 @@ -814,3 +804,10 @@ echo "" echo "export thirdparty_libraries libraries" echo "export CFLAGS_ CXXFLAGS_ LDFLAGS_" echo "unexport CFLAGS CXXFLAGS LDFLAGS" + +if test "x$HAVE_tiff" = "xyes"; then + if test "x$HAVE_jbig" != "xyes"; then + echo "tiff.cfg_params+= --disable-jbig" + fi +fi +