Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=f7b9c462fc97816da210cfc4230212adfb4bed77

commit f7b9c462fc97816da210cfc4230212adfb4bed77
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Sun Oct 17 16:20:15 2010 +0000

xorg-server-1.9.0-5-i686
*some clean up
*don't force graphical device
*each xf86-video* can provides his conf it's not the job of xorg-server

diff --git a/source/x11/xorg-server/FrugalBuild 
b/source/x11/xorg-server/FrugalBuild
index a14af05..97e0784 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.9.0
-pkgrel=4
+pkgrel=5
pkgdesc="Modular X.Org X Server"
groups=('x11' 'xorg-core')
archs=('i686' 'x86_64' 'ppc')
@@ -33,16 +33,15 @@ 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-graphical.conf')
+       'etc/X11/xorg.conf.d/20-synaptics.conf')
Finclude sourceforge xorg
source=(${sour...@]} \
-       desktop 10-evdev.conf 20-synaptics.conf 20-graphical.conf)
+       desktop 10-evdev.conf 20-synaptics.conf)

sha1sums=('a18d2212df80446b597b71b8948d133f52c399cc' \
'905cc57547421ff3ca77ec1c8e6898a7a414346f' \
'9318b631eb06833bea18d5a5efd15df89ad5d12a' \
-          '6c0156d129ddd2fb5277b76af1738298c2d09d4d' \
-          '4c3d5e855c931a41de4fb7738ffa1523c789b5a2')
+          '6c0156d129ddd2fb5277b76af1738298c2d09d4d')

if Fuse $USE_DEVEL; then
pkgver=1.6.3.901.151.g120286a
@@ -189,7 +188,6 @@ 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 a0069ff..1c6c9fe 100644
--- a/source/x11/xorg-server/xorg-server.install
+++ b/source/x11/xorg-server/xorg-server.install
@@ -23,17 +23,17 @@ post_install()
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 ;;
-               "cirrus") UpdateConf cirrus ;;
-               *) UpdateConf vesa ;;
-       esac
+       #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 ;;
+       #       "cirrus") UpdateConf cirrus ;;
+       #       *) UpdateConf vesa ;;
+       #esac
}

post_upgrade()
@@ -43,18 +43,6 @@ post_upgrade()

pre_upgrade()
{
-       #fix buggy xorg-server 1.8.2-7
-       #delete useless symlink
-       if [ -h "/usr/lib/X11/fonts" ];then
-               #delete bugguy symlink
-               rm /usr/lib/X11/fonts
-       fi
-       #restor useless backup
-       if [ -d "/usr/lib/X11/fonts.backup" ];then
-               mv /usr/lib/X11/fonts.backup /usr/lib/X11/fonts
-       fi
-       #end fix buggy xorg-server 1.8.2-7
-
#inform user : the old dir font is ignored
if [ -d "/usr/lib/X11/fonts" ];then
echo "Xorg ignore /usr/lib/X11/fonts"
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to