From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jan 25 09:20:03 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C5F2C106571A for ; Sun, 25 Jan 2009 09:20:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id A0FED8FC1D for ; Sun, 25 Jan 2009 09:20:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n0P9K3GZ022973 for ; Sun, 25 Jan 2009 09:20:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n0P9K3Zc022966; Sun, 25 Jan 2009 09:20:03 GMT (envelope-from gnats) Resent-Date: Sun, 25 Jan 2009 09:20:03 GMT Resent-Message-Id: <200901250920.n0P9K3Zc022966@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Garrett Cooper Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2161B10656C4 for ; Sun, 25 Jan 2009 09:13:42 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id E9C198FC20 for ; Sun, 25 Jan 2009 09:13:41 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n0P9Df1p036806 for ; Sun, 25 Jan 2009 09:13:41 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id n0P9DfHP036804; Sun, 25 Jan 2009 09:13:41 GMT (envelope-from nobody) Message-Id: <200901250913.n0P9DfHP036804@www.freebsd.org> Date: Sun, 25 Jan 2009 09:13:41 GMT From: Garrett Cooper To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/130976: [PATCH] Upgrade x11/nvidia-driver* to latest X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Jan 2009 09:20:04 -0000 >Number: 130976 >Category: ports >Synopsis: [PATCH] Upgrade x11/nvidia-driver* to latest >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Jan 25 09:20:03 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Garrett Cooper >Release: 8-CURRENT >Organization: n/a >Environment: FreeBSD orangebox.gateway.2wire.net 8.0-CURRENT FreeBSD 8.0-CURRENT #6: Mon Jan 12 21:37:37 PST 2009 gcooper@orangebox.gateway.2wire.net:/usr/obj/usr/src/sys/ORANGEBOX i386 >Description: This is an upgrade of nvidia-driver to the latest stable upstream copy. Combined with the new Xorg, I've seen a performance increase with the new driver, where it no longer consumes as many CPU cycles as it used to under certain circumstances; my method of testing was compiling a few apps in ports or doing make buildworld -- it used to eat up ~100% CPU on just displaying the text in a XFCE4's Terminal app. One thing to note is that the logic in the plist and the Makefile are duplicated in areas -- hence that's why I had to modify both. Please hand over to danfe@ to review and commit. >How-To-Repeat: >Fix: Patch attached with submission follows: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/x11/nvidia-driver/Makefile,v retrieving revision 1.86 diff -r1.86 Makefile 9c9 < DISTVERSION?= 177.80 --- > DISTVERSION?= 180.22 123,124c123,127 < @${MV} -f ${PREFIX}/${MODULESDIR}/libwfb.so \ < ${PREFIX}/${MODULESDIR}/XXX-libwfb.so.%%.${XSERVVERSION} --- > @XORG_OLD_FILE="${PREFIX}/${MODULESDIR}/libwfb.so"; \ > if test -f "$$XORG_OLD_FILE"; then \ > ${MV} -f "$$XORG_OLD_FILE" \ > ${PREFIX}/${MODULESDIR}/XXX-libwfb.so.%%.${XSERVVERSION}; \ > fi Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/x11/nvidia-driver/pkg-plist,v retrieving revision 1.22 diff -r1.22 pkg-plist 38,39c38,39 < @exec mv -f %D/%%MODULESDIR%%/libwfb.so %D/%%MODULESDIR%%/XXX-libwfb.so.%%%%.%%XSERVVERSION%% && ln -sf libnvidia-wfb.so.1 %D/%%MODULESDIR%%/libwfb.so < @unexec mv -f %D/%%MODULESDIR%%/XXX-libwfb.so.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/libwfb.so --- > @exec export XORG_OLD_FILE="%D/%%MODULESDIR%%/libwfb.so"; test -f "$XORG_OLD_FILE" && mv -f "$XORG_OLD_FILE" "%D/%%MODULESDIR%%/XXX-libwfb.so.%%%%.%%XSERVVERSION%%" && ln -sf libnvidia-wfb.so.1 %D/%%MODULESDIR%%/libwfb.so > @unexec export XORG_NEW_FILE="%D/%%MODULESDIR%%/XXX-libwfb.so.%%%%.%%XSERVVERSION%%"; test -f "$XORG_NEW_FILE" && mv -f "$XORG_NEW_FILE" %D/%%MODULESDIR%%/libwfb.so >Release-Note: >Audit-Trail: >Unformatted: