5 files changed, 59 insertions, 7 deletions

diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index 0fdef78e781d..3b2868f2055c 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -7,12 +7,14 @@
 
 PORTNAME=	xine
 PORTVERSION=	1.1.19
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia ipv6
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION}
 PKGNAMEPREFIX=	lib
 DISTNAME=	${PORTNAME}-lib-${PORTVERSION}
 
+PATCH_SITES=	LOCAL/makc
+
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Libraries for xine multimedia player
 
@@ -76,7 +78,8 @@ OPTIONS=	ARTS "Enable aRts support" off \
 		AALIB "Enable aalib support" off \
 		IMAGEMAGICK "Enable ImageMagick support" off \
 		GTK2 "Enable gdkpixbuf support" off \
-		WAVPACK "Enable WavPack support" off
+		WAVPACK "Enable WavPack support" off \
+		VDPAU "Enable VDPAU support" on
 
 MAN1=	xine-config.1 xine-list-1.1.1
 MAN5=	xine.5
@@ -88,6 +91,8 @@ PLIST_SUB=	PLUGINSDIR="lib/xine/plugins/1.29"
 # and src/input/libdvdnav/dvd_input.c (dlopen'ed)
 DVDCSS_LIBVERSION=	3
 
+PATCH_DIST_ARGS=	-d ${WRKSRC} -p1 --forward --quiet
+
 .include <bsd.port.options.mk>
 
 .if !defined(WITHOUT_NLS)
@@ -202,6 +207,15 @@ PLIST_SUB+=	WITH_WAVPACK="@comment "
 CONFIGURE_ARGS+=	--without-wavpack
 .endif
 
+.if defined(WITH_VDPAU)
+PATCHFILES+=	xine-vdpau.bz2
+USE_AUTOTOOLS=	autoconf
+LIB_DEPENDS+=	vdpau.1:${PORTSDIR}/multimedia/libvdpau
+PLIST_SUB+=	VDPAU=""
+.else
+PLIST_SUB+=	VDPAU="@comment "
+.endif
+
 .if ${CONFIGURE_ARGS:M*--without-imagemagick*} == "" || ${CONFIGURE_ARGS:M*-disable-gdkpixbuf*} == ""
 PLIST_SUB+=	WITH_DMX_IMAGE=""
 .else
@@ -216,6 +230,11 @@ CONFIGURE_ARGS+=	--disable-vidix
 .endif
 
 post-patch:
+.if defined(WITH_VDPAU)
+	for i in `${LS} ${FILESDIR}/extrapatch-vdpau*`; do \
+		${PATCH} ${PATCH_DIST_ARGS} <$$i ;\
+	done
+.endif
 .for f in libtool ltmain.sh
 	@${REINPLACE_CMD} -e \
 		'/freebsd-elf)/,/;;/ s|major="\.$$current"|major=.`expr $$current - $$age`|; \
diff --git a/multimedia/libxine/distinfo b/multimedia/libxine/distinfo
index a700a189de51..bc831ff6d0e4 100644
--- a/multimedia/libxine/distinfo
+++ b/multimedia/libxine/distinfo
@@ -1,3 +1,6 @@
-MD5 (xine-lib-1.1.19.tar.xz) = d0969c067dc32f33c5ea431e5e2106ce
 SHA256 (xine-lib-1.1.19.tar.xz) = f834f646880bb44186018d12280ac27c8314447de9335b6fe390157b26df9cd9
 SIZE (xine-lib-1.1.19.tar.xz) = 5782580
+SHA256 (xine-lib_1.1.19-2.etobi2.debian.tar.gz) = 41d2ff49284973690914dd8fea0ec25cbbc2a6b60d391bdefe8fab5335eca6b7
+SIZE (xine-lib_1.1.19-2.etobi2.debian.tar.gz) = 179402
+SHA256 (xine-vdpau.bz2) = 25ab5eaa0f5a62e74478feaf1458c81b9e779cac362f04ae5800a73c471d49b2
+SIZE (xine-vdpau.bz2) = 93194
diff --git a/multimedia/libxine/files/extrapatch-vdpau-configure.ac b/multimedia/libxine/files/extrapatch-vdpau-configure.ac
new file mode 100644
index 000000000000..f4257562d495
--- /dev/null
+++ b/multimedia/libxine/files/extrapatch-vdpau-configure.ac
@@ -0,0 +1,11 @@
+--- 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)
diff --git a/multimedia/libxine/files/extrapatch-vdpau-src-vdr-input_vdr.c b/multimedia/libxine/files/extrapatch-vdpau-src-vdr-input_vdr.c
new file mode 100644
index 000000000000..d88d63e7e8f0
--- /dev/null
+++ b/multimedia/libxine/files/extrapatch-vdpau-src-vdr-input_vdr.c
@@ -0,0 +1,12 @@
+--- 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>
diff --git a/multimedia/libxine/pkg-plist b/multimedia/libxine/pkg-plist
index 929bf50b580c..0fcd6282301f 100644
--- a/multimedia/libxine/pkg-plist
+++ b/multimedia/libxine/pkg-plist
@@ -227,12 +227,19 @@ share/aclocal/xine.m4
 %%DATADIR%%/libxine1/fonts/serif-32.xinefont.gz
 %%DATADIR%%/libxine1/fonts/serif-48.xinefont.gz
 %%DATADIR%%/libxine1/fonts/serif-64.xinefont.gz
+%%VDPAU%%include/xine/vdr.h
+%%VDPAU%%%%PLUGINSDIR%%/xineplug_vo_out_vdpau.so
+%%VDPAU%%%%PLUGINSDIR%%/xineplug_dmx_vc1_es.so
+%%VDPAU%%%%PLUGINSDIR%%/xineplug_decode_vdpau_h264.so
+%%VDPAU%%%%PLUGINSDIR%%/xineplug_decode_vdpau_mpeg12.so
+%%VDPAU%%%%PLUGINSDIR%%/xineplug_decode_vdpau_vc1.so
+%%VDPAU%%%%PLUGINSDIR%%/xineplug_vdr.so
 @dirrm include/xine
 @dirrm %%PLUGINSDIR%%/vidix
 @dirrm %%PLUGINSDIR%%/post
-@dirrm %%PLUGINSDIR%%
-@dirrm lib/xine/plugins
-@dirrm lib/xine
+@dirrmtry %%PLUGINSDIR%%
+@dirrmtry lib/xine/plugins
+@dirrmtry lib/xine
 @dirrm %%DOCSDIR%%/hackersguide
 @dirrm %%DOCSDIR%%
 %%NLS%%@dirrmtry share/locale/pl_PL/LC_MESSAGES
@@ -241,4 +248,4 @@ share/aclocal/xine.m4
 %%NLS%%@dirrmtry share/locale/en_US
 @dirrm %%DATADIR%%/libxine1/fonts
 @dirrm %%DATADIR%%/libxine1
-@dirrm %%DATADIR%%
+@dirrmtry %%DATADIR%%