diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | lib/Xconfig/card.pm | 17 | ||||
| -rw-r--r-- | lib/Xconfig/xfree.pm | 3 | ||||
| -rw-r--r-- | lib/keyboard.pm | 43 | ||||
| -rw-r--r-- | lib/mouse.pm | 43 |
5 files changed, 10 insertions, 97 deletions
@@ -1,3 +1,4 @@ +- drop support for Alpha/PPC/SPARC - XFdrake o do not try uselessly to install x11-driver-video-modesetting o when testing X: diff --git a/lib/Xconfig/card.pm b/lib/Xconfig/card.pm index b87dce8..d4b5b6d 100644 --- a/lib/Xconfig/card.pm +++ b/lib/Xconfig/card.pm @@ -28,7 +28,7 @@ my %VideoRams = ( 65536 => N_("64 MB or more"), ); -my @xfree4_Drivers = ((arch() =~ /^sparc/ ? qw(sunbw2 suncg14 suncg3 suncg6 sunffb sunleo suntcx) : +my @xfree4_Drivers = (( qw(apm ark ast chips cirrus i128 i740 intel mga neomagic newport nouveau nv openchrome psb qxl rendition s3 s3virge savage siliconmotion sis sisusb @@ -59,12 +59,6 @@ sub to_raw_X { my @cards = ($card, @{$card->{cards} || []}); - foreach (@cards) { - if (arch() =~ /ppc/ && member($_->{Driver}, qw(r128 radeon))) { - $_->{UseFBDev} = 1; - } - } - $raw_X->set_devices(@cards); $raw_X->get_ServerLayout->{Xinerama} = { commented => !$card->{Xinerama}, Option => 1 } @@ -119,12 +113,6 @@ sub probe() { if (@cards >= 2 && $cards[0]{card_name} eq $cards[1]{card_name} && $cards[0]{card_name} eq 'Intel 830 - 965') { shift @cards; } - #- take a default on sparc if nothing has been found. - if (arch() =~ /^sparc/ && !@cards) { - log::l("Using probe with /proc/fb as nothing has been found!"); - my $s = cat_("/proc/fb"); - @cards = { server => $s =~ /Mach64/ ? "Mach64" : $s =~ /Permedia2/ ? "3DLabs" : "Sun24" }; - } #- disabling MULTI_HEAD when not available foreach (@cards) { @@ -138,8 +126,7 @@ sub probe() { #- in case of only one cards, remove all BusID reference, this will avoid #- need of change of it if the card is moved. - #- on many PPC machines, card is on-board, BusID is important, leave? - if (@cards == 1 && !$cards[0]{MULTI_HEAD} && arch() !~ /ppc/) { + if (@cards == 1 && !$cards[0]{MULTI_HEAD}) { delete $cards[0]{BusID}; } diff --git a/lib/Xconfig/xfree.pm b/lib/Xconfig/xfree.pm index 08221e7..c235084 100644 --- a/lib/Xconfig/xfree.pm +++ b/lib/Xconfig/xfree.pm @@ -841,7 +841,7 @@ $default_header .= <<'END'; EndSection END -our $default_ModeLine = arch() =~ /ppc/ ? <<'END_PPC' : <<'END'; +our $default_ModeLine = <<'END'; # Apple iMac modes ModeLine "1024x768" 78.525 1024 1049 1145 1312 768 769 772 800 +hsync +vsync ModeLine "800x600" 62.357 800 821 901 1040 600 601 604 632 +hsync +vsync @@ -862,7 +862,6 @@ our $default_ModeLine = arch() =~ /ppc/ ? <<'END_PPC' : <<'END'; ModeLine "1280x1024" 135 1280 1288 1392 1664 1024 1027 1030 1064 # Another variation ModeLine "1280x1024" 134.989 1280 1317 1429 1688 1024 1025 1028 1066 +hsync +vsync -END_PPC # TV fullscreen mode or DVD fullscreen output. # 768x576 @ 79 Hz, 50 kHz hsync ModeLine "768x576" 50.00 768 832 846 1000 576 590 595 630 diff --git a/lib/keyboard.pm b/lib/keyboard.pm index dceda25..8dbb27a 100644 --- a/lib/keyboard.pm +++ b/lib/keyboard.pm @@ -181,22 +181,6 @@ my @usb2keyboard = #- #- note: there seems to be a limit of 4 stackable xkb layouts my %keyboards = ( -arch() =~ /^sparc/ ? ( -#- do we still support those? all but "se" and "us" have dissapeared from -#- symbols/sun/ directory in Xorg package. - "cz" => [ N_("_: keyboard\nCzech (QWERTZ)"), "sunt5-cz-us", "cz", "", 0 ], - "de" => [ N_("_: keyboard\nGerman"), "sunt5-de-latin1", "de", "", 0 ], - "dvorak" => [ N_("_: keyboard\nDvorak"), "sundvorak", "dvorak", "", 0 ], - "es" => [ N_("_: keyboard\nSpanish"), "sunt5-es", "es", "", 0 ], - "fi" => [ N_("_: keyboard\nFinnish"), "sunt5-fi-latin1", "fi", "", 0 ], - "fr" => [ N_("_: keyboard\nFrench"), "sunt5-fr-latin1", "fr", "", 0 ], - "gb" => [ N_("UK keyboard"), "sunt5-uk", "gb", "", 0 ], - "no" => [ N_("_: keyboard\nNorwegian"), "sunt4-no-latin1", "no", "", 0 ], - "pl" => [ N_("_: keyboard\nPolish"), "sun-pl-altgraph", "pl", "", 0 ], - "ru" => [ N_("_: keyboard\nRussian"), "sunt5-ru", "ru", "", 1 ], - "se" => [ N_("_: keyboard\nSwedish"), "sunt5-fi-latin1", "se", "", 0 ], - "us" => [ N_("US keyboard"), "sunkeymap", "us", "", 0 ], -) : ( "al" => [ N_("_: keyboard\nAlbanian"), "al", "al", "", 0 ], #"am_old" => [ N_("_: keyboard\nArmenian (old)"), "am_old", "am", "", 1 ], # X11 variant BROKEN (was: am(old) ) "am" => [ N_("_: keyboard\nArmenian (typewriter)"), "am-armscii8", "am", "", 1 ], @@ -332,7 +316,6 @@ arch() =~ /^sparc/ ? ( # old XKB layout "vn" => [ N_("_: keyboard\nVietnamese \"numeric row\" QWERTY"), "vn-tcvn", "vn", "", 0 ], "yu" => [ N_("_: keyboard\nYugoslavian (latin)"), "sr", "srp", "latin", 0 ], -), ); #- list of possible choices for the key combinations to toggle XKB groups @@ -412,7 +395,7 @@ key to switch between the different keyboard layouts."))); # used by rescue's make_rescue_img: sub loadkeys_files { my ($err) = @_; - my $archkbd = arch() =~ /^sparc/ ? "sun" : arch() =~ /i.86|x86_64/ ? "i386" : arch() =~ /ppc/ ? "mac" : arch(); + my $archkbd = arch() =~ /i.86|x86_64/ ? "i386" : arch(); my $p = "/usr/lib/kbd/keymaps/$archkbd"; my $post = ".map.gz"; my %trans = ("cz-latin2" => "cz-lat2"); @@ -536,9 +519,8 @@ sub default_XkbModel { my $Layout = _keyboard2xkbl($keyboard); - (arch() =~ /sparc/ ? 'sun' : - $Layout eq 'jp' ? 'jp106' : - $Layout eq 'br' ? 'abnt2' : 'pc105'); + $Layout eq 'jp' ? 'jp106' : + $Layout eq 'br' ? 'abnt2' : 'pc105'; } sub keyboard2full_xkb { @@ -577,16 +559,7 @@ sub _setxkbmap { sub setup_install { my ($keyboard) = @_; - return if arch() =~ /^sparc/ || $::local_install; - - #- Xpmac does not map keys quite right - if (arch() =~ /ppc/ && !$::testing && $ENV{DISPLAY}) { - log::l("Fixing Mac keyboard"); - run_program::run('xmodmap', "-e", "keycode 59 = BackSpace"); - run_program::run('xmodmap', "-e", "keycode 131 = Shift_R"); - run_program::run('xmodmap', "-e", "add shift = Shift_R"); - return; - } + return if $::local_install; my $kmap = keyboard2kmap($keyboard) or return; @@ -650,15 +623,7 @@ sub write { $xorgconf .= "EndSection\n"; output_p("$::prefix/etc/X11/xorg.conf.d/00-keyboard.conf", $xorgconf); - if (arch() =~ /ppc/) { - my $s = "dev.mac_hid.keyboard_sends_linux_keycodes = 1\n"; - substInFile { - $_ = '' if /^\Qdev.mac_hid.keyboard_sends_linux_keycodes/; - $_ .= $s if eof; - } "$::prefix/etc/sysctl.d/51-drakx.conf"; - } else { run_program::rooted($::prefix, 'dumpkeys', '>', '/etc/sysconfig/console/default.kmap') or log::l("dumpkeys failed"); - } run_program::run('mageia-setup-keyboard'); } diff --git a/lib/mouse.pm b/lib/mouse.pm index ef1d272..c6d8cc5 100644 --- a/lib/mouse.pm +++ b/lib/mouse.pm @@ -19,13 +19,6 @@ use any; use log; sub _all_mice() { - arch() =~ /^sparc/ ? -( - 'sunmouse' => - [ [ 'sunmouse' ], - [ [ 3, 'sun', 'sun', N_("Sun - Mouse") ] - ] ] -) : ( 'PS/2' => [ [ 'psaux' ], @@ -74,8 +67,8 @@ sub _all_mice() { ] ], N_("busmouse") => - [ [ arch() eq 'ppc' ? 'adbmouse' : ('atibm', 'inportbm', 'logibm') ], - [ if_(arch() eq 'ppc', [ 1, 'Busmouse', 'BusMouse', N_("1 button") ]), + [ [ ('atibm', 'inportbm', 'logibm') ], + [ [ 2, 'Busmouse', 'BusMouse', N_("2 buttons") ], [ 3, 'Busmouse', 'BusMouse', N_("3 buttons") ], [ 3, 'Busmouse', 'BusMouse', N_("3 buttons with Wheel emulation"), 'wheel' ], @@ -132,8 +125,6 @@ my %mouse_btn_keymap = ( 117 => "Num: =", 96 => "Enter", ); -sub _ppc_one_button_keys() { keys %mouse_btn_keymap } -sub _ppc_one_button_key2text { $mouse_btn_keymap{$_[0]} } my @mouses_fields = qw(nbuttons MOUSETYPE Protocol name EmulateWheel); @@ -177,18 +168,6 @@ sub write { }); various_xfree_conf($do_pkgs, $mouse); - - if (arch() =~ /ppc/) { - my $s = join('', - "dev.mac_hid.mouse_button_emulation = " . to_bool($mouse->{button2_key} || $mouse->{button3_key}) . "\n", - if_($mouse->{button2_key}, "dev.mac_hid.mouse_button2_keycode = $mouse->{button2_key}\n"), - if_($mouse->{button3_key}, "dev.mac_hid.mouse_button3_keycode = $mouse->{button3_key}\n"), - ); - substInFile { - $_ = '' if /^\Qdev.mac_hid.mouse_button/; - $_ .= $s if eof; - } "$::prefix/etc/sysctl.d/51-drakx.conf"; - } } sub _input_entry_to_device_by_id { @@ -303,19 +282,11 @@ sub detect { my $fullname = detect_devices::is_xbox() ? 'Universal|Microsoft Xbox Controller S' : - arch() eq "ppc" ? - 'USB|1 button' : 'Universal|Any PS/2 & USB mice'; fullname2mouse($fullname, wacom => \@wacom, synaptics => $synaptics[0], if_($evdev_opts, %$evdev_opts)); - } elsif (arch() eq 'ppc') { - # No need to search for an ADB mouse. If I did, the PPC kernel would - # find one whether or not I had one installed! So.. default to it. - fullname2mouse("busmouse|1 button"); - } elsif (arch() =~ /^sparc/) { - fullname2mouse("sunmouse|Sun - Mouse"); } else { #- probe serial device to make sure a wacom has been detected. eval { modules::load("serial") }; @@ -541,16 +512,6 @@ sub select { }, [ { list => [ detect_devices::serialPorts() ], format => \&detect_devices::serialPort2text, val => \$mouse->{device} } ]) or return &select; } - if (arch() =~ /ppc/ && $mouse->{nbuttons} == 1) { - #- set a sane default F11/F12 - $mouse->{button2_key} = 87; - $mouse->{button3_key} = 88; - $in->ask_from('', N("Buttons emulation"), - [ - { label => N("Button 2 Emulation"), val => \$mouse->{button2_key}, list => [ _ppc_one_button_keys() ], format => \&_ppc_one_button_key2text }, - { label => N("Button 3 Emulation"), val => \$mouse->{button3_key}, list => [ _ppc_one_button_keys() ], format => \&_ppc_one_button_key2text }, - ]) or return; - } 1; } |