X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fconfigure.ac;h=1d00a4357f8fb4b7a21502572c9b0e8d05716fc7;hp=1329c96ce93854f819a510841a0f0749c3a6f683;hb=HEAD;hpb=929899524176aab570798f0708bad7f29a13ee5c

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index 1329c96c..984019e8 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 ])
@@ -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 \
@@ -357,7 +358,7 @@ X86=[`expr "x$ARCH" : 'x..._64*'`]
 if test "x$I86$X86" != "x00" ; then
 
 PKG_3RD([mjpegtools],[yes],
-  [mjpegtools-2.1.0],
+  [mjpegtools-2.2.1],
   [ utils/mmxsse/.libs/libmmxsse.a \
     utils/.libs/libmjpegutils.a \
     lavtools/.libs/liblavfile.a \
@@ -370,7 +371,7 @@ PKG_3RD([mjpegtools],[yes],
 else
 
 PKG_3RD([mjpegtools],[yes],
-  [mjpegtools-2.1.0],
+  [mjpegtools-2.2.1],
   [ utils/.libs/libmjpegutils.a \
     lavtools/.libs/liblavfile.a \
     lavtools/.libs/liblavjpeg.a \
@@ -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,17 +418,17 @@ PKG_3RD([twolame],[auto],
   [  libtwolame ])
 
 PKG_3RD([x264],[auto],
-  [x264-snapshot-20210615-master],
+  [x264-stable],
   [ libx264.a ],
   [ . ])
 
 PKG_3RD([x265],[auto],
-  [x265_3.5],
+  [x265_3.517122023],
   [ libx265.a ],
   [ . source ])
 
 PKG_3RD([libvpx],[auto],
-  [libvpx-1.12.0],
+  [libvpx-1.13.1],
   [ libvpx.a ],
   [ . ])
 
@@ -462,19 +463,26 @@ 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 ],
   [ 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],
@@ -816,7 +824,7 @@ CHECK_WANT([LV2], [auto], [use lv2], [
  AC_MSG_CHECKING([for lv2 availability])
  saved_LIBS="$LIBS"
  saved_CFLAGS="$CFLAGS"
- LIBS=" $(pkg-config --libs lilv-0)"
+ LIBS=" $(pkg-config --libs lilv-0 2>/dev/null)"
  CHECK_LIB([lilv], [lilv-0], [lilv_world_new])
  CHECK_LIB([sord], [sord-0], [sord_world_new])
  CHECK_LIB([serd], [serd-0], [serd_reader_new])
@@ -832,7 +840,7 @@ CHECK_WANT([LV2], [auto], [use lv2], [
  CHECK_LIB([suil], [suil-0], [suil_instance_new])
  CFLAGS="-I/usr/include/suil-0 -I/usr/local/include/suil-0 `pkg-config --cflags  suil-0 2>/dev/null`"
  CHECK_HEADERS([suil], [suil headers], [suil/suil.h])
- CFG_CFLAGS+=" $(pkg-config --cflags lilv-0) $(pkg-config --cflags suil-0)"
+ CFG_CFLAGS+=" $(pkg-config --cflags lilv-0 2>/dev/null) $(pkg-config --cflags suil-0 2>/dev/null)"
  LIBS="$saved_LIBS"
  CFLAGS="$saved_CFLAGS"])
 # have all or none
@@ -898,8 +906,9 @@ 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
   CFG_CFLAGS+=" $(pkg-config --cflags OpenEXR)"
  fi
@@ -1023,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])
@@ -1274,6 +1284,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/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/ffmpeg6"
+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