# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1242074068 -7200
# Node ID 62085de57ca690f6f288b7d2f2f70e5d5e988843
# Parent  5219b9de8e9f62f45a78c67471c501ccaaa187e4
Up: Xvesa and others and add xorg-server-tinyX (use server 1.5.3)

diff -r 5219b9de8e9f -r 62085de57ca6 xorg-server-Xephyr/receipt
--- a/xorg-server-Xephyr/receipt	Mon May 11 22:32:44 2009 +0200
+++ b/xorg-server-Xephyr/receipt	Mon May 11 22:34:28 2009 +0200
@@ -1,20 +1,21 @@
 # SliTaz package receipt.
 
 PACKAGE="xorg-server-Xephyr"
-VERSION="1.2.0"
+VERSION="1.5.2"
 CATEGORY="x-window"
 SHORT_DESC="Xephyr server used to creat chrooted X env."
 MAINTAINER="pankso@slitaz.org"
 DEPENDS="freetype xorg-libXau xorg-libfontenc xorg-libXdmcp xorg-libXfont \
 xorg-libXext xorg-libX11 zlib"
-WANTED="xorg-server"
+WANTED="xorg-server-tinyX"
+SOURCE="xorg-server"
 WEB_SITE="http://www.x.org/"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
+	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
 	mkdir -p $fs/usr/bin
 	cp -a $_pkg/usr/bin/Xephyr $fs/usr/bin
-	strip $fs/usr/bin/Xephyr
 	chmod 4711 $fs/usr/bin/Xephyr
 }
diff -r 5219b9de8e9f -r 62085de57ca6 xorg-server-Xnest/receipt
--- a/xorg-server-Xnest/receipt	Mon May 11 22:32:44 2009 +0200
+++ b/xorg-server-Xnest/receipt	Mon May 11 22:34:28 2009 +0200
@@ -1,18 +1,20 @@
 # SliTaz package receipt.
 
 PACKAGE="xorg-server-Xnest"
-VERSION="1.2.0"
+VERSION="1.5.2"
 CATEGORY="x-window"
 SHORT_DESC="Xorg Xnest server."
 MAINTAINER="pankso@slitaz.org"
 DEPENDS="xorg-libXau xorg-libfontenc xorg-libXdmcp xorg-libXfont \
 xorg-base-fonts freetype xorg-libX11 xorg-libXext zlib"
-WANTED="xorg-server"
+WANTED="xorg-server-tinyX"
+SOURCE="xorg-server"
 WEB_SITE="http://www.x.org/"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
+	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
 	mkdir -p $fs/usr/bin
 	cp -a $_pkg/usr/bin/Xnest $fs/usr/bin
 	chmod 4711 $fs/usr/bin/Xnest
diff -r 5219b9de8e9f -r 62085de57ca6 xorg-server-Xvesa/receipt
--- a/xorg-server-Xvesa/receipt	Mon May 11 22:32:44 2009 +0200
+++ b/xorg-server-Xvesa/receipt	Mon May 11 22:34:28 2009 +0200
@@ -1,20 +1,35 @@
 # SliTaz package receipt.
 
 PACKAGE="xorg-server-Xvesa"
-VERSION="1.2.0"
+VERSION="1.5.2"
 CATEGORY="x-window"
 SHORT_DESC="Xorg kdrive server Xvesa (tinyX)."
 MAINTAINER="pankso@slitaz.org"
 DEPENDS="xorg-libXau xorg-libfontenc xorg-libXdmcp xorg-libXfont \
-xorg-base-fonts freetype zlib"
-WANTED="xorg-server"
+xorg-base-fonts freetype zlib hal dbus"
+SUGGESTED="xorg-xrandr"
+WANTED="xorg-server-tinyX"
+SOURCE="xorg-server"
 WEB_SITE="http://www.x.org/"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/bin
+	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
+	mkdir -p $fs/usr/bin $fs/etc/X11
 	cp -a $_pkg/usr/bin/Xvesa $fs/usr/bin
-	strip $fs/usr/bin/Xvesa
 	chmod 4711 $fs/usr/bin/Xvesa
 }
+
+post_install()
+{
+	# Upgrade from 1.2.0 to 1.5.3
+	if ! grep -q "\-keybd keyboard" $1/etc/slim.conf; then
+		echo -n "Updating Slim configuration..."
+		res=$(grep ^xserver_arguments $1/etc/slim.conf | \
+			sed 's/xserver_arguments.*-screen *//' | awk '{ print $1 }')
+		sed -i s/"-screen $res"/"-screen $res -keybd keyboard -mouse mouse,5,\/dev\/input\/mice -nolisten tcp"/ \
+			$1/etc/slim.conf
+		status
+	fi
+}
diff -r 5219b9de8e9f -r 62085de57ca6 xorg-server-tinyX/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xorg-server-tinyX/receipt	Mon May 11 22:34:28 2009 +0200
@@ -0,0 +1,65 @@
+# SliTaz package receipt.
+
+PACKAGE="xorg-server-tinyX"
+VERSION="1.5.2"
+CATEGORY="meta"
+SHORT_DESC="Xorg tinyX servers meta package."
+MAINTAINER="pankso@slitaz.org"
+DEPENDS="xorg-libX11 xorg-server-Xvesa"
+BUILD_DEPENDS="xorg-dev-proto xorg-libXfont-dev xorg-xtrans xorg-libxkbfile-dev \
+xorg-libfontenc-dev xorg-libxkbfile"
+SOURCE="xorg-server"
+TARBALL="$SOURCE-$VERSION.tar.bz2"
+WEB_SITE="http://www.x.org/"
+WGET_URL="http://xorg.freedesktop.org/releases/individual/xserver/$TARBALL"
+KDRIVE="
+Xchips
+Xvesa
+Xephyr
+Xi810
+Xnvidia
+Xepson
+Xsmi
+Xr128
+Xvia
+Xpm2
+Xati
+Xfake
+Xneomagic
+Xmach64
+Xfbdev
+Xmga
+Xvfb
+Xnest"
+
+# Rules to configure and make the package.
+compile_rules()
+{
+	cd $src
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var \
+		--with-module-dir=/usr/lib/X11/modules \
+		--with-xkb-output=/var/lib/xkb \
+		--with-serverconfig-path=/etc/X11 \
+		--with-fontdir=/usr/share/fonts/X11 \
+		--enable-install-setuid \
+		--disable-xorg \
+		--enable-kdrive \
+		--enable-kdrive-vesa \
+		--with-os-name="SliTaz GNU/Linux" \
+		--with-builder-addr=$MAINTAINER \
+		--disable-dri \
+		--disable-xorgcfg \
+		$CONFIGURE_ARGS &&
+	make &&
+	make DESTDIR=$PWD/_pkg install
+}
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	mkdir -p $fs/usr
+}