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 bded028..f53047f 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 bf6e32d..68fc5a4 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,9 @@
+2009-12-16 Jaka Kranjc <lynxlynxlynx AT 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 AT sourcemage.org>
* BUILD: Changed default font prefix to /usr/share/fonts/X11 .
* CONFIGURE: Added note about font paths.
[SM-Commit] GIT changes to master grimoire by Jaka Kranjc (7992075ec0fa5ff318b5c9110a93c7df810d9a4b),
Jaka Kranjc, 12/16/2009