diff options
| author | Jaka Kranjc | 2009-12-16 18:51:42 +0100 |
|---|---|---|
| committer | Arwed von Merkatz | 2010-01-02 15:01:57 +0100 |
| commit | 04f57081410221ae58cb0a7055c0863a40596beb (patch) | |
| tree | cfc08598ffc4fbbf9d883f338991424b26c7024a | |
| parent | 6e0c9b708d3223405977d0e5642f08423bac19bc (diff) | |
xorg-server: fixed a few issues wrt z-rejected drivers
(cherry picked from commit 7992075ec0fa5ff318b5c9110a93c7df810d9a4b)
| -rwxr-xr-x | xorg-xserver/xorg-server/CONFIGURE | 4 | ||||
| -rwxr-xr-x | xorg-xserver/xorg-server/DEPENDS | 12 | ||||
| -rw-r--r-- | xorg-xserver/xorg-server/HISTORY | 6 |
3 files changed, 16 insertions, 6 deletions
diff --git a/xorg-xserver/xorg-server/CONFIGURE b/xorg-xserver/xorg-server/CONFIGURE index 9bbff6d18e..166b4bc92c 100755 --- a/xorg-xserver/xorg-server/CONFIGURE +++ b/xorg-xserver/xorg-server/CONFIGURE @@ -303,8 +303,8 @@ config_query_multi XORG_SERVER_VIDEO_DRIVER_COMMON \ xf86-video-vesa \ xf86-video-fbdev \ xf86-video-neomagic \ - ati_driver \ - nvidia_driver && + ati-fglrx \ + NVIDIA && config_query_multi XORG_SERVER_VIDEO_DRIVER_UNCOMMON \ "What uncommon video drivers do you want" \ diff --git a/xorg-xserver/xorg-server/DEPENDS b/xorg-xserver/xorg-server/DEPENDS index bded0285d4..f53047f9ce 100755 --- a/xorg-xserver/xorg-server/DEPENDS +++ b/xorg-xserver/xorg-server/DEPENDS @@ -326,10 +326,14 @@ elif list_find "$XORG_SERVER_VIDEO_DRIVER_COMMON" "none" then true else -for video_common in $XORG_SERVER_VIDEO_DRIVER_COMMON -do -runtime_depends_2 $video_common -done + 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 && if list_find "$XORG_SERVER_VIDEO_DRIVER_UNCOMMON" "all" diff --git a/xorg-xserver/xorg-server/HISTORY b/xorg-xserver/xorg-server/HISTORY index 31a16cc972..9f47de4f64 100644 --- a/xorg-xserver/xorg-server/HISTORY +++ b/xorg-xserver/xorg-server/HISTORY @@ -1,3 +1,9 @@ +2009-12-16 Jaka Kranjc <lynxlynxlynx@sourcemage.org> + * CONFIGURE: fixed the ati driver name and changed the nvidia one to + the provider - NVIDIA + * DEPENDS: specify the grimoire for dependencies on z-rejected spells; + handle errors for the selective video driver choice + 2009-12-16 Thomas Orgis <sobukus@sourcemage.org> * BUILD: Changed default font prefix to /usr/share/fonts/X11 . * CONFIGURE: Added note about font paths. |