diff options
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/summary.m4 | 2 | ||||
| -rw-r--r-- | m4/video_out.m4 | 18 |
2 files changed, 19 insertions, 1 deletions
diff --git a/m4/summary.m4 b/m4/summary.m4 index 27ca0f645..d405f136c 100644 --- a/m4/summary.m4 +++ b/m4/summary.m4 @@ -78,6 +78,7 @@ AC_DEFUN([XINE_LIB_SUMMARY], [ test x"$have_imagemagick" = x"yes" && echo " - image" test x"$have_theora" = x"yes" && echo " - theora" test x"$have_w32dll" = x"yes" && echo " - w32dll" + test x$"have_vdpau" = x"yes" && echo " - vdpau" if test x"$with_external_ffmpeg" != x"no"; then echo " - ffmpeg (external library)" else @@ -203,6 +204,7 @@ AC_DEFUN([XINE_LIB_SUMMARY], [ echo " - OpenGL" fi fi + test x$"have_vdpau" = x"yes" && echo " - vdpau (X11 VDPAU)" if test x"$have_sunfb" = x"yes"; then if test x"$have_sundga" = x"yes"; then echo " - PGX64 (for Sun XVR100/PGX64/PGX24 cards)" diff --git a/m4/video_out.m4 b/m4/video_out.m4 index 7870b7558..8792f0b80 100644 --- a/m4/video_out.m4 +++ b/m4/video_out.m4 @@ -499,4 +499,20 @@ AC_DEFUN([XINE_VIDEO_OUT_PLUGINS], [ fi AM_CONDITIONAL([ENABLE_XVMC], [test x"$have_xvmc" = x"yes"]) AM_CONDITIONAL([ENABLE_XXMC], [test x"$have_xxmc" = x"yes"]) -])dnl XINE_VIDEO_OUT_PLUGINS + + + dnl VDPAU + AC_ARG_ENABLE([vdpau], [AS_HELP_STRING([--disable-vdpau], [Disable VDPAU output plugin])]) + if test x"$no_x" != x"yes" && test x"$enable_vdpau" != x"no"; then + AC_CHECK_HEADERS([vdpau/vdpau_x11.h], [have_vdpau=yes], [have_vdpau=no]) + if test x"$have_vdpau" = x"yes"; then + AC_CHECK_LIB([vdpau], [vdp_device_create_x11], [], [have_vdpau=no], [$X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS]) + fi + if test x"$enable_vdpau" = x"yes" && test x"$have_vdpau" != x"yes"; then + AC_MSG_ERROR([VDPAU support requested, but not all requirements are met]) + fi + fi + AM_CONDITIONAL([ENABLE_VDPAU], test x"$have_vdpau" = x"yes") + +])dnl XINE_VIDEO_OUT_PLUGIN +S |