summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnssi Hannula <anssi@mandriva.org>2007-12-01 23:34:12 +0000
committerAnssi Hannula <anssi@mandriva.org>2007-12-01 23:34:12 +0000
commit76ef595d7ce3e00300aa342948755fb5ec211ec0 (patch)
tree26c8f2fe59f086d7e5927e24042d7bcc2c99ef11
parent92ad5196483a91a6539a895b2ab33aeb992b3744 (diff)
downloaddrakx-kbd-mouse-x11-76ef595d7ce3e00300aa342948755fb5ec211ec0.tar
drakx-kbd-mouse-x11-76ef595d7ce3e00300aa342948755fb5ec211ec0.tar.gz
drakx-kbd-mouse-x11-76ef595d7ce3e00300aa342948755fb5ec211ec0.tar.bz2
drakx-kbd-mouse-x11-76ef595d7ce3e00300aa342948755fb5ec211ec0.tar.xz
drakx-kbd-mouse-x11-76ef595d7ce3e00300aa342948755fb5ec211ec0.zip
handle fglrx driver in non-free/backports that has fglrx_dri.so using alternatives
-rw-r--r--NEWS5
-rw-r--r--lib/Xconfig/proprietary.pm3
2 files changed, 7 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 1cbb7fb..8a829e3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+Version 0.37.1 - 2 December 2007, by Anssi Hannula
+
+- handle fglrx driver in non-free/backports that has fglrx_dri.so using
+ alternatives
+
Version 0.37 - 4 October 2007, by Pascal "Pixel" Rigaux
- if we probe a monitor EISA_ID but we don't have corresponding
diff --git a/lib/Xconfig/proprietary.pm b/lib/Xconfig/proprietary.pm
index 2c5e713..947858f 100644
--- a/lib/Xconfig/proprietary.pm
+++ b/lib/Xconfig/proprietary.pm
@@ -87,7 +87,8 @@ sub may_use_Driver2 {
} elsif ($card2->{Driver} eq 'fglrx') {
$check_drv->('fglrx_drv', "fglrx$card2->{DriverVersion}") or return;
$card2->{DriverVersion} eq '-hd2000' || -e "$::prefix$modules_dir/dri/fglrx_dri.so"
- || -e "$::prefix/usr/$lib/dri/fglrx_dri.so" or
+ || -e "$::prefix/usr/$lib/dri/fglrx_dri.so"
+ || -e "$::prefix/usr/$lib/fglrx/dri/fglrx_dri.so" or
log::l("proprietary fglrx_dri.so missing"), return;
log::explanations("Using specific ATI fglrx and DRI drivers");