Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouletmp.git;a=commitdiff;h=99ca7ca9c6b015cba2d603b39e94d3f04fc0ae8f
commit 99ca7ca9c6b015cba2d603b39e94d3f04fc0ae8f Author: bouleetbil <bouleet...@frogdev.info> Date: Mon Aug 9 11:01:58 2010 +0000 xorg-server-1.8.2-10-i686 *added some chipset graphicals detection with lspci *nvidia binary install his nvidia.conf but should blacklist nouveau for works *now all graphicals chipsets should works *perhaps add an rc script for autoconfigure graphical devices for fwife, based on this .install *crazy feel free to change some drivers if you think it's better :p *crazy I wait your opinion before merge it into current diff --git a/source/x11/xorg-server/20-graphical.conf b/source/x11/xorg-server/20-graphical.conf new file mode 100644 index 0000000..c5db290 --- /dev/null +++ b/source/x11/xorg-server/20-graphical.conf @@ -0,0 +1,4 @@ +Section "Device" + Identifier "Card0" + Driver "DeviceGraphic" +EndSection diff --git a/source/x11/xorg-server/FrugalBuild b/source/x11/xorg-server/FrugalBuild index b78c062..dd08a0e 100644 --- a/source/x11/xorg-server/FrugalBuild +++ b/source/x11/xorg-server/FrugalBuild @@ -10,7 +10,7 @@ USE_MULTIBUFFER=${USE_MULTIBUFFER:-"n"} pkgname=xorg-server pkgver=1.8.2 -pkgrel=9 +pkgrel=10 pkgdesc="Modular X.Org X Server" groups=('x11' 'xorg-core') archs=('i686' 'x86_64' 'ppc') @@ -33,15 +33,16 @@ replaces=('xorg-server-smi' 'xorg-server-vesa' 'xorg-server-via' 'lbxproxy' 'pro 'liblbxutil' 'xgl' 'xorg-server-sdl') backup=('etc/sysconfig/desktop' 'etc/X11/xorg.conf.d/10-evdev.conf' \ - 'etc/X11/xorg.conf.d/20-synaptics.conf') + 'etc/X11/xorg.conf.d/20-synaptics.conf' 'etc/X11/xorg.conf.d/20-graphical.conf') Finclude sourceforge xorg source=(${sour...@]} \ - desktop 10-evdev.conf 20-synaptics.conf) + desktop 10-evdev.conf 20-synaptics.conf 20-graphical.conf) sha1sums=('825d11757b729444800e0a3afd4e98d19d286b1a' \ '905cc57547421ff3ca77ec1c8e6898a7a414346f' \ '9318b631eb06833bea18d5a5efd15df89ad5d12a' \ - '6c0156d129ddd2fb5277b76af1738298c2d09d4d') + '6c0156d129ddd2fb5277b76af1738298c2d09d4d' \ + '4c3d5e855c931a41de4fb7738ffa1523c789b5a2') if Fuse $USE_DEVEL; then pkgver=1.6.3.901.151.g120286a @@ -188,6 +189,7 @@ build() { Fmkdir etc/X11/xorg.conf.d Fcp 10-evdev.conf etc/X11/xorg.conf.d/ Fcp 20-synaptics.conf etc/X11/xorg.conf.d/ + Fcp 20-graphical.conf etc/X11/xorg.conf.d/ } # optimization OK diff --git a/source/x11/xorg-server/xorg-server.install b/source/x11/xorg-server/xorg-server.install index dfa275e..0444ed5 100644 --- a/source/x11/xorg-server/xorg-server.install +++ b/source/x11/xorg-server/xorg-server.install @@ -1,9 +1,35 @@ +function UpdateConf +{ + Driver=$1 + #update configuration only one time + #we have a backup for this file + if [ "`grep DeviceGraphic /etc/X11/xorg.conf.d/20-graphical.conf`" != "" ]; then + #for ppc we should use nv works better that nouveau + if [ "`uname -a | grep ppc `" != "" ] && [ "$Driver" == "nouveau" ] ; then + Driver="nv" + fi + echo "updating graphical device with $Driver" + sed -i "/Driver/s/DeviceGraphic/$Driver/" /etc/X11/xorg.conf.d/20-graphical.conf + fi +} + post_install() { # setting the layout from the tty console layout created by the installer layout=`awk -F'=' '/keymap=/ {print $2}' /etc/sysconfig/keymap | sed 's|-.*||g'` echo "Update layout keyboard with $layout" sed -i "/xkb_layout/s/Keyboard_Layout/$layout/" /etc/X11/xorg.conf.d/10-evdev.conf + #setting graphical device + device=`lspci | grep "VGA compatible controller" | cut -d ' ' -f 5` + device=`echo $device | tr '[:upper:]' '[:lower:]'` + case "$device" in + "via") UpdateConf openchrome ;; + "intel") UpdateConf intel ;; + "nvidia") UpdateConf nouveau ;; + "ati") UpdateConf radeon ;; + "sis") UpdateConf sis ;; + *) UpdateConf vesa ;; + esac } post_upgrade() _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git