X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fconfigure.ac;h=408ed8e73c702c6cb5d078dd701c436030f612be;hp=71799d99a489ea77c82aeecc81506dd64d5de28a;hb=017728ea68874203d45b3f16050626d540608e35;hpb=eb7b1a0bb84ed4f40b651b74ff72e63b97cce1c2

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index 71799d99..408ed8e7 100644
--- 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"
@@ -574,6 +576,13 @@ 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([vaapi], [va], [vaInitialize])
+if test "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 +655,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])])
@@ -878,10 +892,30 @@ fi
 if test "x$HAVE_NUMA" = "xyes"; then
   EXTRA_LIBS+=' -lnuma'
 fi
+
+FFMPEG_EXTRA_LDFLAGS=""
+if test "x$HAVE_vaapi" = "xyes"; then
+  FFMPEG_EXTRA_LDFLAGS+=' -lva'
+  EXTRA_LIBS+=' -lva'
+  WANT_VAAPI='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$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