diff options
| author | wiz <wiz> | 2010-09-16 09:49:42 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2010-09-16 09:49:42 +0000 |
| commit | 8adb2a9cfd97c862ffa8e8cefd722d0a26a35f0b (patch) | |
| tree | b5adf4feec2a3ff46e5941fdebd7096445be8bf9 /multimedia/xine-lib | |
| parent | 3fa29a0085b83b70b7e3e812a9c0f9a07eeb58f6 (diff) | |
| download | pkgsrc-8adb2a9cfd97c862ffa8e8cefd722d0a26a35f0b.tar.gz | |
Now that libX11 pulls in libxcb, merge xine-xcb package back into
xine-lib.
Update dependency patterns in users and bump PKGREVISION.
Diffstat (limited to 'multimedia/xine-lib')
| -rw-r--r-- | multimedia/xine-lib/Makefile | 6 | ||||
| -rw-r--r-- | multimedia/xine-lib/PLIST.common | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile index 8353c789611..35fa9125c4a 100644 --- a/multimedia/xine-lib/Makefile +++ b/multimedia/xine-lib/Makefile @@ -1,11 +1,14 @@ -# $NetBSD: Makefile,v 1.80 2010/07/28 09:24:14 drochner Exp $ +# $NetBSD: Makefile,v 1.81 2010/09/16 09:49:43 wiz Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "Makefile.common" +PKGREVISION= 1 COMMENT= Multimedia player library +CONFLICTS+= xine-xcb-[0-9]* + CONFIGURE_ARGS+= --disable-v4l BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1 @@ -48,5 +51,6 @@ CONFIGURE_ARGS+= --disable-opengl .include "../../x11/libXt/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXinerama/buildlink3.mk" +.include "../../x11/libxcb/buildlink3.mk" .include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/xine-lib/PLIST.common b/multimedia/xine-lib/PLIST.common index b406e495358..95cf7e26101 100644 --- a/multimedia/xine-lib/PLIST.common +++ b/multimedia/xine-lib/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.29 2009/12/09 10:13:03 drochner Exp $ +@comment $NetBSD: PLIST.common,v 1.30 2010/09/16 09:49:43 wiz Exp $ bin/xine-config bin/xine-list-1.1 include/xine.h @@ -197,6 +197,10 @@ lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_raw.a lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_raw.so @comment lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_sdl.a @comment lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_sdl.so +lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xcbshm.a +lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xcbshm.so +lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xcbxv.a +lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xcbxv.so lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xshm.a lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xshm.so ${PLIST.xv}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xv.a |