Date: Wed, 19 Mar 2014 10:38:07 +0200 (EET) From: Johannes Jost Meixner <xmj@chaot.net> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/187724: [PATCH] games/linux-rtcw: Introduce NVIDIA option Message-ID: <4006431645714072287.enqueue@mx12.chaot.net> Resent-Message-ID: <201403190840.s2J8e1TN016236@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 187724
>Category: ports
>Synopsis: [PATCH] games/linux-rtcw: Introduce NVIDIA option
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Mar 19 08:40:01 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Johannes Jost Meixner
>Release: FreeBSD 11.0-CURRENT amd64
>Organization:
Goldener Grund OUe
>Environment:
System: FreeBSD mx12.chaot.net 11.0-CURRENT FreeBSD 11.0-CURRENT #5: Sun Mar 16 14:38:54 EET 2014
>Description:
- Introduce NVIDIA_GL option
Currently, games/linux-rtcw is broken if nvidia-driver is installed, as it
unconditionally depends on Linux dri. With the patch attached, Makefile allows
setting the NVIDIA_GL option (much like any other games/linux-* port) which will
depend on x11/nvidia-driver, or alternatively introduce the Linux dri.
Generated with FreeBSD Port Tools 1.00.2014.03.18 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:
--- linux-rtcw-1.41.b.patch begins here ---
Index: Makefile
===================================================================
--- Makefile (revision 348608)
+++ Makefile (working copy)
@@ -3,6 +3,7 @@
PORTNAME= rtcw
DISTVERSION= 1.41b
+PORTREVISION= 1
CATEGORIES= games linux
MASTER_SITES= ${MASTER_SITE_IDSOFTWARE}
MASTER_SITE_SUBDIR= wolf/linux
@@ -15,7 +16,7 @@
USES= makeself
USE_LINUX= yes
-USE_LINUX_APPS= dri xorglibs
+USE_LINUX_APPS= xorglibs
NO_WRKSUBDIR= yes
WRAPPERS= wolf wolfded wolfsp
@@ -25,8 +26,17 @@
PORTDOCS= *
-OPTIONS_DEFINE= DOCS
+OPTIONS_DEFINE= DOCS NVIDIA_GL
+NVIDIA_GL_DESC= Use GL driver from nvidia-driver
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNVIDIA_GL}
+RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+.else
+USE_LINUX_APPS+= dri
+.endif
+
# XXX: should probably be converted to use the LICENSE framework
post-extract:
@${MV} ${WRKSRC}/pb/PB_EULA.txt ${WRKSRC}
--- linux-rtcw-1.41.b.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4006431645714072287.enqueue>