ports/185475: multimedia/xbmc: patch to add XRANDR knob

[Juergen Lock]

>Number:         185475
>Category:       ports
>Synopsis:       multimedia/xbmc: patch to add XRANDR knob
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 04 21:00:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Juergen Lock
>Release:        FreeBSD 10.0-RC4 amd64
>Organization:
>Environment:
System: FreeBSD triton10.kn-bremen.de 10.0-RC4 FreeBSD 10.0-RC4 #0 r260130: Tue Dec 31 17:10:01 UTC 2013     root at snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC  amd64


>Description:
	The xrandr code in xbmc seems to cause blank screens in some
	cases (X configured for dual screens in clone mode using
	x11/nvidia-driver here - but something similar also happened
	on the old box with pre-kms radeon on 8.x where I thought
	this was a radeon driver bug.)
	So I had to build xbmc with --disable-xrandr, the patch
	below adds this as an XRANDR knob to the port.

>How-To-Repeat:
	Not sure, use X with second screen in clone mode and then
	try to run xbmc in fullscreen?  (Switching to windowed
	mode with \ brings the display back on this box btw.)

>Fix:

Index: multimedia/xbmc/Makefile
===================================================================
--- multimedia/xbmc/Makefile	(revision 338647)
+++ multimedia/xbmc/Makefile	(working copy)
@@ -55,7 +55,7 @@
 USES=		gmake iconv pkgconfig
 USE_AUTOTOOLS=	autoconf libtool automake libltdl
 GNU_CONFIGURE=	yes
-USE_XORG=	xt xmu xrandr xtst
+USE_XORG=	xt xmu xtst
 USE_GL=		glu
 USE_SDL=	image sdl
 USE_PYTHON=	-2.7
@@ -75,7 +75,7 @@
 
 OPTIONS_DEFINE=	AIRPLAY AIRTUNES AVAHI CEC EXTERNAL_FFMPEG LAME \
 		LIBBLURAY HAL LIRC MYSQL NONFREE PULSEAUDIO RTMP SFTP \
-		SMB VAAPI VDPAU VORBIS WEBSERVER
+		SMB VAAPI VDPAU VORBIS WEBSERVER XRANDR
 AIRPLAY_DESC=	AirPlay support via libplist
 AIRTUNES_DESC=	AirTunes support via libshairport
 CEC_DESC=	CEC adapter support
@@ -85,7 +85,7 @@
 VORBIS_DESC=	Ogg Vorbis audio encoder
 
 OPTIONS_DEFAULT=	AIRPLAY AVAHI CEC LIBBLURAY HAL MYSQL \
-			RTMP SFTP SMB VORBIS WEBSERVER
+			RTMP SFTP SMB VORBIS WEBSERVER XRANDR
 
 .include <bsd.port.pre.mk>
 
@@ -146,6 +146,15 @@
 CONFIGURE_ARGS+=	--disable-libcec
 .endif
 
+.if ${PORT_OPTIONS:MXRANDR}
+CONFIGURE_ARGS+=	--enable-xrandr
+USE_XORG+=	xrandr
+PLIST_SUB+=	XRANDR=""
+.else
+CONFIGURE_ARGS+=	--disable-xrandr
+PLIST_SUB+=	XRANDR="@comment "
+.endif
+
 .if ${PORT_OPTIONS:MEXTERNAL_FFMPEG}
 CONFIGURE_ARGS+=	--enable-external-ffmpeg
 FFMPEG_SUFFIX=	0
Index: multimedia/xbmc/pkg-plist
===================================================================
--- multimedia/xbmc/pkg-plist	(revision 338647)
+++ multimedia/xbmc/pkg-plist	(working copy)
@@ -29,7 +29,7 @@
 lib/xbmc/system/players/paplayer/stsoundlibrary-%%ARCH%%-freebsd.so
 lib/xbmc/system/players/paplayer/timidity-%%ARCH%%-freebsd.so
 lib/xbmc/system/players/paplayer/vgmstream-%%ARCH%%-freebsd.so
-lib/xbmc/xbmc-xrandr
+%%XRANDR%%lib/xbmc/xbmc-xrandr
 lib/xbmc/xbmc.bin
 man/man1/xbmc.bin.1.gz
 man/man1/xbmc.1.gz
>Release-Note:
>Audit-Trail:
>Unformatted: