From owner-cvs-all@FreeBSD.ORG Fri Jul 4 06:56:05 2003 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9C43237B401; Fri, 4 Jul 2003 06:56:05 -0700 (PDT) Received: from mx.nsu.ru (mx.nsu.ru [212.192.164.5]) by mx1.FreeBSD.org (Postfix) with ESMTP id A06D344008; Fri, 4 Jul 2003 06:56:03 -0700 (PDT) (envelope-from danfe@regency.nsu.ru) Received: from mail by mx.nsu.ru with drweb-scanned (Exim 3.36 #1 (Debian)) id 19YRCE-0004hX-00; Fri, 04 Jul 2003 21:05:54 +0700 Received: from regency.nsu.ru ([193.124.210.26]) by mx.nsu.ru with esmtp (Exim 3.36 #1 (Debian)) id 19YRC4-0004fw-00; Fri, 04 Jul 2003 21:05:44 +0700 Received: from regency.nsu.ru (localhost [127.0.0.1]) by regency.nsu.ru (8.12.8/8.12.8) with ESMTP id h64DtlBh025809; Fri, 4 Jul 2003 20:55:47 +0700 (NOVST) (envelope-from danfe@regency.nsu.ru) Received: (from danfe@localhost) by regency.nsu.ru (8.12.8/8.12.8/Submit) id h64DtlJ0025717; Fri, 4 Jul 2003 20:55:47 +0700 (NOVST) Date: Fri, 4 Jul 2003 20:55:47 +0700 From: Alexey Dokuchaev To: "Sergey A. Osokin" Message-ID: <20030704135547.GA24680@regency.nsu.ru> References: <200307041353.h64DrJaw040542@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="AhhlLboLdkugWU4S" Content-Disposition: inline In-Reply-To: <200307041353.h64DrJaw040542@repoman.freebsd.org> User-Agent: Mutt/1.4i X-Envelope-To: osa@freebsd.org, ports-committers@freebsd.org, cvs-ports@freebsd.org, cvs-all@freebsd.org X-Bogosity: No, tests=bogofilter, spamicity=0.000000, version=0.13.6.3 X-Spam-Status: No, hits=-104.3 required=5.0 tests=BOGOFILTER_TEST_PASS,IN_REP_TO,PATCH_UNIFIED_DIFF, REFERENCES,UPPERCASE_25_50,USER_AGENT_MUTT, USER_IN_WHITELIST version=2.55 X-Spam-Level: X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp) cc: cvs-ports@freebsd.org cc: cvs-all@freebsd.org cc: ports-committers@freebsd.org Subject: x11/nvidia-driver X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jul 2003 13:56:06 -0000 --AhhlLboLdkugWU4S Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi there! This is an update of x11/nvidia-driver port to the official version 1.0 of NVidia binary driver/libs set released on July 1, 2003. All of the patches seem to be integrated in this release, so files/ directory would not needed. Even patches from www.minion.de/nvidia.html are included, thus I believe PR ports/53212 can be closed now, as well as ports/51447. I've also eliminated the use of grep (now use ${GREP}) but ${PKG_INFO} still does not work, and I didn't have time to figure it out why. One new knob was added (WITH_NVIDIA_HACKS), and others two are now properly documented and prompted in Makefile, so users are aware of them. Pkg-descr and pkg-message updated accordingly. I also have desire to maintain this port in the future, since it's of a nigh importance to me and currenly lacks a maintainer. ./danfe --AhhlLboLdkugWU4S Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="nv.diff" Index: Makefile =================================================================== RCS file: /home/ncvs/ports/x11/nvidia-driver/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- Makefile 7 Jun 2003 18:53:22 -0000 1.8 +++ Makefile 4 Jul 2003 10:49:47 -0000 @@ -1,63 +1,75 @@ -# New ports collection makefile for: nvidia-driver -# Date created: 4 December 2002 -# Whom: Stijn Hoop +# New ports collection makefile for: nvidia-driver +# Date created: 4 December 2002 +# Whom: Stijn Hoop # -# $FreeBSD: ports/x11/nvidia-driver/Makefile,v 1.8 2003/06/07 18:53:22 olgeni Exp $ +# $FreeBSD$ # PORTNAME= nvidia-driver -PORTVERSION= 1.0.3203 -PORTREVISION= 1 +PORTVERSION= 1.0.4365 +PORTREVISION= 2 CATEGORIES= x11 -MASTER_SITES= http://download.nvidia.com/freebsd/1.0-3203/ -DISTNAME= NVIDIA_FreeBSD-${PORTVERSION:S/0./0-/} +MASTER_SITES= http://download.nvidia.com/freebsd/1.0-4365/ +DISTNAME= NVIDIA-FreeBSD-x86-${PORTVERSION:S/0./0-/} -MAINTAINER= ports@freebsd.org +MAINTAINER= danfe@regency.nsu.ru COMMENT= NVidia graphics card binary drivers for hardware OpenGL rendering USE_X_PREFIX= yes NO_PACKAGE= should be recompiled for a particular FreeBSD kernel -# XXX Should use ${PKG_INFO} and ${GREP} -XSERVVERSION!= /usr/sbin/pkg_info -O x11-servers/XFree86-4-Server 2>/dev/null | grep Server- || true -XLIBVERSION!= /usr/sbin/pkg_info -O x11/XFree86-4-libraries 2>/dev/null | grep libraries- || true +.include + +# XXX Should use ${PKG_INFO} XXX +# +XSERVVERSION!= /usr/sbin/pkg_info -O x11-servers/XFree86-4-Server 2>/dev/null | ${GREP} Server- || true +XLIBVERSION!= /usr/sbin/pkg_info -O x11/XFree86-4-libraries 2>/dev/null | ${GREP} libraries- || true PLIST_SUB= XSERVVERSION=${XSERVVERSION} XLIBVERSION=${XLIBVERSION} \ - LINUXBASE=${LINUXBASE} + LINUXBASE=${LINUXBASE} NVVERSION=4365 .if !defined(WITHOUT_LINUX) USE_LINUX= yes .endif -.include - .if ${OSVERSION} < 500000 PLIST_SUB+= FREEBSD5="@comment " FREEBSD4="" .else PLIST_SUB+= FREEBSD5="" FREEBSD4="@comment " .endif -.if ${OSVERSION} > 500000 && ${OSVERSION} < 500105 -IGNORE= "You need a more recent version of -CURRENT for this driver" +pre-everything:: +.if !defined(WITH_FREEBSD_AGP) + @${ECHO_MSG} "Define WITH_FREEBSD_AGP to use FreeBSD AGP GART driver" +.endif +.if !defined(FORCE_AGP_RATE) + @${ECHO_MSG} "Define FORCE_AGP_RATE to limit the driver to lower speeds" +.endif +.if !defined(WITH_NVIDIA_HACKS) + @${ECHO_MSG} "Define WITH_NVIDIA_HACKS to enable work-arounds to override basic AGP setup" .endif -.if defined(WITH_FREEBSD_AGP) || defined(FORCE_AGP_RATE) +.if defined(WITH_FREEBSD_AGP) || defined(FORCE_AGP_RATE) || defined(WITH_NVIDIA_HACKS) USE_REINPLACE= yes post-patch: -.if defined(WITH_FREEBSD_AGP) +. if defined(WITH_FREEBSD_AGP) @${REINPLACE_CMD} "s/undef USE_OS_AGP_GART/define USE_OS_AGP_GART/" \ ${WRKSRC}/src/nv-freebsd.h -.endif -.if defined(FORCE_AGP_RATE) - @${REINPLACE_CMD} "s/4, 0/4, 1/" ${WRKSRC}/src/nvidia_os_registry.c -.endif +. endif +. if defined(FORCE_AGP_RATE) + @${REINPLACE_CMD} 's/NVreg_ReqAGPRate,[[:blank:]]*0/NVreg_ReqAGPRate, 1/' ${WRKSRC}/src/nvidia_os_registry.c +. endif +. if defined(WITH_NVIDIA_HACKS) + @${REINPLACE_CMD} 's/NVreg_UpdateKernelAGP,[[:blank:]]*1/NVreg_UpdateKernelAGP, 0/' ${WRKSRC}/src/nvidia_os_registry.c +. endif .endif -.if defined(WITHOUT_LINUX) pre-install: +.if defined(WITHOUT_LINUX) @${MKDIR} ${LINUXBASE}/usr/lib .endif + @(kldstat -n linux || kldload linux) post-install: .if ${OSVERSION} < 500000 Index: distinfo =================================================================== RCS file: /home/ncvs/ports/x11/nvidia-driver/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- distinfo 20 Jan 2003 07:29:06 -0000 1.1 +++ distinfo 4 Jul 2003 10:49:47 -0000 @@ -1 +1 @@ -MD5 (NVIDIA_FreeBSD-1.0-3203.tar.gz) = b982db9e898a0f3a46c2bf9d15c320d2 +MD5 (NVIDIA-FreeBSD-x86-1.0-4365.tar.gz) = e14d9f2668746ee4d8b47e1c9dbc78af Index: pkg-descr =================================================================== RCS file: /home/ncvs/ports/x11/nvidia-driver/pkg-descr,v retrieving revision 1.1 diff -u -r1.1 pkg-descr --- pkg-descr 20 Jan 2003 07:29:06 -0000 1.1 +++ pkg-descr 4 Jul 2003 10:49:47 -0000 @@ -1,6 +1,4 @@ -These are the NVidia binary drivers for hardware OpenGL rendering in X, using -the GLX/DRI extensions. +These are the official NVidia binary drivers for hardware OpenGL rendering +in X, using the GLX extensions. -***WARNING***: THESE ARE BETA QUALITY DRIVERS AND MAY RENDER YOUR SYSTEM - UNSTABLE, UNUSABLE OR PRONE TO LOCKUP! INSTALL AT YOUR - OWN RISK! +WWW: http://www.nvidia.com/ Index: pkg-message =================================================================== RCS file: /home/ncvs/ports/x11/nvidia-driver/pkg-message,v retrieving revision 1.2 diff -u -r1.2 pkg-message --- pkg-message 4 Jun 2003 17:15:04 -0000 1.2 +++ pkg-message 4 Jul 2003 10:49:47 -0000 @@ -1,20 +1,16 @@ - -***WARNING***: THESE ARE BETA QUALITY DRIVERS AND MAY RENDER YOUR SYSTEM - UNSTABLE, UNUSABLE OR PRONE TO LOCKUP! INSTALL AT YOUR - OWN RISK! - To use these drivers, make sure that you have loaded the nvidia kernel module, by doing -# kldload nvidia + # kldload nvidia If you compile this package with WITH_FREEBSD_AGP=yes, you must load the agp.ko kernel module *at boot time* by putting the following line into your /boot/loader.conf: -agp_load="YES" + agp_load="YES" + +or have your kernel compiled with "device agp". Otherwise the nvidia kernel module will not load. See ${PREFIX}/share/doc/NVIDIA/README for more information. - Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/x11/nvidia-driver/pkg-plist,v retrieving revision 1.2 diff -u -r1.2 pkg-plist --- pkg-plist 7 Jun 2003 18:53:22 -0000 1.2 +++ pkg-plist 4 Jul 2003 10:49:47 -0000 @@ -48,7 +48,7 @@ %%FREEBSD4%%@unexec rm -f /dev/nvidia3 %%FREEBSD4%%@unexec rm -f /dev/nvidiactl @cwd %%LINUXBASE%% -usr/lib/libGL.so.1.0.3203 -usr/lib/libGLcore.so.1.0.3203 -@exec ln -sf %D/usr/lib/libGL.so.1.0.3203 %D/usr/lib/libGL.so.1 -@exec ln -sf %D/usr/lib/libGLcore.so.1.0.3203 %D/usr/lib/libGLcore.so.1 +usr/lib/libGL.so.1.0.%%NVVERSION%% +usr/lib/libGLcore.so.1.0.%%NVVERSION%% +@exec ln -sf %D/usr/lib/libGL.so.1.0.%%NVVERSION%% %D/usr/lib/libGL.so.1 +@exec ln -sf %D/usr/lib/libGLcore.so.1.0.%%NVVERSION%% %D/usr/lib/libGLcore.so.1 --AhhlLboLdkugWU4S--