X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fconfigure.ac;h=f9d2ab8ab7f73980ea12c9e52a251f71ffd929ec;hb=d51dc1ff2dbd920c6488af4380b8064c9b6a7b4c;hp=33e2fbfb15ee8b6d22aa314a18ae6789780cb337;hpb=89df7e99c74dd6195e08bba8853b69aaacc61ad4;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index 33e2fbfb..f9d2ab8a 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.3.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 ],
   [ . ])
 
@@ -599,7 +599,7 @@ if test "x$HAVE_$1" != "xno"; then
 fi
 ])
 
-IMMATH_HEADERS=$(pkg-config --cflags Imath)
+IMMATH_HEADERS=$(pkg-config --cflags Imath 2>/dev/null)
 
 CHECK_LIB([X11], [X11], [XOpenDisplay])
 CHECK_HEADERS([X11], [X11 headers], [X11/X.h X11/Xlib.h X11/Xutil.h X11/cursorfont.h])
@@ -816,23 +816,23 @@ 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])
  CHECK_LIB([sratom], [sratom-0], [sratom_new])
- CFLAGS="-I/usr/include/lilv-0 -I/usr/local/include/lilv-0 `pkg-config --cflags lilv-0`"
+ CFLAGS="-I/usr/include/lilv-0 -I/usr/local/include/lilv-0 `pkg-config --cflags lilv-0 2>/dev/null`"
  CHECK_HEADERS([lilv], [lilv headers], [lilv/lilv.h])
- CFLAGS="-I/usr/include/serd-0 -I/usr/local/include/serd-0 `pkg-config --cflags serd-0`"
+ CFLAGS="-I/usr/include/serd-0 -I/usr/local/include/serd-0 `pkg-config --cflags serd-0 2>/dev/null`"
  CHECK_HEADERS([serd], [serd headers], [serd/serd.h])
- CFLAGS="-I/usr/include/sord-0 -I/usr/local/include/sord-0 `pkg-config --cflags sord-0`"
+ CFLAGS="-I/usr/include/sord-0 -I/usr/local/include/sord-0 `pkg-config --cflags sord-0 2>/dev/null`"
  CHECK_HEADERS([sord], [sord headers], [sord/sord.h])
- CFLAGS="-I/usr/include/sratom-0 -I/usr/local/include/sratom-0 `pkg-config --cflags sratom-0`"
+ CFLAGS="-I/usr/include/sratom-0 -I/usr/local/include/sratom-0 `pkg-config --cflags sratom-0 2>/dev/null`"
  CHECK_HEADERS([sratom], [sratom headers], [sratom/sratom.h])
  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`"
+ 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
@@ -900,6 +900,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
@@ -1082,6 +1083,7 @@ done
 # build extras
 if test "x$WANT_CLANG" = "xyes" ; then
   FFMPEG_EXTRA_CFG+=' --cc=clang --cxx=clang++'
+  CFG_CFLAGS+=" -Wno-unknown-warning-option"
 fi
 if test "x$HAVE_tiff" = "xyes"; then
   if test "x$HAVE_jbig" = "xyes"; then
@@ -1273,6 +1275,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