diff options
author | Treeve Jelbert | 2015-06-04 10:20:40 +0200 |
---|---|---|
committer | Treeve Jelbert | 2015-06-04 21:32:32 +0200 |
commit | 000f5fb9c98fd68c477fdc939451f8e0660bc618 (patch) | |
tree | 590df0822ce7566c310838133adb9796f8d39559 /xorg-xserver/xorg-server | |
parent | 79464767e33cf32423cacc3021f99c3810e3f925 (diff) |
xorg-server - simplify drivers selection
Diffstat (limited to 'xorg-xserver/xorg-server')
-rwxr-xr-x | xorg-xserver/xorg-server/CONFIGURE | 108 | ||||
-rwxr-xr-x | xorg-xserver/xorg-server/DEPENDS | 160 | ||||
-rw-r--r-- | xorg-xserver/xorg-server/HISTORY | 5 |
3 files changed, 18 insertions, 255 deletions
diff --git a/xorg-xserver/xorg-server/CONFIGURE b/xorg-xserver/xorg-server/CONFIGURE index fc3d9b63a1..2645ceb370 100755 --- a/xorg-xserver/xorg-server/CONFIGURE +++ b/xorg-xserver/xorg-server/CONFIGURE @@ -243,107 +243,9 @@ config_query_multi XORG_SERVER_FONT_MISC \ font-screen-cyrillic \ font-winitzki-cyrillic -config_query_multi XORG_SERVER_INPUT_DRIVER \ - "What input drivers do you want" \ - sane \ - none \ - all \ - xf86-input-mouse \ - xf86-input-evdev \ - xf86-input-keyboard \ - xf86-input-joystick \ - xf86-input-synaptics \ - xf86-input-aiptek \ - linuxwacom && - -config_query_multi XORG_SERVER_INPUT_OBSCURE \ - "What special input drivers do you want" \ - none \ - all \ - xf86-input-dmc \ - xf86-input-fpit \ - xf86-input-ur98 \ - xf86-input-void \ - xf86-input-summa \ - xf86-input-palmax \ - xf86-input-acecad \ - xf86-input-citron \ - xf86-input-dynapro \ - xf86-input-diamondtouch \ - xf86-input-elo2300 \ - xf86-input-tek4957 \ - xf86-input-calcomp \ - xf86-input-mutouch \ - xf86-input-penmount \ - xf86-input-spaceorb \ - xf86-input-hyperpen \ - xf86-input-magellan \ - xf86-input-jamstudio \ - xf86-input-magictouch \ - xf86-input-microtouch \ - xf86-input-digitaledge \ - xf86-input-elographics && - -config_query_multi XORG_SERVER_VIDEO_DRIVER_COMMON \ - "What common video drivers do you want" \ - sane \ - none \ - all \ - xf86-video-ati \ - xf86-video-nouveau \ - xf86-video-nv \ - xf86-video-intel \ - xf86-video-i810 \ - xf86-video-i740 \ - xf86-video-i128 \ - xf86-video-mga \ - xf86-video-via \ - xf86-video-savage \ - xf86-video-s3 \ - xf86-video-s3virge \ - xf86-video-sis \ - xf86-video-vesa \ - xf86-video-fbdev \ - xf86-video-neomagic \ - ati-fglrx \ - NVIDIA && - -config_query_multi XORG_SERVER_VIDEO_DRIVER_UNCOMMON \ - "What uncommon video drivers do you want" \ - none \ - all \ - xf86-video-tga \ - xf86-video-v4l \ - xf86-video-tdfx \ - xf86-video-chips \ - xf86-video-cyrix \ - xf86-video-dummy \ - xf86-video-glint \ - xf86-video-tseng \ - xf86-video-sisusb \ - xf86-video-cirrus \ - xf86-video-vmware \ - xf86-video-voodoo \ - xf86-video-trident \ - xf86-video-vga && - -config_query_multi XORG_SERVER_VIDEO_DRIVER_OBSCURE \ - "What obscure video drivers do you want" \ - none \ - all \ - xf86-video-nsc \ - xf86-video-apm \ - xf86-video-ark \ - xf86-video-geode \ - xf86-video-imstt \ - xf86-video-sunbw2 \ - xf86-video-suncg3 \ - xf86-video-suncg6 \ - xf86-video-sunffb \ - xf86-video-sunleo \ - xf86-video-suntcx \ - xf86-video-suncg14 \ - xf86-video-newport \ - xf86-video-rendition \ - xf86-video-siliconmotion +persistent_remove XORG_SERVER_INPUT_DRIVER +persistent_remove XORG_SERVER_INPUT_OBSCURE +persistent_remove XORG_SERVER_VIDEO_DRIVER_COMMON +persistent_remove XORG_SERVER_VIDEO_DRIVER_UNCOMMON +persistent_remove XORG_SERVER_VIDEO_DRIVER_OBSCURE diff --git a/xorg-xserver/xorg-server/DEPENDS b/xorg-xserver/xorg-server/DEPENDS index a03bfdfefe..43f0ca6caf 100755 --- a/xorg-xserver/xorg-server/DEPENDS +++ b/xorg-xserver/xorg-server/DEPENDS @@ -269,156 +269,12 @@ depends $misc done fi -if list_find "$XORG_SERVER_INPUT_DRIVER" "sane" -then -runtime_depends_2 xf86-input-mouse && -runtime_depends_2 xf86-input-keyboard -elif list_find "$XORG_SERVER_INPUT_DRIVER" "all" -then -runtime_depends_2 xf86-input-mouse && -runtime_depends_2 xf86-input-evdev && -runtime_depends_2 xf86-input-keyboard && -runtime_depends_2 xf86-input-joystick && -runtime_depends_2 xf86-input-synaptics && -runtime_depends_2 xf86-input-aiptek && -runtime_depends_2 linuxwacom -elif list_find "$XORG_SERVER_INPUT_DRIVER" "none" -then -true -else -for input_driver in $XORG_SERVER_INPUT_DRIVER -do -runtime_depends_2 $input_driver -done -fi && - -if list_find "$XORG_SERVER_INPUT_OBSCURE" "all" -then -runtime_depends_2 xf86-input-dmc && -runtime_depends_2 xf86-input-fpit && -runtime_depends_2 xf86-input-ur98 && -runtime_depends_2 xf86-input-void && -runtime_depends_2 xf86-input-summa && -runtime_depends_2 xf86-input-palmax && -runtime_depends_2 xf86-input-acecad && -runtime_depends_2 xf86-input-diamondtouch && -runtime_depends_2 xf86-input-citron && -runtime_depends_2 xf86-input-dynapro && -runtime_depends_2 xf86-input-elo2300 && -runtime_depends_2 xf86-input-tek4957 && -runtime_depends_2 xf86-input-calcomp && -runtime_depends_2 xf86-input-mutouch && -runtime_depends_2 xf86-input-penmount && -runtime_depends_2 xf86-input-spaceorb && -runtime_depends_2 xf86-input-hyperpen && -runtime_depends_2 xf86-input-magellan && -runtime_depends_2 xf86-input-jamstudio && -runtime_depends_2 xf86-input-magictouch && -runtime_depends_2 xf86-input-microtouch && -runtime_depends_2 xf86-input-digitaledge && -runtime_depends_2 xf86-input-elographics -elif list_find "$XORG_SERVER_INPUT_OBSCURE" "none" -then -true -else -for input_obscure in $XORG_SERVER_INPUT_OBSCURE -do -depends $input_obscure -done -fi && - -if list_find "$XORG_SERVER_VIDEO_DRIVER_COMMON" "sane" -then -runtime_depends_2 xf86-video-nv && -runtime_depends_2 xf86-video-s3 && -runtime_depends_2 xf86-video-ati && -runtime_depends_2 xf86-video-mga && -runtime_depends_2 xf86-video-via && -runtime_depends_2 xf86-video-sis && -runtime_depends_2 xf86-video-intel && -runtime_depends_2 xf86-video-vesa -elif list_find "$XORG_SERVER_VIDEO_DRIVER_COMMON" "all" -then -runtime_depends_2 xf86-video-nouveau && -runtime_depends_2 xf86-video-nv && -runtime_depends_2 xf86-video-s3 && -runtime_depends_2 xf86-video-ati && -runtime_depends_2 xf86-video-via && -runtime_depends_2 xf86-video-mga && -runtime_depends_2 xf86-video-sis && -runtime_depends_2 xf86-video-intel && -runtime_depends_2 xf86-video-i740 && -runtime_depends_2 xf86-video-i128 && -runtime_depends_2 xf86-video-vesa && -runtime_depends_2 xf86-video-fbdev && -runtime_depends_2 xf86-video-savage && -runtime_depends_2 xf86-video-s3virge && -runtime_depends_2 xf86-video-neomagic && -runtime_depends_2 ati-fglrx "" "" z-rejected && -runtime_depends_2 NVIDIA "" "" z-rejected -elif list_find "$XORG_SERVER_VIDEO_DRIVER_COMMON" "none" -then -true -else - for video_common in $XORG_SERVER_VIDEO_DRIVER_COMMON - do - if [[ $video_common == ati-fglrx || $video_common == NVIDIA ]]; then - runtime_depends_2 $video_common "" "" z-rejected - else - runtime_depends_2 $video_common - fi || return 1 # break the chain on any error - done -fi && +message 'choose an input driver' && +message 'if these drivers are not suitable, choose from the xorg-drivers section' && -if list_find "$XORG_SERVER_VIDEO_DRIVER_UNCOMMON" "all" -then -runtime_depends_2 xf86-video-tga && -runtime_depends_2 xf86-video-v4l && -runtime_depends_2 xf86-video-tdfx && -runtime_depends_2 xf86-video-chips && -runtime_depends_2 xf86-video-cyrix && -runtime_depends_2 xf86-video-dummy && -runtime_depends_2 xf86-video-glint && -runtime_depends_2 xf86-video-tseng && -runtime_depends_2 xf86-video-sisusb && -runtime_depends_2 xf86-video-cirrus && -runtime_depends_2 xf86-video-vmware && -runtime_depends_2 xf86-video-voodoo && -runtime_depends_2 xf86-video-trident && -runtime_depends_2 xf86-video-vga -elif list_find "$XORG_SERVER_VIDEO_DRIVER_UNCOMMON" "none" -then -true -else -for video_uncommon in $XORG_SERVER_VIDEO_DRIVER_UNCOMMON -do -runtime_depends_2 $video_uncommon -done -fi && - -if list_find "$XORG_SERVER_VIDEO_DRIVER_OBSCURE" "all" -then -runtime_depends_2 xf86-video-nsc && -runtime_depends_2 xf86-video-apm && -runtime_depends_2 xf86-video-ark && -runtime_depends_2 xf86-video-geode && -runtime_depends_2 xf86-video-imstt && -runtime_depends_2 xf86-video-sunbw2 && -runtime_depends_2 xf86-video-suncg3 && -runtime_depends_2 xf86-video-suncg6 && -runtime_depends_2 xf86-video-sunffb && -runtime_depends_2 xf86-video-sunleo && -runtime_depends_2 xf86-video-suntcx && -runtime_depends_2 xf86-video-suncg14 && -runtime_depends_2 xf86-video-newport && -runtime_depends_2 xf86-video-rendition && -runtime_depends_2 xf86-video-siliconmotion -elif list_find "$XORG_SERVER_VIDEO_DRIVER_OBSCURE" "none" -then -true -else -for video_obscure in $XORG_SERVER_VIDEO_DRIVER_OBSCURE -do -runtime_depends_2 $video_obscure -done -fi +suggest_depends xf86-input-evdev '' '' 'modern input drivers' && +suggest_depends xf86-input-synaptics '' '' 'modern input drivers' && +suggest_depends xf86-input-libinput '' '' 'modern input drivers' && +suggest_depends xf86-video-ati '' '' 'modern ATI drivers' && +suggest_depends xf86-video-intel '' '' 'modern Intel drivers' && +suggest_depends xf86-video-nv '' '' 'modern NVidia drivers' diff --git a/xorg-xserver/xorg-server/HISTORY b/xorg-xserver/xorg-server/HISTORY index b48e003403..87e7599af9 100644 --- a/xorg-xserver/xorg-server/HISTORY +++ b/xorg-xserver/xorg-server/HISTORY @@ -1,3 +1,8 @@ +2015-06-04 Treeve Jelbert <treeve@sourcemage.org> + * DEPENDS, CONFIGURE: simplify driver selection + instead of giving a vast list of optional drivers, suggest the most likely ones + any others can be installed individually if needed + 2015-05-05 Thomas Orgis <sobukus@sourcemage.org> * DEPENDS: on smgl-gl_select |