pool/x11-tools
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 87212 from home:sndirsch:branches:X11:Utilities

Browse Source 
- removed obsolete scripts switch2nv/switch2nvidia; xorg.conf is
  no longer in use since openSUSE 11.3 (bnc #722812)

OBS-URL: https://build.opensuse.org/request/show/87212
OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/x11-tools?expand=0&rev=10
This commit is contained in:
Stefan Dirsch 2011-10-10 04:52:10 +00:00 committed by Git OBS Bridge
parent 05204073a6
commit 47ab302971
4 changed files with 6 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
switch2nv
View File

@ -1,51 +0,0 @@
#!/bin/sh
# Copyright (c) 2001 SuSE GmbH Nuernberg, Germany. All rights reserved.
#
# Author: Stefan Dirsch, 2001
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published
# by the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 675 Mass Ave, Cambridge MA 02139, USA.
echo "------------------------------------------------------------------------"
echo "Switching the use of \"nvidia\" driver of NVIDIA to \"nv\" driver of X.Org"
echo "------------------------------------------------------------------------"
echo
if [ "`id -u`" != "0" ]; then
echo "error: You must be root to use this program!"
exit 1
fi
libdir="lib"
test "$(arch)" == "x86_64" && libdir="lib64"
for file in /usr/X11R6/$libdir/modules/drivers/nvidia_drv.so \
/usr/$libdir/xorg/modules/drivers/nvidia_drv.so; do
if [ -r $file ]; then
if strings $file | grep -q "NVIDIA dlloader X Driver"; then
echo "warning: NVIDIA driver installed. Uninstalling NVIDIA driver first."
echo -n "warning: Running \"/usr/bin/nvidia-installer --uninstall -s\" ... "
/usr/bin/tiny-nvidia-installer --uninstall -s
echo "done"
echo
depmod -a &> /dev/null
fi
fi
done
echo -n "Patching /etc/X11/xorg.conf ... "
sed -e '/[ \t]*Driver[ \t]*"nvidia"/s/nvidia/nv/g' \
-e 's/[ \t]*Option[ \t]*"HWCursor"[ \t]*"on"/ Option "HWCursor" "off"/g' \
-e 's/[ \t]*Option[ \t]*"Composite"[ \t]*"on"/ Option "Composite" "off"/g' \
-i /etc/X11/xorg.conf
echo "done"

40
switch2nvidia
View File

@ -1,40 +0,0 @@
#!/bin/sh
# Copyright (c) 2001 SuSE GmbH Nuernberg, Germany. All rights reserved.
#
# Author: Stefan Dirsch, 2001
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published
# by the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 675 Mass Ave, Cambridge MA 02139, USA.
echo "------------------------------------------------------------------------"
echo "Switching the use of \"nv\" driver of X.Org to \"nvidia\" driver of NVIDIA"
echo "------------------------------------------------------------------------"
echo
if [ "`id -u`" != "0" ]; then
echo "error: You must be root to use this program!"
exit 1
fi
head -n 2 /etc/X11/xorg.conf | tail -n 1 | grep "^# SaX"
if [ $? -eq 0 ]; then
echo -n "Patching /etc/X11/xorg.conf ... "
sed -e '/[ \t]*Driver[ \t]*"nv"/s/nv/nvidia/g' \
-e 's/[ \t]*Option[ \t]*"HWCursor"[ \t]*"off"/ Option "HWCursor" "on"/g' \
-e 's/[ \t]*Option[ \t]*"Composite"[ \t]*"off"/ Option "Composite" "on"/g' \
-i /etc/X11/xorg.conf
echo "done"
else
echo "SaX2 generated xorg.conf not available!"
fi

6
x11-tools.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Oct 10 04:42:10 UTC 2011 - sndirsch@suse.com
- removed obsolete scripts switch2nv/switch2nvidia; xorg.conf is
no longer in use since openSUSE 11.3 (bnc #722812)
-------------------------------------------------------------------
Tue May 3 18:35:08 CEST 2011 - tiwai@suse.de

6
x11-tools.spec
View File

@ -29,8 +29,6 @@ Version: 0.1
Release: 183
Summary: Tools for the X Window System
Source2: xf86debug
Source3: switch2nv
Source4: switch2nvidia
Source6: wmlist
Source8: kroot
Source31: xim
@ -68,8 +66,6 @@ mkdir -p $RPM_BUILD_ROOT/etc/skel
install -m 644 $RPM_SOURCE_DIR/xim.template $RPM_BUILD_ROOT/etc/skel/.xim.template
mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates/
install -c -m0644 $RPM_SOURCE_DIR/sysconfig.language-%{name} $RPM_BUILD_ROOT/var/adm/fillup-templates/
install -m 755 $RPM_SOURCE_DIR/switch2nv $RPM_BUILD_ROOT/usr/bin
install -m 755 $RPM_SOURCE_DIR/switch2nvidia $RPM_BUILD_ROOT/usr/bin
mkdir -p $RPM_BUILD_ROOT/usr/lib/nvidia
install -m 755 $RPM_SOURCE_DIR/nvidia-pre-install \
$RPM_BUILD_ROOT/usr/lib/nvidia/pre-install
@ -86,8 +82,6 @@ install -m 755 $RPM_SOURCE_DIR/nvidia-post-uninstall \
/usr/bin/xf86debug
/usr/bin/wmlist
/usr/bin/kroot
/usr/bin/switch2nv
/usr/bin/switch2nvidia
/usr/lib/nvidia/pre-install
/usr/lib/nvidia/post-uninstall
/etc/X11/xim