xf86-video-nvidia:

- revert r1731 to prevent loading nvidia related config file if we run with other graphic cards as nvidia
This commit is contained in:
Stephan Raue 2010-01-15 22:02:57 +01:00
parent e51b2101f8
commit c7aa31c980
3 changed files with 4 additions and 2 deletions

View File

@ -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

View File

@ -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