- Fix LIBBLURAY and VAAPI knobs so they actually do something.

- No PORTREVISION bump as these are non-default options.
- Remove unused patchfiles.

multimedia/libxine/Makefile

@@ -191,14 +191,18 @@ CONFIGURE_ARGS+=	--without-wavpack
 
 .if ${PORT_OPTIONS:MVAAPI}
 LIB_DEPENDS+=	libva.so:${PORTSDIR}/multimedia/libva
+PLIST_SUB+=	VAAPI=""
+CONFIGURE_ARGS+=	--enable-vaapi
+.else
+PLIST_SUB+=	VAAPI="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MLIBBLURAY}
-CONFIGURE_OPTS+=	--enable-bluray
+CONFIGURE_ARGS+=	--enable-bluray
 LIB_DEPENDS+=	libbluray.so:${PORTSDIR}/multimedia/libbluray
 PLIST_SUB+=	LIBBLURAY=""
 .else
-CONFIGURE_OPTS+=	--disable-bluray
+CONFIGURE_ARGS+=	--disable-bluray
 PLIST_SUB+=	LIBBLURAY="@comment "
 .endif
 
@@ -217,7 +221,8 @@ CONFIGURE_ARGS+=	--disable-vidix
 
 post-patch:
 .if ${PORT_OPTIONS:MVAAPI}
-	#@${PATCH} ${PATCH_DIST_ARGS} <${FILESDIR}/ffmpeg-vaapi_xine-lib-1.2.2-defaultoff.diff
+	@${REINPLACE_CMD} -e 's|-ldl||' \
+		${WRKSRC}/src/video_out/Makefile.in
 .endif
 .for f in libtool ltmain.sh
 	@${REINPLACE_CMD} -e \

multimedia/libxine/files/extrapatch-vdpau-configure.ac

@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -2528,7 +2528,7 @@ makeexpand () {
- 
- xinelibdir='${libdir}/xine'
- xinedatadir='${datadir}/xine'
--pkgconfigdir='${libdir}/pkgconfig'
-+pkgconfigdir='${prefix}/libdata/pkgconfig'
- AC_SUBST(xinelibdir)
- AC_SUBST(xinedatadir)
- AC_SUBST(pkgconfigdir)

multimedia/libxine/files/extrapatch-vdpau-src-vdr-input_vdr.c

@@ -1,12 +0,0 @@
---- a/src/vdr/input_vdr.c
-+++ b/src/vdr/input_vdr.c
-@@ -32,6 +32,9 @@
- #include <errno.h>
- #include <pthread.h>
- 
-+#ifdef __FreeBSD__
-+#include <netinet/in.h>
-+#endif
- #include <sys/socket.h>
- #include <resolv.h>
- #include <netdb.h>

multimedia/libxine/files/extrapatch-vdpau-src-video_out-video_out_vdpau.c

@@ -1,91 +0,0 @@
---- a/src/video_out/video_out_vdpau.c
-+++ b/src/video_out/video_out_vdpau.c
-@@ -53,6 +53,8 @@
- 
- #define NUM_FRAMES_BACK 1
- 
-+#define LOCKDISPLAY /*define this if you have a buggy libX11/xcb*/
-+
- #define DEINT_BOB                    1
- #define DEINT_HALF_TEMPORAL          2
- #define DEINT_HALF_TEMPORAL_SPATIAL  3
-@@ -167,12 +169,30 @@ static void vdpau_reinit( vo_driver_t *t
- static VdpVideoSurfaceCreate *orig_vdp_video_surface_create;
- static VdpVideoSurfaceDestroy *orig_vdp_video_surface_destroy;
- 
-+static VdpVideoSurfaceCreate *orig_vdp_output_surface_create;
-+static VdpVideoSurfaceDestroy *orig_vdp_output_surface_destroy;
-+
-+static VdpVideoSurfacePutBitsYCbCr *orig_vdp_video_surface_putbits_ycbcr;
-+
- static VdpDecoderCreate *orig_vdp_decoder_create;
- static VdpDecoderDestroy *orig_vdp_decoder_destroy;
- static VdpDecoderRender *orig_vdp_decoder_render;
- 
- static Display *guarded_display;
- 
-+static VdpStatus guarded_vdp_video_surface_putbits_ycbcr(VdpVideoSurface surface, VdpYCbCrFormat source_ycbcr_format, void const *const *source_data, uint32_t const *source_pitches)
-+{
-+  VdpStatus r;
-+#ifdef LOCKDISPLAY
-+  XLockDisplay(guarded_display);
-+#endif
-+  r = orig_vdp_video_surface_putbits_ycbcr(surface, source_ycbcr_format, source_data, source_pitches);
-+#ifdef LOCKDISPLAY
-+  XUnlockDisplay(guarded_display);
-+#endif
-+  return r;
-+}
-+
- static VdpStatus guarded_vdp_video_surface_create(VdpDevice device, VdpChromaType chroma_type, uint32_t width, uint32_t height,VdpVideoSurface *surface)
- {
-   VdpStatus r;
-@@ -195,6 +215,28 @@ static VdpStatus guarded_vdp_video_surfa
-   return r;
- }
- 
-+static VdpStatus guarded_vdp_output_surface_create(VdpDevice device, VdpChromaType chroma_type, uint32_t width, uint32_t height,VdpVideoSurface *surface)
-+{
-+  VdpStatus r;
-+#ifdef LOCKDISPLAY
-+  XLockDisplay(guarded_display);
-+#endif
-+  r = orig_vdp_output_surface_create(device, chroma_type, width, height, surface);
-+#ifdef LOCKDISPLAY
-+  XUnlockDisplay(guarded_display);
-+#endif
-+  return r;
-+}
-+
-+static VdpStatus guarded_vdp_output_surface_destroy(VdpVideoSurface surface)
-+{
-+  VdpStatus r;
-+  XLockDisplay(guarded_display);
-+  r = orig_vdp_output_surface_destroy(surface);
-+  XUnlockDisplay(guarded_display);
-+  return r;
-+}
-+
- static VdpStatus guarded_vdp_decoder_create(VdpDevice device, VdpDecoderProfile profile, uint32_t width, uint32_t height, uint32_t max_references, VdpDecoder *decoder)
- {
-   VdpStatus r;
-@@ -2324,16 +2366,16 @@ static vo_driver_t *vdpau_open_plugin (v
-   st = vdp_get_proc_address( vdp_device, VDP_FUNC_ID_VIDEO_SURFACE_DESTROY , (void*)&orig_vdp_video_surface_destroy ); vdp_video_surface_destroy = guarded_vdp_video_surface_destroy;
-   if ( vdpau_init_error( st, "Can't get VIDEO_SURFACE_DESTROY proc address !!", &this->vo_driver, 1 ) )
-     return NULL;
--  st = vdp_get_proc_address( vdp_device, VDP_FUNC_ID_VIDEO_SURFACE_PUT_BITS_Y_CB_CR , (void*)&vdp_video_surface_putbits_ycbcr );
-+  st = vdp_get_proc_address( vdp_device, VDP_FUNC_ID_VIDEO_SURFACE_PUT_BITS_Y_CB_CR , (void*)&orig_vdp_video_surface_putbits_ycbcr ); vdp_video_surface_putbits_ycbcr = guarded_vdp_video_surface_putbits_ycbcr;
-   if ( vdpau_init_error( st, "Can't get VIDEO_SURFACE_PUT_BITS_Y_CB_CR proc address !!", &this->vo_driver, 1 ) )
-     return NULL;
-   st = vdp_get_proc_address( vdp_device, VDP_FUNC_ID_VIDEO_SURFACE_GET_BITS_Y_CB_CR , (void*)&vdp_video_surface_getbits_ycbcr );
-   if ( vdpau_init_error( st, "Can't get VIDEO_SURFACE_GET_BITS_Y_CB_CR proc address !!", &this->vo_driver, 1 ) )
-     return NULL;
--  st = vdp_get_proc_address( vdp_device, VDP_FUNC_ID_OUTPUT_SURFACE_CREATE , (void*)&vdp_output_surface_create );
-+  st = vdp_get_proc_address( vdp_device, VDP_FUNC_ID_OUTPUT_SURFACE_CREATE , (void*)&orig_vdp_output_surface_create ); vdp_output_surface_create = guarded_vdp_output_surface_create;
-   if ( vdpau_init_error( st, "Can't get OUTPUT_SURFACE_CREATE proc address !!", &this->vo_driver, 1 ) )
-     return NULL;
--  st = vdp_get_proc_address( vdp_device, VDP_FUNC_ID_OUTPUT_SURFACE_DESTROY , (void*)&vdp_output_surface_destroy );
-+  st = vdp_get_proc_address( vdp_device, VDP_FUNC_ID_OUTPUT_SURFACE_DESTROY , (void*)&orig_vdp_output_surface_destroy ); vdp_output_surface_destroy = guarded_vdp_output_surface_destroy;
-   if ( vdpau_init_error( st, "Can't get OUTPUT_SURFACE_DESTROY proc address !!", &this->vo_driver, 1 ) )
-     return NULL;
-   st = vdp_get_proc_address( vdp_device, VDP_FUNC_ID_OUTPUT_SURFACE_RENDER_BITMAP_SURFACE , (void*)&vdp_output_surface_render_bitmap_surface );

multimedia/libxine/pkg-plist

@@ -181,6 +181,7 @@ share/xine-lib/fonts/serif-64.xinefont.gz
 %%PLUGINSDIR%%/xineplug_vo_out_xcbxv.so
 %%PLUGINSDIR%%/xineplug_vo_out_xshm.so
 %%PLUGINSDIR%%/xineplug_vo_out_xv.so
+%%VAAPI%%%%PLUGINSDIR%%/xineplug_vo_out_vaapi.so
 %%WITH_XVMC%%%%PLUGINSDIR%%/xineplug_vo_out_xvmc.so
 %%WITH_XVMC%%%%PLUGINSDIR%%/xineplug_vo_out_xxmc.so
 %%WITH_WAVPACK%%%%PLUGINSDIR%%/xineplug_wavpack.so