From 844cfdc5310de38c1540c4bbba5cb79c3216d900 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 8 Aug 2007 19:42:06 +0000
Subject: - handle nvidia-current instead of nvidia97xx (thanks to Anssi) -
 handle x11-driver-video-$nvidia instead of $nvidia

nb: pkg_name_for_Driver2() has been dropped, and pkgs_for_Driver2() arguments
have changed. this allows simplifying install::steps, but causes
incompatibility
---
 lib/Xconfig/card.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/Xconfig/card.pm')

diff --git a/lib/Xconfig/card.pm b/lib/Xconfig/card.pm
index 1db9307..686b3c0 100644
--- a/lib/Xconfig/card.pm
+++ b/lib/Xconfig/card.pm
@@ -73,7 +73,7 @@ sub to_raw_X {
     $raw_X->remove_load_module(modules_dir() . "$_/libglx.so") foreach '/extensions/nvidia', '/extensions/nvidia_legacy', '/extensions';
 
     # remove ModulePath that we added
-    $raw_X->remove_ModulePath(modules_dir() . "/extensions/$_") foreach 'nvidia97xx', 'nvidia96xx', 'nvidia71xx';
+    $raw_X->remove_ModulePath(modules_dir() . "/extensions/$_") foreach 'nvidia97xx', 'nvidia96xx', 'nvidia71xx', 'nvidia-current';
     $raw_X->remove_ModulePath(modules_dir());
     # then may re-add some
     if ($card->{DRI_GLX_SPECIAL}) {
@@ -297,7 +297,7 @@ sub install_server {
 
     if ($card->{Driver2}) {       
 	require Xconfig::proprietary;
-	my @pkgs = Xconfig::proprietary::pkgs_for_Driver2($card, $do_pkgs);
+	my @pkgs = Xconfig::proprietary::pkgs_for_Driver2($card->{Driver2}, $do_pkgs);
 	if (@pkgs && (!$o_in || $o_in->ask_yesorno('', formatAlaTeX(N("There is a proprietary driver available for your video card which may support additional features.
 Do you wish to use it?")), 1))) {
 	    push @packages, @pkgs;
-- 
cgit v1.2.1