diff options
| -rw-r--r-- | m4/video_out.m4 | 27 | ||||
| -rw-r--r-- | src/video_dec/libvdpau/Makefile.am | 2 | ||||
| -rw-r--r-- | src/video_out/Makefile.am | 4 |
3 files changed, 24 insertions, 9 deletions
diff --git a/m4/video_out.m4 b/m4/video_out.m4 index 1141e5ad2..935d7e197 100644 --- a/m4/video_out.m4 +++ b/m4/video_out.m4 @@ -461,12 +461,27 @@ AC_DEFUN([XINE_VIDEO_OUT_PLUGINS], [ dnl VDPAU XINE_ARG_ENABLE([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"$hard_enable_vdpau" = x"yes" && test x"$have_vdpau" != x"yes"; then - AC_MSG_ERROR([VDPAU support requested, but not all requirements are met]) + PKG_CHECK_MODULES([VDPAU], [vdpau], [have_vdpau=yes], [have_vdpau=no]) + if test x"$have_vdpau" = xno; then + saved_CFLAGS="$CFLAGS" + saved_LIBS="$LIBS" + CFLAGS= + LIBS= + dnl likely defaults + dnl if these are bad, blame nVidia for not supplying vdpau.pc + VDPAU_CFLAGS= + VDPAU_LIBS=-lvdpau + 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"$hard_enable_vdpau" = x"yes" && test x"$have_vdpau" != x"yes"; then + AC_MSG_ERROR([VDPAU support requested, but not all requirements are met]) + fi + CFLAGS="$saved_CFLAGS" + LIBS="$saved_LIBS" + AC_SUBST([VDPAU_CFLAGS]) + AC_SUBST([VDPAU_LIBS]) fi fi AM_CONDITIONAL([ENABLE_VDPAU], test x"$have_vdpau" = x"yes") diff --git a/src/video_dec/libvdpau/Makefile.am b/src/video_dec/libvdpau/Makefile.am index f2a6e5176..f3ffbcccf 100644 --- a/src/video_dec/libvdpau/Makefile.am +++ b/src/video_dec/libvdpau/Makefile.am @@ -7,7 +7,7 @@ noinst_HEADERS = bits_reader.h dpb.h cpb.h h264_parser.h nal.h if ENABLE_VDPAU vdpau_h264_module = xineplug_decode_vdpau_h264.la -VDPAU_CFLAGS = -D_ISOC99_SOURCE +VDPAU_CFLAGS += -D_ISOC99_SOURCE vdpau_mpeg12_module = xineplug_decode_vdpau_mpeg12.la diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am index d44021faf..7b9c3eeda 100644 --- a/src/video_out/Makefile.am +++ b/src/video_out/Makefile.am @@ -118,8 +118,8 @@ xineplug_LTLIBRARIES = $(xshm_module) $(xv_module) $(xvmc_module) \ xineplug_vo_out_none.la xineplug_vo_out_vdpau_la_SOURCES = video_out_vdpau.c -xineplug_vo_out_vdpau_la_LIBADD = libyuv2rgb.la $(XINE_LIB) $(MLIB_LIBS) $(PTHREAD_LIBS) $(X_LIBS) $(LTLIBINTL) -lvdpau -xineplug_vo_out_vdpau_la_CFLAGS = $(VISIBILITY_FLAG) $(MLIB_CFLAGS) $(X_CFLAGS) +xineplug_vo_out_vdpau_la_LIBADD = libyuv2rgb.la $(XINE_LIB) $(MLIB_LIBS) $(PTHREAD_LIBS) $(X_LIBS) $(LTLIBINTL) $(VDPAU_LIBS) +xineplug_vo_out_vdpau_la_CFLAGS = $(VISIBILITY_FLAG) $(MLIB_CFLAGS) $(X_CFLAGS) $(VDPAU_CFLAGS) xineplug_vo_out_xcbshm_la_SOURCES = video_out_xcbshm.c $(XCBOSD) xineplug_vo_out_xcbshm_la_LIBADD = libyuv2rgb.la $(XINE_LIB) $(PTHREAD_LIBS) $(XCB_LIBS) $(XCBSHM_LIBS) $(LTLIBINTL) $(AVUTIL_LIBS) |