From c7aa31c980a6a10457ca6bab27f8e9d273fbd283 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@x200t.openelec.tv>
Date: Fri, 15 Jan 2010 22:02:57 +0100
Subject: [PATCH] xf86-video-nvidia: - revert r1731 to prevent loading nvidia
 related config file if we run with other graphic cards as nvidia

---
 .../config/{51-video-nvidia.conf => xorg-nvidia.conf}         | 0
 packages/x11/driver/xf86-video-nvidia/install                 | 4 ++--
 packages/x11/xserver/xorg-server/conf.d/xorg                  | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)
 rename packages/x11/driver/xf86-video-nvidia/config/{51-video-nvidia.conf => xorg-nvidia.conf} (100%)

diff --git a/packages/x11/driver/xf86-video-nvidia/config/51-video-nvidia.conf b/packages/x11/driver/xf86-video-nvidia/config/xorg-nvidia.conf
similarity index 100%
rename from packages/x11/driver/xf86-video-nvidia/config/51-video-nvidia.conf
rename to packages/x11/driver/xf86-video-nvidia/config/xorg-nvidia.conf
diff --git a/packages/x11/driver/xf86-video-nvidia/install b/packages/x11/driver/xf86-video-nvidia/install
index 713e3231f6..c6bbe2110b 100755
--- a/packages/x11/driver/xf86-video-nvidia/install
+++ b/packages/x11/driver/xf86-video-nvidia/install
@@ -15,8 +15,8 @@ mkdir -p $INSTALL/$XORG_PATH_MODULES/drivers
 mkdir -p $INSTALL/$XORG_PATH_MODULES/extensions
   cp $BUILD/$1/usr/X11R6/lib/modules/extensions/libglx.so* $INSTALL/$XORG_PATH_MODULES/extensions/libglx_nvidia.so
 
-mkdir -p $INSTALL/etc/X11/xorg.conf.d
-  cp -PR $PKG_DIR/config/*.conf $INSTALL/etc/X11/xorg.conf.d
+mkdir -p $INSTALL/etc/X11
+  cp -PR $PKG_DIR/config/*.conf $INSTALL/etc/X11
 
 mkdir -p $INSTALL/usr/lib
   cp $BUILD/$1/usr/lib/libGLcore.so* $INSTALL/usr/lib/libGLcore.so.1
diff --git a/packages/x11/xserver/xorg-server/conf.d/xorg b/packages/x11/xserver/xorg-server/conf.d/xorg
index 28ad50f844..d139c0ff61 100644
--- a/packages/x11/xserver/xorg-server/conf.d/xorg
+++ b/packages/x11/xserver/xorg-server/conf.d/xorg
@@ -9,6 +9,7 @@
 # X environment variables.
 #-------------------------------------------------------------------------------
 DISPLAY=':0.0'
+XORG_NVIDIA_CONF="/etc/X11/xorg-nvidia.conf"
 XORG_ARGS="-s 0 -br -noreset -allowMouseOpenFail -nocursor"
 
 export DISPLAY
@@ -25,6 +26,7 @@ export DISPLAY
       progress "Found nVidia card, enabling binary driver as requested"
 
       XORG_ARGS="$XORG_ARGS -ignoreABI"
+      [ -f $XORG_NVIDIA_CONF ] && XORG_ARGS="$XORG_ARGS -config $XORG_NVIDIA_CONF"
 
       mkdir -p /var/lib
         ln -sf /usr/lib/libGL_nvidia.so.1 /var/lib/libGL.so