Responsible Changed From-To: freebsd-ports-bugs->pgollucci pgollucci@ wants his PRs (via the GNATS Auto Assign Tool)
update, from NEWS file: * Fix build if no OpenGL header is available (libva >= 0.31.1) --- b.diff begins here --- diff --git multimedia/vdpau-video/Makefile multimedia/vdpau-video/Makefile index 6a69a85..ce5f5a4 100644 --- multimedia/vdpau-video/Makefile +++ multimedia/vdpau-video/Makefile @@ -6,7 +6,7 @@ # PORTNAME= vdpau-video -DISTVERSION= 0.7.3.pre2 +DISTVERSION= 0.7.3.pre4 CATEGORIES= multimedia MASTER_SITES= http://www.splitted-desktop.com/~gbeauchesne/${PORTNAME}/ diff --git multimedia/vdpau-video/distinfo multimedia/vdpau-video/distinfo index 20de17f..c4d32c2 100644 --- multimedia/vdpau-video/distinfo +++ multimedia/vdpau-video/distinfo @@ -1,2 +1,2 @@ -SHA256 (vdpau-video-0.7.3.pre2.tar.gz) = b51698e8f176f5ec18cc68ef583aea552e67640d9b6d21143a266e3bfb51ee58 -SIZE (vdpau-video-0.7.3.pre2.tar.gz) = 399979 +SHA256 (vdpau-video-0.7.3.pre4.tar.gz) = 4a28c06f180aa1bc97d191f58ca9fe85b309032f2cee147f1512a49736d3dc1b +SIZE (vdpau-video-0.7.3.pre4.tar.gz) = 400013 --- b.diff ends here ---
Make sure -L${LOCALBASE}/lib is passed to LDFLAGS. --- a.diff begins here --- diff --git multimedia/vdpau-video/Makefile multimedia/vdpau-video/Makefile index ce5f5a4..6be8de4 100644 --- multimedia/vdpau-video/Makefile +++ multimedia/vdpau-video/Makefile @@ -22,9 +22,10 @@ LICENSE_FILE_GPLv2=${WRKSRC}/COPYING USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> --- a.diff ends here ---
Use @dirrmtry, -isystem and regen cumulative diff. --- a.diff begins here --- Index: multimedia/Makefile =================================================================== RCS file: /a/.cvsup/ports/multimedia/Makefile,v retrieving revision 1.402 diff -u -p -r1.402 Makefile --- multimedia/Makefile 3 Jan 2011 14:37:53 -0000 1.402 +++ multimedia/Makefile 5 Jan 2011 00:19:44 -0000 @@ -322,6 +323,7 @@ SUBDIR += vcdimager SUBDIR += vcdpad SUBDIR += vcdtools + SUBDIR += vdpau-video SUBDIR += vdpauinfo SUBDIR += vlc SUBDIR += vodcatcher Index: multimedia/vdpau-video/Makefile =================================================================== RCS file: multimedia/vdpau-video/Makefile diff -N multimedia/vdpau-video/Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ multimedia/vdpau-video/Makefile 8 Jan 2011 13:19:40 -0000 @@ -0,0 +1,51 @@ +# New ports collection makefile for: vdpau-video +# Date created: 5 Jan 2011 +# Whom: Anonymous +# +# $FreeBSD$ +# + +PORTNAME= vdpau-video +DISTVERSION= 0.7.3.pre4 +CATEGORIES= multimedia +MASTER_SITES= http://www.splitted-desktop.com/~gbeauchesne/${PORTNAME}/ + +MAINTAINER= swell.k@gmail.com +COMMENT= A VDPAU-based backend for VAAPI + +LIB_DEPENDS= va.1:${PORTSDIR}/multimedia/libva \ + vdpau.1:${PORTSDIR}/multimedia/libvdpau + +LICENSE= GPLv2 GPLv3 +LICENSE_COMB= dual +LICENSE_FILE_GPLv2=${WRKSRC}/COPYING + +USE_GMAKE= yes +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" + +CPPFLAGS+= -isystem${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib + +.include <bsd.port.pre.mk> + +VDPAU_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 pthread: | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} + +.if !defined(WITH_DEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif + +.if defined(STRIP) && ${STRIP} != "" +INSTALL_TARGET= install-strip +.endif + +post-patch: .SILENT + ${REINPLACE_CMD} -e '/LIBS/{ s/-ldl//; \ + s/-lrt//; s/-lpthread/${PTHREAD_LIBS}/; }' \ + -e 's|driverdir|& --define-variable prefix=${PREFIX}|' \ + ${WRKSRC}/configure + ${REINPLACE_CMD} 's/^vdpau.*LDFLAGS.*/& \ + -Wl,-lc ${VDPAU_PTHREAD_LIBS:S/^/-Wl,/}/' \ + ${WRKSRC}/src/Makefile.in + +.include <bsd.port.post.mk> Index: multimedia/vdpau-video/distinfo =================================================================== RCS file: multimedia/vdpau-video/distinfo diff -N multimedia/vdpau-video/distinfo --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ multimedia/vdpau-video/distinfo 6 Jan 2011 16:34:51 -0000 @@ -0,0 +1,2 @@ +SHA256 (vdpau-video-0.7.3.pre4.tar.gz) = 4a28c06f180aa1bc97d191f58ca9fe85b309032f2cee147f1512a49736d3dc1b +SIZE (vdpau-video-0.7.3.pre4.tar.gz) = 400013 Index: multimedia/vdpau-video/pkg-descr =================================================================== RCS file: multimedia/vdpau-video/pkg-descr diff -N multimedia/vdpau-video/pkg-descr --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ multimedia/vdpau-video/pkg-descr 5 Jan 2011 06:39:31 -0000 @@ -0,0 +1,3 @@ +A VDPAU-based backend for VAAPI + +WWW: http://www.splitted-desktop.com/~gbeauchesne/ Index: multimedia/vdpau-video/pkg-plist =================================================================== RCS file: multimedia/vdpau-video/pkg-plist diff -N multimedia/vdpau-video/pkg-plist --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ multimedia/vdpau-video/pkg-plist 8 Jan 2011 13:21:03 -0000 @@ -0,0 +1,5 @@ +lib/va/nvidia_drv_video.so +lib/va/s3g_drv_video.so +lib/va/vdpau_drv_video.la +lib/va/vdpau_drv_video.so +@dirrmtry lib/va --- a.diff ends here ---
Correct dependency on libva. --- b.diff begins here --- diff --git multimedia/vdpau-video/Makefile multimedia/vdpau-video/Makefile index 5f02390..33ff473 100644 --- multimedia/vdpau-video/Makefile +++ multimedia/vdpau-video/Makefile @@ -13,14 +13,15 @@ MASTER_SITES= http://www.splitted-desktop.com/~gbeauchesne/${PORTNAME}/ MAINTAINER= swell.k@gmail.com COMMENT= A VDPAU-based backend for VAAPI -LIB_DEPENDS= va.1:${PORTSDIR}/multimedia/libva \ - vdpau.1:${PORTSDIR}/multimedia/libvdpau +BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/libva.pc:${PORTSDIR}/multimedia/libva +LIB_DEPENDS= vdpau.1:${PORTSDIR}/multimedia/libvdpau LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual LICENSE_FILE_GPLv2=${WRKSRC}/COPYING USE_GMAKE= yes +USE_GL= gl GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" --- b.diff ends here ---
Responsible Changed From-To: pgollucci->freebsd-ports-bugs E-NO-TIME right now, back to pool
Responsible Changed From-To: freebsd-ports-bugs->makc I'll take it.
makc 2011-01-13 11:02:20 UTC FreeBSD ports repository Added files: multimedia/vdpau-video Makefile distinfo pkg-descr pkg-plist Log: Add new port multimedia/vdpau-video: A VDPAU-based backend for VAAPI. WWW: http://www.splitted-desktop.com/~gbeauchesne/ PR: ports/153726 Submitted by: Anonymous <swell.k at gmail.com> Feature safe: yes Revision Changes Path 1.1 +53 -0 ports/multimedia/vdpau-video/Makefile (new) 1.1 +2 -0 ports/multimedia/vdpau-video/distinfo (new) 1.1 +3 -0 ports/multimedia/vdpau-video/pkg-descr (new) 1.1 +5 -0 ports/multimedia/vdpau-video/pkg-plist (new) _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed New port added. Thanks!