Index: Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/libxine/Makefile,v retrieving revision 1.163 diff -u -p -r1.163 Makefile --- Makefile 14 Sep 2010 18:58:49 -0000 1.163 +++ Makefile 10 Jan 2011 22:11:43 -0000 @@ -9,9 +9,11 @@ PORTNAME= xine PORTVERSION= 1.1.19 PORTREVISION= 1 CATEGORIES= multimedia ipv6 -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION} +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION} \ + http://e-tobi.net/vdr-experimental/pool-squeeze/source/base/:vdpau PKGNAMEPREFIX= lib DISTNAME= ${PORTNAME}-lib-${PORTVERSION} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} 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 patches" off MAN1= xine-config.1 xine-list-1.1.1 MAN5= xine.5 @@ -202,6 +205,16 @@ PLIST_SUB+= WITH_WAVPACK="@comment " CONFIGURE_ARGS+= --without-wavpack .endif +.if defined(WITH_VDPAU) +PATCHTARBALL= xine-lib_1.1.19-2.etobi2.debian.tar.gz +DISTFILES+= ${PATCHTARBALL}:vdpau +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} +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 +229,13 @@ CONFIGURE_ARGS+= --disable-vidix .endif post-patch: +.if defined(WITH_VDPAU) + @cd ${WRKDIR} && ${TAR} xf ${_DISTDIR}/${PATCHTARBALL} + @${PATCH} -d ${WRKSRC} -p1 --forward --quiet <${WRKDIR}/debian/patches/debian-changes + @for i in `${LS} ${FILESDIR}/post-patch-* |${SED} /.orig$$/d`; do \ + ${PATCH} -d ${WRKSRC} --forward --quiet <$$i ;\ + done +.endif .for f in libtool ltmain.sh @${REINPLACE_CMD} -e \ '/freebsd-elf)/,/;;/ s|major="\.$$current"|major=.`expr $$current - $$age`|; \ Index: distinfo =================================================================== RCS file: /home/pcvs/ports/multimedia/libxine/distinfo,v retrieving revision 1.42 diff -u -p -r1.42 distinfo --- distinfo 18 Aug 2010 19:10:55 -0000 1.42 +++ distinfo 10 Jan 2011 20:38:27 -0000 @@ -1,3 +1,4 @@ -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 Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/multimedia/libxine/pkg-plist,v retrieving revision 1.56 diff -u -p -r1.56 pkg-plist --- pkg-plist 18 Aug 2010 19:10:55 -0000 1.56 +++ pkg-plist 10 Jan 2011 21:57:36 -0000 @@ -227,6 +227,13 @@ 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%%lib/xine/plugins/1.29/xineplug_vo_out_vdpau.so +%%VDPAU%%lib/xine/plugins/1.29/xineplug_dmx_vc1_es.so +%%VDPAU%%lib/xine/plugins/1.29/xineplug_decode_vdpau_h264.so +%%VDPAU%%lib/xine/plugins/1.29/xineplug_decode_vdpau_mpeg12.so +%%VDPAU%%lib/xine/plugins/1.29/xineplug_decode_vdpau_vc1.so +%%VDPAU%%lib/xine/plugins/1.29/xineplug_vdr.so @dirrm include/xine @dirrm %%PLUGINSDIR%%/vidix @dirrm %%PLUGINSDIR%%/post Index: files/post-patch-src-vdr-input_vdr.c @@ -0,0 +1,12 @@ +--- src/vdr/input_vdr.c.orig ++++ src/vdr/input_vdr.c +@@ -32,6 +32,9 @@ + #include + #include + ++#ifdef __FreeBSD__ ++#include ++#endif + #include + #include + #include