Bug 187724 - [PATCH] games/linux-rtcw: Introduce NVIDIA option
Summary: [PATCH] games/linux-rtcw: Introduce NVIDIA option
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Steve Wills
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-03-19 08:40 UTC by Johannes Meixner
Modified: 2014-03-20 03:40 UTC (History)
0 users

See Also:


Attachments
linux-rtcw-1.41.b.patch (921 bytes, patch)
2014-03-19 08:40 UTC, Johannes Meixner
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Johannes Meixner 2014-03-19 08:40:01 UTC
- 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)
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2014-03-19 08:40:06 UTC
Responsible Changed
From-To: freebsd-ports-bugs->swills

swills@ wants this submitter's PRs (via the GNATS Auto Assign Tool)
Comment 2 dfilter service freebsd_committer freebsd_triage 2014-03-20 03:36:28 UTC
Author: swills
Date: Thu Mar 20 03:36:25 2014
New Revision: 348660
URL: http://svnweb.freebsd.org/changeset/ports/348660
QAT: https://qat.redports.org/buildarchive/r348660/

Log:
  - Introduce NVIDIA_GL option
  
  PR:		ports/187724
  Submitted by:	Johannes Jost Meixner <xmj@chaot.net>

Modified:
  head/games/linux-rtcw/Makefile

Modified: head/games/linux-rtcw/Makefile
==============================================================================
--- head/games/linux-rtcw/Makefile	Thu Mar 20 02:47:28 2014	(r348659)
+++ head/games/linux-rtcw/Makefile	Thu Mar 20 03:36:25 2014	(r348660)
@@ -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 @@ COMMENT=	Return to Castle Wolfenstein (L
 
 USES=		makeself
 USE_LINUX=	yes
-USE_LINUX_APPS=	dri xorglibs
+USE_LINUX_APPS=	xorglibs
 NO_WRKSUBDIR=	yes
 
 WRAPPERS=	wolf wolfded wolfsp
@@ -25,7 +26,16 @@ PORTSCOUT=	skipv:1.41-3
 
 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:
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Steve Wills freebsd_committer freebsd_triage 2014-03-20 03:36:38 UTC
State Changed
From-To: open->closed

Committed. Thanks!