X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fconfigure.ac;h=f7415a2bf66c32c3af0a3f0e0c5820de9867a83b;hp=770cc188b14a606c92722115198d025da44e6835;hb=HEAD;hpb=bfc2f6c2bd7676c25a2b5ce9e2bd9b1d791531f5

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index 770cc188..4b72a861 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 \
@@ -323,7 +324,7 @@ PKG_3RD([libogg],[auto],
   [ include ])
 
 PKG_3RD([libsndfile],[auto],
-  [libsndfile-1.0.28],
+  [libsndfile-1.2.2],
   [ src/.libs/libsndfile.a \
     src/.libs/libcommon.a \
     src/G72x/.libs/libg72x.a \
@@ -405,7 +406,7 @@ PKG_3RD([ilmBase],[auto], [ilmBase], [] [])
 #  [])
 #
 PKG_3RD([tiff],[auto],
-  [tiff-4.5.0],
+  [tiff-4.6.0],
   [ libtiff/.libs/libtiff.a \
     libtiff/.libs/libtiffxx.a \
     port/.libs/libport.a ],[
@@ -422,7 +423,7 @@ PKG_3RD([x264],[auto],
   [ . ])
 
 PKG_3RD([x265],[auto],
-  [x265_3.5],
+  [x265_3.517122023],
   [ libx265.a ],
   [ . source ])
 
@@ -462,10 +463,15 @@ PKG_3RD([suil],[auto],
   [ usr/local/include ])
 
 PKG_3RD([libaom],[auto],
-  [libaom-v3.4.0],
+  [libaom-v3.8.0],
   [ usr/local/lib*/libaom*.a ],
   [ usr/local/include ])
 
+PKG_3RD([libsvtav1],[no],
+  [libsvtav1-v1.8.0],
+  [ usr/local/lib*/libSvtAv1Enc.a ],
+  [ usr/local/include/svt-av1 ])
+
 PKG_3RD([dav1d],[auto],
   [dav1d-0.5.1],
   [ usr/local/lib*/libdav1d*.a ],
@@ -900,7 +906,7 @@ EXROStream() : Imf::OStream("mypath") {} };
   if test "x$WANT_STATIC_BUILD" = "xno"; then
     SHARED_openexr="$LIBS"
     SHARED_LIBS+=" $LIBS"
-    CFG_CFLAGS+=" -I/usr/include/OpenEXR -I/usr/local/include/OpenEXR"
+    CFG_CFLAGS+=" -I/usr/local/include/Imath -I/usr/include/OpenEXR -I/usr/local/include/OpenEXR"
     CFG_CFLAGS+=" $(pkg-config --cflags OpenEXR)"
     CFG_CFLAGS+=" $(pkg-config --cflags Imath)"
   fi
@@ -1026,6 +1032,7 @@ PKG_PROVIDE([libuuid])
 PKG_PROVIDE([libvorbis])
 PKG_PROVIDE([mjpegtools])
 PKG_PROVIDE([libaom])
+PKG_PROVIDE([libsvtav1])
 PKG_PROVIDE([dav1d])
 PKG_PROVIDE([libwebp])
 PKG_PROVIDE([openExr], [$WANT_OPENEXR])
@@ -1280,13 +1287,13 @@ 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/ffmpeg6"
 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 += -I/usr/pkg/include/ffmpeg6"
 echo "CFLAGS += $(pkg-config --cflags xft)"
 echo "CFLAGS += -I/usr/pkg/include"
 echo "CFLAGS += -I/usr/pkg/include/uuid"