Now that libX11 pulls in libxcb, merge xine-xcb package back into

xine-lib.
Update dependency patterns in users and bump PKGREVISION.

4 files changed, 16 insertions, 9 deletions

diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index c3729db45af..9da2bf5e647 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2010/09/14 11:02:29 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/09/16 09:49:42 wiz Exp $
 
 DISTNAME=	kdemultimedia-${_KDE_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	multimedia
 COMMENT=	Multimedia tools for the KDE integrated X11 desktop
 
@@ -9,8 +9,6 @@ COMMENT=	Multimedia tools for the KDE integrated X11 desktop
 
 # BUILD_MAKE_FLAGS+= VERBOSE=1
 
-DEPENDS+=	xine-xcb>=1.1.9:../../x11/xine-xcb
-
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
@@ -23,6 +21,7 @@ DEPENDS+=	xine-xcb>=1.1.9:../../x11/xine-xcb
 .include "../../audio/taglib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../multimedia/libtheora/buildlink3.mk"
+BUILDLINK_ABI_DEPENDS.xine-lib?=	xine-lib>=1.1.19nb1
 .include "../../multimedia/xine-lib/buildlink3.mk"
 .include "../../x11/kdelibs4/buildlink3.mk"
 .include "../../x11/kdebase-runtime4/buildlink3.mk"
diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile
index f2167416259..5636d2343e4 100644
--- a/multimedia/phonon/Makefile
+++ b/multimedia/phonon/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2010/09/14 11:01:15 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/09/16 09:49:42 wiz Exp $
 
 DISTNAME=	phonon-4.4.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_KDE:=phonon/4.4.0/}
 EXTRACT_SUFX=	.tgz
@@ -16,7 +16,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 # BUILD_MAKE_FLAGS+= VERBOSE=1
 
 BUILD_DEPENDS+=	automoc4>=0.9.83:../../devel/automoc4
-DEPENDS+=	xine-xcb>=1.1.9:../../x11/xine-xcb
 
 WRKSRC=		${WRKDIR}/phonon-4.4
 USE_TOOLS+=	pkg-config
@@ -34,6 +33,7 @@ pre-configure:
 
 .include "../../multimedia/gstreamer0.10/buildlink3.mk"
 .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
+BUILDLINK_ABI_DEPENDS.xine-lib?=	xine-lib>=1.1.19nb1
 .include "../../multimedia/xine-lib/buildlink3.mk"
 .include "../../x11/libxcb/buildlink3.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"
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