X-Git-Url: https://cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fconfigure.ac;h=f8d57a73d2cf4b45d11b62c00d293ed17e8cfca5;hb=655e4a5fa6c49b294b2bc3c0ca9421bcdabb733f;hp=f7415a2bf66c32c3af0a3f0e0c5820de9867a83b;hpb=cacd63e5b194d48bb0daa93fdf96a609a44e196c;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index f7415a2b..f8d57a73 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -255,7 +255,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 +302,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 +405,7 @@ PKG_3RD([ilmBase],[auto], [ilmBase], [] []) # []) # PKG_3RD([tiff],[auto], - [tiff-4.4.0], + [tiff-4.5.0], [ libtiff/.libs/libtiff.a \ libtiff/.libs/libtiffxx.a \ port/.libs/libport.a ],[ @@ -417,7 +417,7 @@ PKG_3RD([twolame],[auto], [ libtwolame ]) PKG_3RD([x264],[auto], - [x264-snapshot-20210615-master], + [x264-stable], [ libx264.a ], [ . ]) @@ -427,7 +427,7 @@ PKG_3RD([x265],[auto], [ . source ]) PKG_3RD([libvpx],[auto], - [libvpx-1.12.0], + [libvpx-1.13.0], [ libvpx.a ], [ . ]) @@ -472,9 +472,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 +902,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 @@ -1274,6 +1277,22 @@ if test "x$BSD" != "x" ; then echo "CFLAGS += -DNO_GDB" fi +if test [ "$(uname)"] = "NetBSD" ; then +echo "CFLAGS += -DNO_BTRACE" +echo "CFLAGS += -DNO_CTX" +echo "system_libs += -L/usr/pkg/lib/ffmpeg4" +echo "system_libs += -L/usr/pkg/lib/" +echo "system_libs += -lpng16" +echo "system_libs += -lintl" +echo "system_libs += -lossaudio" +echo "CFLAGS += -I/usr/X11R7/include" +echo "CFLAGS += -I/usr/pkg/include/ffmpeg4" +echo "CFLAGS += $(pkg-config --cflags xft)" +echo "CFLAGS += -I/usr/pkg/include" +echo "CFLAGS += -I/usr/pkg/include/uuid" + +fi + if test "x$WANT_X264_HIDEPTH" = "xyes" ; then X264_CFG_PARAMS="$X264_CFG_PARAMS --bit-depth=10" fi