projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mask tweaks, focus follows centroid, gradient/colorpicker rework, no hard edges in...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
configure.ac
diff --git
a/cinelerra-5.1/configure.ac
b/cinelerra-5.1/configure.ac
index 408ed8e73c702c6cb5d078dd701c436030f612be..9bb63424ad8631480ed385b4420bf6909ed203f3 100644
(file)
--- a/
cinelerra-5.1/configure.ac
+++ b/
cinelerra-5.1/configure.ac
@@
-56,6
+56,10
@@
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([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])
+CHECK_WITH([nv],[nvenc/nvdec ffnvcodec api],[NV],[yes])
+CHECK_WITH([cuda],[nv cuda plugins],[CUDA],[auto])
if test "x$WANT_LV2" != "xno"; then
GTK2_LIBS=`pkg-config --libs gtk+-2.0`
if test "x$WANT_LV2" != "xno"; then
GTK2_LIBS=`pkg-config --libs gtk+-2.0`
@@
-412,6
+416,11
@@
PKG_3RD([libwebp],[auto],
[ usr/local/lib*/libwebp*.a ],
[ usr/local/include ])
[ usr/local/lib*/libwebp*.a ],
[ usr/local/include ])
+PKG_3RD([ffnvcodec],[auto],
+ [ffnvcodec],
+ [ ],
+ [ . ])
+
AC_SUBST(STATIC_PKGS)
AC_DEFUN([CHECK_ENABLE], [
AC_SUBST(STATIC_PKGS)
AC_DEFUN([CHECK_ENABLE], [
@@
-494,15
+503,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$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
fi
-
elif test "x$PKG_$1" = "x"; then RESULT=no;
fi
+ fi
fi
fi
])
fi
fi
])
@@
-575,14
+588,15
@@
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([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_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
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
+#CHECK_LIB([NVENC], [nvidia-encode], [NvEncodeAPICreateInstance])
#if test "x$HAVE_mjpegtools" = "xyes"; then
#CFG_CFLAGS+=" -I/usr/include/mjpegtools -I/usr/local/include/mjpegtools"
#if test "x$HAVE_mjpegtools" = "xyes"; then
#CFG_CFLAGS+=" -I/usr/include/mjpegtools -I/usr/local/include/mjpegtools"
@@
-600,7
+614,6
@@
AC_ARG_WITH(m4_tolower([$1]),
if test "x$WANT_$1" = "xyes" ; then
AC_MSG_ERROR([required for $1 support.])
fi
if test "x$WANT_$1" = "xyes" ; then
AC_MSG_ERROR([required for $1 support.])
fi
- echo "=== want $1 Failed."
WANT_$1=no
elif test "x$WANT_$1" = "xauto" ; then
WANT_$1=yes
WANT_$1=no
elif test "x$WANT_$1" = "xauto" ; then
WANT_$1=yes
@@
-677,6
+690,9
@@
CHECK_WANT([LV2], [auto], [use lv2], [
CHECK_HEADERS([lv2], [suil headers], [suil/suil.h])
CFLAGS="$saved_CFLAGS"])
CHECK_HEADERS([lv2], [suil headers], [suil/suil.h])
CFLAGS="$saved_CFLAGS"])
+CHECK_WANT([CUDA], [auto], [build cuda plugins], [
+ CHECK_HEADERS([CUDA], [cuda sdk], [${CUDA_PATH:-/usr/local/cuda}/include/cuda.h])])
+
CHECK_WANT([DL], [auto], [system has libdl], [
CHECK_LIB([DL], [dl], [dlopen])])
CHECK_WANT([DL], [auto], [system has libdl], [
CHECK_LIB([DL], [dl], [dlopen])])
@@
-826,6
+842,7
@@
PKG_PROVIDE([sratom], [$WANT_LV2])
PKG_PROVIDE([serd], [$WANT_LV2])
PKG_PROVIDE([sord], [$WANT_LV2])
PKG_PROVIDE([suil], [$WANT_LV2])
PKG_PROVIDE([serd], [$WANT_LV2])
PKG_PROVIDE([sord], [$WANT_LV2])
PKG_PROVIDE([suil], [$WANT_LV2])
+PKG_PROVIDE([ffnvcodec], [$WANT_NV])
if test "x$WANT_LV2" = "xyes"; then
if test "x$HAVE_lv2" = "xyes" -a "x$BUILD_lilv" = "x0"; then
if test "x$WANT_LV2" = "xyes"; then
if test "x$HAVE_lv2" = "xyes" -a "x$BUILD_lilv" = "x0"; then
@@
-850,7
+867,8
@@
if test "x$WANT_CIN_3RDPARTY" != "xno"; then
fi
for v in GL XFT XXF86VM OSS ALSA FIREWIRE DV DVB \
VIDEO4LINUX2 ESOUND PACTL OPENEXR LV2 \
fi
for v in GL XFT XXF86VM OSS ALSA FIREWIRE DV DVB \
VIDEO4LINUX2 ESOUND PACTL OPENEXR LV2 \
- COMMERCIAL LIBZMPEG SHUTTLE SHUTTLE_USB; do
+ COMMERCIAL LIBZMPEG SHUTTLE SHUTTLE_USB \
+ VAAPI VDPAU CUDA NV; do
eval vv="\$WANT_$v"
if test "x$vv" != "xno"; then
CFG_CFLAGS+=" -DHAVE_$v"
eval vv="\$WANT_$v"
if test "x$vv" != "xno"; then
CFG_CFLAGS+=" -DHAVE_$v"
@@
-876,6
+894,10
@@
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-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 " using: with-nv = $WANT_NV"
+echo " using: with-cuda = $WANT_CUDA"
echo ""
echo " using: thirdparty build = $WANT_CIN_3RDPARTY"
echo " using: single-user = $WANT_CINBIN_BUILD"
echo ""
echo " using: thirdparty build = $WANT_CIN_3RDPARTY"
echo " using: single-user = $WANT_CINBIN_BUILD"
@@
-894,10
+916,10
@@
if test "x$HAVE_NUMA" = "xyes"; then
fi
FFMPEG_EXTRA_LDFLAGS=""
fi
FFMPEG_EXTRA_LDFLAGS=""
-if test "x$
HAVE_vaapi
" = "xyes"; then
+if test "x$
WANT_VAAPI" != "xno" -a "x$HAVE_VAAPI
" = "xyes"; then
FFMPEG_EXTRA_LDFLAGS+=' -lva'
EXTRA_LIBS+=' -lva'
FFMPEG_EXTRA_LDFLAGS+=' -lva'
EXTRA_LIBS+=' -lva'
- WANT_VA
API='yes'
+ WANT_VA
PPI="yes"
CFG_WANTS+=" VAAPI"
if test "x$HAVE_vaapi_x11" = "xyes"; then
FFMPEG_EXTRA_LDFLAGS+=' -lva-x11'
CFG_WANTS+=" VAAPI"
if test "x$HAVE_vaapi_x11" = "xyes"; then
FFMPEG_EXTRA_LDFLAGS+=' -lva-x11'
@@
-908,6
+930,15
@@
if test "x$HAVE_vaapi" = "xyes"; then
EXTRA_LIBS+=' -lva-drm'
fi
fi
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$WANT_NV" != "xno"; then
+ WANT_NV="yes"
+ CFG_WANTS+=" NV"
+fi
+
if test "x$HAVE_DL" = "xyes"; then
EXTRA_LIBS+=' -ldl'
FFMPEG_EXTRA_LDFLAGS+=' -ldl'
if test "x$HAVE_DL" = "xyes"; then
EXTRA_LIBS+=' -ldl'
FFMPEG_EXTRA_LDFLAGS+=' -ldl'