diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-06-13 07:21:40 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-06-13 07:21:40 +0000 |
| commit | 3e716b2bfe7a907639cefa3bba8c493e60ac530b (patch) | |
| tree | 706fce36a347eba6b68a171bb6ced646249cda64 | |
| parent | 714abb7ede1ae6c03e396ac4a4ac72a1cea90f47 (diff) | |
| download | drakx-kbd-mouse-x11-3e716b2bfe7a907639cefa3bba8c493e60ac530b.tar drakx-kbd-mouse-x11-3e716b2bfe7a907639cefa3bba8c493e60ac530b.tar.gz drakx-kbd-mouse-x11-3e716b2bfe7a907639cefa3bba8c493e60ac530b.tar.bz2 drakx-kbd-mouse-x11-3e716b2bfe7a907639cefa3bba8c493e60ac530b.tar.xz drakx-kbd-mouse-x11-3e716b2bfe7a907639cefa3bba8c493e60ac530b.zip | |
- XFdrake:
o ensure we don't drop non-main "Device" (when modifying "Options", #41410)
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | lib/Xconfig/card.pm | 3 |
2 files changed, 5 insertions, 1 deletions
@@ -1,3 +1,6 @@ +- XFdrake: + o ensure we don't drop non-main "Device" (when modifying "Options" (#41410) + Version 0.58 - 9 June 2008 - XFdrake: diff --git a/lib/Xconfig/card.pm b/lib/Xconfig/card.pm index c972a31..e121339 100644 --- a/lib/Xconfig/card.pm +++ b/lib/Xconfig/card.pm @@ -36,7 +36,7 @@ my @xfree4_Drivers = ((arch() =~ /^sparc/ ? qw(sunbw2 suncg14 suncg3 suncg6 sunf sub from_raw_X { my ($raw_X) = @_; - my $device = $raw_X->get_device or die "no card configured"; + my ($device, @cards) = $raw_X->get_devices or die "no card configured"; my $card = { use_DRI_GLX => eval { any { /dri/ } $raw_X->get_modules }, @@ -45,6 +45,7 @@ sub from_raw_X { if_($device->{Driver} eq 'nvidia', DriverVersion => readlink("$::prefix/etc/alternatives/gl_conf") =~ m!nvidia(.*)/! ? $1 : '97xx'), + if_(@cards, cards => \@cards), }; add_to_card__using_Cards($card, $card->{BoardName}); $card; |