small tweaks

5 files changed, 61 insertions, 49 deletions

diff --git a/media-video/nvidia-kernel/ChangeLog b/media-video/nvidia-kernel/ChangeLog
index 54baef5c3604..02bbea89c587 100644
--- a/media-video/nvidia-kernel/ChangeLog
+++ b/media-video/nvidia-kernel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/nvidia-kernel
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.13 2002/12/11 20:52:47 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.14 2002/12/11 21:15:56 azarah Exp $
+
+  11 Dec 2002; Martin Schlemmer <azarah@gentoo.org>:
+  Just move $FILESDIR/nvidia-$PV to nvidia-1.1 for easier maintaining.
+  Add a ewarn in pkg_postinst() about the driver name changing.  Add
+  '-alpha' to KEYWORDS.
 
 *nvidia-kernel-1.0.4191 (11 Dec 2002)
 
@@ -10,8 +15,8 @@
   package from nvidia.  Update the modules.d file for new module
   name.
 
-\* Autoupdate keywords (12-6-02)
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> changed sparc ~sparc keywords
+  06 Dec 2002; Rodney Rees <manson@gentoo.org>:
+  Changed sparc ~sparc keywords
  
 *nvidia-kernel-1.0.3123-r2 (8 Dec 2002)
 
diff --git a/media-video/nvidia-kernel/files/make_nvidia_devices.sh b/media-video/nvidia-kernel/files/make_nvidia_devices.sh
deleted file mode 100644
index 900be6effbfa..000000000000
--- a/media-video/nvidia-kernel/files/make_nvidia_devices.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-#
-# Written by Arcady Genkin <agenkin@thpoon.com>
-#
-# Run this script as root.
-
-mk_node () {
-    local dev="$1"
-    local major="$2"
-    local minor="$3"
-    local owner=root
-    local group=video
-    local mode=0660
-
-    rm -f "${dev}"
-    if /bin/mknod -m "${mode}" "${dev}" c "$major" "${minor}"
-    then
-        chown "${owner}" "${dev}"
-        chgrp "${group}" "${dev}"
-    else
-        echo "Could not create ${dev}." 1>&2
-    fi
-}
-
-mk_dev_nodes () {
-    local nv_major=195
-    
-    for i in 0 1 2 3
-    do
-        mk_node "/dev/nvidia${i}" "${nv_major}" "${i}"
-    done
-
-    mk_node "/dev/nvidiactl" "${nv_major}" 255
-}
-
-mk_dev_nodes
-
-echo ""
-echo "*** You might want to add yourself to 'video' group."
-echo ""
diff --git a/media-video/nvidia-kernel/files/nvidia-1.1 b/media-video/nvidia-kernel/files/nvidia-1.1
new file mode 100644
index 000000000000..5e3e3285595e
--- /dev/null
+++ b/media-video/nvidia-kernel/files/nvidia-1.1
@@ -0,0 +1,15 @@
+# Nvidia drivers support
+alias char-major-195 nvidia
+alias /dev/nvidiactl char-major-195
+
+# To tweak the driver the following options can be used, note that
+# you should be careful, as it could cause instability!!
+#
+#   To enable Side Band Adressing:  NVreg_EnableAGPSBA=1
+#
+#   To enable Fast Writes: NVreg_EnableAGPFW=1
+#
+# To enable both for instance, uncomment following line:
+#
+#options nvidia NVreg_EnableAGPSBA=1 NVreg_EnableAGPFW=1
+
diff --git a/media-video/nvidia-kernel/files/nvidia.1.0.4191 b/media-video/nvidia-kernel/files/nvidia.1.0.4191
deleted file mode 100644
index f8c5ed8cee6c..000000000000
--- a/media-video/nvidia-kernel/files/nvidia.1.0.4191
+++ /dev/null
@@ -1 +0,0 @@
-alias char-major-195 nvidia.o
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.4191.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.4191.ebuild
index 9445d81879f6..91f4fba1ab22 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.4191.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.4191.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.4191.ebuild,v 1.2 2002/12/11 20:54:36 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.4191.ebuild,v 1.3 2002/12/11 21:15:56 azarah Exp $
 
 inherit eutils
 
@@ -20,12 +20,41 @@ HOMEPAGE="http://www.nvidia.com/"
 # modules for other kernels.
 LICENSE="NVIDIA"
 SLOT="${KV}"
-KEYWORDS="~x86 -ppc -sparc "
+KEYWORDS="~x86 -ppc -sparc -alpha"
 
 DEPEND="virtual/linux-sources
 	>=sys-apps/portage-1.9.10"
 
 
+src_unpack() {
+	unpack ${A}
+
+	# Next section applies patches for linux-2.5 kernel, or if
+	# linux-2.4, the page_alloc.c patch courtesy of NVIDIA Corporation.
+	# All these are from:
+	#
+	#   http://www.minion.de/nvidia/
+	#
+	# Many thanks to Christian Zander <zander@minion.de> for bringing
+	# these to us, and being so helpful to select which to use.
+	# This should close bug #9704.
+	
+#	local KV_major="`uname -r | cut -d. -f1`"
+#	local KV_minor="`uname -r | cut -d. -f2`"
+#
+#	cd ${S}
+#	if [ "${KV_major}" -eq 2 -a "${KV_minor}" -eq 5 ]
+#	then
+#		EPATCH_SINGLE_MSG="Applying tasklet patch for kernel 2.5..." \
+#		epatch ${FILESDIR}/${NV_PACKAGE}-2.5-tl.diff
+#		EPATCH_SINGLE_MSG="Applying page_alloc.c patch..." \
+#		epatch ${FILESDIR}/${NV_PACKAGE}-2.5-tl-pa.diff
+#	else
+#		EPATCH_SINGLE_MSG="Applying page_alloc.c patch..." \
+#		epatch ${FILESDIR}/${NV_PACKAGE}-pa.diff
+#	fi
+}
+
 src_compile() {
 	# Portage should determine the version of the kernel sources
 	check_KV
@@ -44,7 +73,7 @@ src_install() {
     
 	# Add the aliases
 	insinto /etc/modules.d
-	newins ${FILESDIR}/nvidia.${PV} nvidia
+	newins ${FILESDIR}/nvidia-1.1 nvidia
 
 	# Docs
 	dodoc ${S}/README
@@ -65,8 +94,12 @@ pkg_postinst() {
 		fi
 	fi
 
+	echo
 	einfo "If you are not using devfs, loading the module automatically at"
-	einfo "boot up, you need to add \"nvidia.o\" to your /etc/modules.autoload."
-	einfo "Please note this is a different module name than previos versions."
+	einfo "boot up, you need to add \"nvidia\" to your /etc/modules.autoload."
+	echo
+	ewarn "Please note that the driver name changed from \"NVdriver\""
+	ewarn "to \"nvidia.o\"."
+	echo
 }