summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnssi Hannula <anssi@mandriva.org>2007-08-27 13:36:47 +0000
committerAnssi Hannula <anssi@mandriva.org>2007-08-27 13:36:47 +0000
commit291dcc8e534dfcd2d68f37d4a16ac50d47cb57b4 (patch)
tree2c93986eebc67983465821cf06e810094f983c99
parentad1cdab5b9d5ed8e69241ec9ab48d67e270eb287 (diff)
downloaddrakx-kbd-mouse-x11-291dcc8e534dfcd2d68f37d4a16ac50d47cb57b4.tar
drakx-kbd-mouse-x11-291dcc8e534dfcd2d68f37d4a16ac50d47cb57b4.tar.gz
drakx-kbd-mouse-x11-291dcc8e534dfcd2d68f37d4a16ac50d47cb57b4.tar.bz2
drakx-kbd-mouse-x11-291dcc8e534dfcd2d68f37d4a16ac50d47cb57b4.tar.xz
drakx-kbd-mouse-x11-291dcc8e534dfcd2d68f37d4a16ac50d47cb57b4.zip
handle the renamed proprietary ati driver (ati => x11-driver-video-fglrx)
-rw-r--r--NEWS1
-rw-r--r--lib/Xconfig/proprietary.pm4
2 files changed, 3 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 0b28349..d488ee5 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@
to use XFdrake-compatible Identifiers (as suggested by fcrozat)
- add avivo in the Xorg drivers list
- handle libglx.so provided by standard.conf alternative
+- handle x11-driver-video-fglrx instead of ati
Version 0.21 - 8 August 2007, by Pascal "Pixel" Rigaux
diff --git a/lib/Xconfig/proprietary.pm b/lib/Xconfig/proprietary.pm
index 7c77456..217b4cc 100644
--- a/lib/Xconfig/proprietary.pm
+++ b/lib/Xconfig/proprietary.pm
@@ -36,8 +36,8 @@ sub install_matrox_hal {
sub pkgs_for_Driver2 {
my ($Driver2, $do_pkgs) = @_;
- my ($pkg, $base_name) = $Driver2 eq 'fglrx' ? ('ati', 'ati') :
- $Driver2 =~ /^nvidia/ ? ("x11-driver-video-$Driver2", $Driver2) : () or return;
+ my ($pkg, $base_name) = ($Driver2 eq 'fglrx' || $Driver2 =~ /^nvidia/) ?
+ ("x11-driver-video-$Driver2", $Driver2) : () or return;
$do_pkgs->is_available($pkg) or log::l("proprietary package $pkg not available"), return;