misc/130953: multimedia/libxine: remove optinal XCB

[Max Brazhnikov]

>Number:         130953
>Category:       misc
>Synopsis:       multimedia/libxine: remove optinal XCB
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 24 20:00:02 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Max Brazhnikov
>Release:        FreeBSD 7.0-STABLE i386
>Organization:
>Environment:
FreeBSD luna.dio.ru 7.1-STABLE FreeBSD 7.1-STABLE #2: Sun Jan 18 21:48:53 MSK 2009     root at luna.dio.ru:/usr/obj/usr/freebsd/7/src/sys/LUNA  i386
>Description:
Remove XCB option from libxine.

libX11 now depends on libxcb unconditionally. Since several libxine consumers (e.g. multimedia/phonon and all KDE4) require xcb support in libxine, this removal seems to be reasonable.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/multimedia/libxine/Makefile,v
retrieving revision 1.137
diff -u -r1.137 Makefile
--- Makefile	23 Jan 2009 16:27:47 -0000	1.137
+++ Makefile	24 Jan 2009 19:45:47 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	xine
 PORTVERSION=	1.1.15
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia ipv6
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	lib
@@ -59,7 +59,6 @@
 		GNOMEVFS2 "Enable GnomeVFS2 support" off \
 		PULSEAUDIO "Enable PulseAudio support" off \
 		XVMC "Enable XvMC support" off \
-		XCB "Enable XCB support" on \
 		SMB "Enable SMB protocol support" off \
 		AALIB "Enable aalib support" off \
 		IMAGEMAGICK "Enable ImageMagick support" off \
@@ -137,14 +136,6 @@
 PLIST_SUB+=	WITH_XVMC="@comment "
 .endif
 
-.if defined(WITH_XCB)
-LIB_DEPENDS+=	xcb.2:${PORTSDIR}/x11/libxcb
-PLIST_SUB+=	WITH_XCB=""
-.else
-PLIST_SUB+=	WITH_XCB="@comment "
-CONFIGURE_ARGS+=	--without-xcb
-.endif
-
 .if defined(WITH_SMB)
 LIB_DEPENDS+=	smbclient.0:${PORTSDIR}/net/samba-libsmbclient
 PLIST_SUB+=	WITH_SMB=""
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/multimedia/libxine/pkg-plist,v
retrieving revision 1.51
diff -u -r1.51 pkg-plist
--- pkg-plist	18 May 2008 15:26:45 -0000	1.51
+++ pkg-plist	24 Jan 2009 19:45:39 -0000
@@ -144,8 +144,8 @@
 %%PLUGINSDIR%%/xineplug_vo_out_raw.so
 %%PLUGINSDIR%%/xineplug_vo_out_sdl.so
 %%WITH_VIDIX%%%%PLUGINSDIR%%/xineplug_vo_out_vidix.so
-%%WITH_XCB%%%%PLUGINSDIR%%/xineplug_vo_out_xcbshm.so
-%%WITH_XCB%%%%PLUGINSDIR%%/xineplug_vo_out_xcbxv.so
+%%PLUGINSDIR%%/xineplug_vo_out_xcbshm.so
+%%PLUGINSDIR%%/xineplug_vo_out_xcbxv.so
 %%PLUGINSDIR%%/xineplug_vo_out_xshm.so
 %%PLUGINSDIR%%/xineplug_vo_out_xv.so
 %%WITH_XVMC%%%%PLUGINSDIR%%/xineplug_vo_out_xvmc.so


>Release-Note:
>Audit-Trail:
>Unformatted: