X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fconfigure.ac;h=4814f8b879ce4151ef7463861f5617632c8f625d;hb=fdf615e4b9eb6ce8faecc7f138c28edf0efac3be;hp=8839af996dfc05fa7aed9d255db0304aac951f90;hpb=663d2357d00791229ff3263c4b121d34c7f67265;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index 8839af99..4814f8b8 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -5,6 +5,7 @@ AC_INIT([cinelerra],[5.1],[mail@lists.cinelerra-gg.org]) # Put autogenerated stuff in subdir m4, which must be created # externally. This macro must be set before calling AC_INIT_AUTOMAKE AC_CONFIG_AUX_DIR(m4) +AC_CONFIG_MACRO_DIRS([m4]) AM_INIT_AUTOMAKE([foreign]) LT_INIT() @@ -222,7 +223,7 @@ PKG_3RD([esound],[no], [ . ]) PKG_3RD([ffmpeg],[yes], - [ffmpeg-5.1], + [ffmpeg-6.1], [ libavutil/libavutil.a \ libavcodec/libavcodec.a \ libpostproc/libpostproc.a \ @@ -255,7 +256,7 @@ PKG_3RD([fftw],[auto], [ api ]) PKG_3RD([flac],[auto], - [flac-1.4.0], + [flac-1.4.2], [ src/libFLAC/.libs/libFLAC.a \ src/libFLAC++/.libs/libFLAC++.a \ src/share/replaygain_analysis/.libs/libreplaygain_analysis.a \ @@ -302,7 +303,7 @@ PKG_3RD([libdv],[auto], [ . ]) PKG_3RD([libjpeg],[auto], - [libjpeg-turbo-2.1.2], + [libjpeg-turbo-2.1.5.1], [ build/libjpeg.a \ build/libturbojpeg.a ], [ opt/libjpeg-turbo/include ]) @@ -405,7 +406,7 @@ PKG_3RD([ilmBase],[auto], [ilmBase], [] []) # []) # PKG_3RD([tiff],[auto], - [tiff-4.4.0], + [tiff-4.6.0], [ libtiff/.libs/libtiff.a \ libtiff/.libs/libtiffxx.a \ port/.libs/libport.a ],[ @@ -417,7 +418,7 @@ PKG_3RD([twolame],[auto], [ libtwolame ]) PKG_3RD([x264],[auto], - [x264-snapshot-20210615-master], + [x264-stable], [ libx264.a ], [ . ]) @@ -427,7 +428,7 @@ PKG_3RD([x265],[auto], [ . source ]) PKG_3RD([libvpx],[auto], - [libvpx-1.12.0], + [libvpx-1.13.1], [ libvpx.a ], [ . ]) @@ -472,9 +473,11 @@ PKG_3RD([dav1d],[auto], [ usr/local/include ]) PKG_3RD([libwebp],[auto], - [libwebp-1.1.0], - [ usr/local/lib*/libwebp*.a ], - [ usr/local/include ]) + [libwebp-1.3.2], + [ usr/local/lib*/libwebp*.a \ + usr/local/lib*/libsharpyuv*.a ], + [ usr/local/include/webp \ + usr/local/include/ ]) PKG_3RD([ffnvcodec],[auto], [ffnvcodec], @@ -900,6 +903,7 @@ EXROStream() : Imf::OStream("mypath") {} }; SHARED_LIBS+=" $LIBS" CFG_CFLAGS+=" -I/usr/include/OpenEXR -I/usr/local/include/OpenEXR" CFG_CFLAGS+=" $(pkg-config --cflags OpenEXR)" + CFG_CFLAGS+=" $(pkg-config --cflags Imath)" fi CFG_CFLAGS+=" $(pkg-config --cflags OpenEXR)" fi