add mask color radio btn sel, fix del all mask btn, fix mask dflt kfrm draw name...

[goodguy/cinelerra.git] / cinelerra-5.1 / configure.ac

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index 9305fe2c7d367c7f3e26677dc95fc7496f2e71a2..90048a290fa23a145c91eb07be2dfb6cf1988edf 100644 (file)
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -11,7 +11,9 @@ AC_PROG_CXX
 CFG_CFLAGS+=" -fno-omit-frame-pointer -fno-math-errno -fno-signed-zeros"
 CFG_CFLAGS+=" -pthread -Wall"
 # misguided pedantic warnings
+#  this is extra work, not a gain...
 CFG_CFLAGS+=" -Wno-unknown-warning"
+CFG_CFLAGS+=" -Wno-attributes"
 CFG_CFLAGS+=" -Wno-unused-result"
 CFG_CFLAGS+=" -Wno-stringop-overflow"
 CFG_CFLAGS+=" -Wno-format-truncation"
@@ -54,6 +56,8 @@ CHECK_WITH([libzmpeg],[build libzmpeg],[LIBZMPEG],[yes])
 CHECK_WITH([commercial],[enable commercial capture],[COMMERCIAL],[yes])
 CHECK_WITH([thirdparty],[use thirdparty build],[CIN_3RDPARTY],[yes])
 CHECK_WITH([shuttle],[shuttle device],[SHUTTLE],[yes])
+CHECK_WITH([vaapi],[video acceleration api],[VAAPI],[yes])
+CHECK_WITH([vdpau],[video decode+presentation api for unix],[VDPAU],[yes])
 
 if test "x$WANT_LV2" != "xno"; then
   GTK2_LIBS=`pkg-config --libs gtk+-2.0`
@@ -366,37 +370,37 @@ PKG_3RD([x265],[auto],
   [ . source ])
 
 PKG_3RD([libvpx],[auto],
-  [libvpx-1.7.0],
+  [libvpx-1.8.0],
   [ libvpx.a ],
   [ . ])
 
 PKG_3RD([lv2],[auto],
-  [lv2-1.14.0],
+  [lv2-1.16.0],
   [ ],
   [ usr/local/include usr/local/lib64/lv2 usr/local/lib/lv2 ])
 
 PKG_3RD([sratom],[auto],
-  [sratom-0.6.0],
+  [sratom-0.6.2],
   [ usr/local/lib/libsratom-0.a ],
   [ usr/local/include ])
 
 PKG_3RD([serd],[auto],
-  [serd-0.28.0],
+  [serd-0.30.0],
   [ usr/local/lib/libserd-0.a ],
   [ usr/local/include ])
 
 PKG_3RD([sord],[auto],
-  [sord-0.16.0],
+  [sord-0.16.2],
   [ usr/local/lib/libsord-0.a ],
   [ usr/local/include ])
 
 PKG_3RD([lilv],[auto],
-  [lilv-0.24.2],
+  [lilv-0.24.4],
   [ usr/local/lib/liblilv-0.a ],
   [ usr/local/include ])
 
 PKG_3RD([suil],[auto],
-  [suil-0.8.4],
+  [suil-0.10.2],
   [ usr/local/lib/libsuil-0.a ],
   [ usr/local/include ])
 
@@ -492,15 +496,19 @@ if test "x$HAVE_$1" != "xno"; then
  if test "x$PKG_$1" = "x" -o "x$WANT_STATIC_BUILD" = "xno" -a "x$PKG_$1" = "xauto"; then
   AC_CHECK_LIB([$2], [$3], [HAVE_$1=yes], [HAVE_$1=no], [$4])
   AC_SUBST([HAVE_$1])
-  if test "x$HAVE_$1" = "xyes"; then
-   if test "x$PKG_$1" = "x"; then
-    SYSTEM_LIBS+=" -l[$2]"
-    for lib in [$4]; do SYSTEM_LIBS+=" $lib"; done
-   else
-    SHARED_$1+=" -l[$2]"
-    for lib in [$4]; do SHARED_LIBS+=" $lib"; done
+  if test "x$WANT_$1" != "xno"; then
+   if test "x$HAVE_$1" = "xyes"; then
+    if test "x$PKG_$1" = "x"; then
+     SYSTEM_LIBS+=" -l[$2]"
+     for lib in [$4]; do SYSTEM_LIBS+=" $lib"; done
+    else
+     SHARED_$1+=" -l[$2]"
+     for lib in [$4]; do SHARED_LIBS+=" $lib"; done
+    fi
+   elif test "x$PKG_$1" = "x"; then
+    RESULT=no
    fi
-  elif test "x$PKG_$1" = "x"; then RESULT=no; fi
+  fi
  fi
 fi
 ])
@@ -573,7 +581,14 @@ CHECK_HEADERS([encore], [encore headers], [encore.h])
 CHECK_LIB([giflib], [gif], [DGifOpen])
 CHECK_HEADERS([giflib], [gif lib headers], [gif_lib.h])
 CHECK_LIB([jbig], [jbig], [jbg_dec_init])
-CHECK_LIB([vdpau], [vdpau], [vdp_device_create_x11])
+CHECK_LIB([VDPAU], [vdpau], [vdp_device_create_x11])
+CHECK_LIB([VAAPI], [va], [vaInitialize])
+if test "x$WANT_VAAPI" != "xno" -a "x$HAVE_VAAPI" = "xyes"; then
+  CHECK_HEADERS([vaapi_x11], [va x11 headers], [va/va_x11.h])
+  CHECK_LIB([vaapi_x11], [va-x11], [vaGetDisplay])
+  CHECK_HEADERS([vaapi_drm], [va drm headers], [va/va_drm.h])
+  CHECK_LIB([vaapi_drm], [va-drm], [vaGetDisplayDRM])
+fi
 
 #if test "x$HAVE_mjpegtools" = "xyes"; then
 #CFG_CFLAGS+=" -I/usr/include/mjpegtools -I/usr/local/include/mjpegtools"
@@ -646,6 +661,11 @@ CHECK_WANT([ESOUND], [no], [use esd], [
  CHECK_LIB([audiofile], [audiofile], [afOpenFile])
  CHECK_HEADERS([audiofile], [audiofile headers], [audiofile.h])])
 
+CHECK_WANT([SHUTTLE], [yes], [shuttle dev support], [
+ CHECK_HEADERS([keysyms], [x11 keysym defs], [X11/keysymdef.h])])
+if test "x$WANT_SHUTTLE" = "xno"; then
+ WANT_SHUTTLE_USB="no"
+fi
 CHECK_WANT([SHUTTLE_USB], [yes], [use libusb-1.0], [
  CHECK_LIB([libusbx], [usb-1.0], [libusb_init])
  CHECK_HEADERS([libusbx], [libusb headers], [libusb-1.0/libusb.h])])
@@ -862,6 +882,8 @@ echo "  using: with-noelision = $WANT_NOELISION"
 echo "  using: with-booby = $WANT_BOOBY"
 echo "  using: with-libzmpeg = $WANT_LIBZMPEG"
 echo "  using: with-commerical = $WANT_COMMERCIAL"
+echo "  using: with-vaapi = $WANT_VAAPI"
+echo "  using: with-vdpau = $WANT_VDPAU"
 echo ""
 echo "  using: thirdparty build = $WANT_CIN_3RDPARTY"
 echo "  using: single-user  = $WANT_CINBIN_BUILD"
@@ -878,10 +900,35 @@ fi
 if test "x$HAVE_NUMA" = "xyes"; then
   EXTRA_LIBS+=' -lnuma'
 fi
+
+FFMPEG_EXTRA_LDFLAGS=""
+if test "x$WANT_VAAPI" != "xno" -a "x$HAVE_VAAPI" = "xyes"; then
+  FFMPEG_EXTRA_LDFLAGS+=' -lva'
+  EXTRA_LIBS+=' -lva'
+  WANT_VAPPI="yes"
+  CFG_WANTS+=" VAAPI"
+  if test "x$HAVE_vaapi_x11" = "xyes"; then
+    FFMPEG_EXTRA_LDFLAGS+=' -lva-x11'
+    EXTRA_LIBS+=' -lva-x11'
+  fi
+  if test "x$HAVE_vaapi_drm" = "xyes"; then
+    FFMPEG_EXTRA_LDFLAGS+=' -lva-drm'
+    EXTRA_LIBS+=' -lva-drm'
+  fi
+fi
+if test "x$WANT_VDPAU" != "xno" -a "x$HAVE_VDPAU" = "xyes"; then
+  WANT_VDPAU="yes"
+  CFG_WANTS+=" VDPAU"
+fi
+
 if test "x$HAVE_DL" = "xyes"; then
   EXTRA_LIBS+=' -ldl'
-  FFMPEG_EXTRA_CFG+=' --extra-ldflags="-ldl"'
+  FFMPEG_EXTRA_LDFLAGS+=' -ldl'
 fi
+if test "x$FFMPEG_EXTRA_LDFLAGS" != "x"; then
+  FFMPEG_EXTRA_CFG+=' --extra-ldflags="'$FFMPEG_EXTRA_LDFLAGS'"'
+fi
+
 if test "x$WANT_BOOBY" != "xno"; then
   CFG_CFLAGS+=" -DBOOBY"
 fi