# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1307228443 -7200
# Node ID 829cd878e43fe91527e6359eeb949e024744c72c
# Parent  ba7621a1b976501ab93fdfd767aca973345572ea
xorg-server*: up to 1.9.5 for bug fixes and --enable-kdrive so you build Xfbdev

diff -r ba7621a1b976 -r 829cd878e43f xorg-server-Xnest/receipt
--- a/xorg-server-Xnest/receipt	Sun Jun 05 00:58:57 2011 +0200
+++ b/xorg-server-Xnest/receipt	Sun Jun 05 01:00:43 2011 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="xorg-server-Xnest"
-VERSION="1.9.4"
+VERSION="1.9.5"
 CATEGORY="x-window"
 SHORT_DESC="Xorg Xnest server."
 MAINTAINER="pankso@slitaz.org"
@@ -18,3 +18,9 @@
 	cp -a $_pkg/usr/bin/Xnest $fs/usr/bin
 	chmod 4711 $fs/usr/bin/Xnest
 }
+
+# We need /var/tmp rw to let xkbcomp builr XKB definition.
+post_install()
+{
+	chmod 1777 $1/var/tmp
+}
diff -r ba7621a1b976 -r 829cd878e43f xorg-server-Xvfb/receipt
--- a/xorg-server-Xvfb/receipt	Sun Jun 05 00:58:57 2011 +0200
+++ b/xorg-server-Xvfb/receipt	Sun Jun 05 01:00:43 2011 +0200
@@ -1,9 +1,9 @@
 # SliTaz package receipt.
 
 PACKAGE="xorg-server-Xvfb"
-VERSION="1.9.4"
+VERSION="1.9.5"
 CATEGORY="x-window"
-SHORT_DESC="Xephyr server Xvfb."
+SHORT_DESC="Xvfb Xorg server."
 MAINTAINER="pankso@slitaz.org"
 DEPENDS="xorg-libXfont zlib pixman libgcrypt xorg-libXv"
 WANTED="xorg-server"
@@ -17,3 +17,9 @@
 	cp -a $_pkg/usr/bin/Xvfb $fs/usr/bin
 	chmod 4711 $fs/usr/bin/Xvfb
 }
+
+# We need /var/tmp rw to let xkbcomp builr XKB definition.
+post_install()
+{
+	chmod 1777 $1/var/tmp
+}
diff -r ba7621a1b976 -r 829cd878e43f xorg-server-dev/receipt
--- a/xorg-server-dev/receipt	Sun Jun 05 00:58:57 2011 +0200
+++ b/xorg-server-dev/receipt	Sun Jun 05 01:00:43 2011 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="xorg-server-dev"
-VERSION="1.9.4"
+VERSION="1.9.5"
 CATEGORY="development"
 SHORT_DESC="Xorg server devel files needed to build drivers."
 MAINTAINER="pankso@slitaz.org"
diff -r ba7621a1b976 -r 829cd878e43f xorg-server-light/receipt
--- a/xorg-server-light/receipt	Sun Jun 05 00:58:57 2011 +0200
+++ b/xorg-server-light/receipt	Sun Jun 05 01:00:43 2011 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="xorg-server-light"
-VERSION="1.9.4"
+VERSION="1.9.5"
 CATEGORY="x-window"
 SHORT_DESC="Xorg core server light version (no dri, gl, and friends)."
 MAINTAINER="pankso@slitaz.org"
@@ -21,11 +21,13 @@
 # Rules to configure and make the package.
 compile_rules()
 {
+	#CFLAGS="-march=$ARCH -O2 -pipe -fomit-frame-pointer"
+	#CXXFLAGS="$CFLAGS"
+	# Sizes: 792.0K with -Os and 968.0K
 	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 \
diff -r ba7621a1b976 -r 829cd878e43f xorg-server/receipt
--- a/xorg-server/receipt	Sun Jun 05 00:58:57 2011 +0200
+++ b/xorg-server/receipt	Sun Jun 05 01:00:43 2011 +0200
@@ -1,29 +1,28 @@
 # SliTaz package receipt.
 
 PACKAGE="xorg-server"
-VERSION="1.9.4"
+VERSION="1.9.5"
 CATEGORY="x-window"
 SHORT_DESC="Xorg core server."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="xorg-xkeyboard-config xorg-libpciaccess xorg-libXxf86vm \
-xorg-libXfont xorg-libXau xorg-base-fonts libgcrypt pixman udev"
-BUILD_DEPENDS="xorg-libxkbfile-dev xorg-libpciaccess-dev xorg-libXxf86vm-dev \
-xorg-libXfont-dev libgcrypt-dev pixman-dev udev-dev mesa-dev \
-pkg-config perl flex xorg-xf86driproto xorg-xcmiscproto xorg-bigreqsproto \
-xorg-randrproto xorg-dri2proto xorg-kbproto xorg-xextproto xorg-fontsproto \
-xorg-renderproto xorg-videoproto xorg-compositeproto \
-xorg-recordproto xorg-libXau-dev xorg-fontcacheproto xorg-printproto \
-xorg-scrnsaverproto xorg-resourceproto xorg-xineramaproto xorg-xf86dgaproto \
-xorg-xf86bigfontproto xorg-xf86miscproto xorg-trapproto"
 SUGGESTED="xorg-xf86-input-evdev xorg-xf86-video-vesa"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WEB_SITE="http://www.x.org/"
 WGET_URL="http://xorg.freedesktop.org/releases/individual/xserver/$TARBALL"
 
+# Mesa build dep make also Xorg depends on libdrm.
+DEPENDS="xorg-xkeyboard-config xorg-libpciaccess xorg-libXxf86vm \
+xorg-libXfont xorg-libXau xorg-base-fonts libgcrypt pixman udev libdrm"
+BUILD_DEPENDS="xorg-libxkbfile-dev xorg-libpciaccess-dev xorg-libXxf86vm-dev \
+xorg-libXfont-dev libgcrypt-dev pixman-dev udev-dev mesa-dev pkg-config perl \
+flex xorg-xf86driproto xorg-xcmiscproto xorg-bigreqsproto xorg-randrproto \
+xorg-dri2proto xorg-libXau-dev xorg-dev-proto libdrm-dev"
+
 # Rules to configure and make the package.
 compile_rules()
 {
 	cd $src
+	# Xephyr make possible to use Xorg in a chroot: --enable-xephyr
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
@@ -34,14 +33,18 @@
 		--with-serverconfig-path=/etc/X11 \
 		--enable-install-setuid \
 		--enable-xorg \
+		--enable-kdrive \
+		--enable-kdrive-kbd \
+		--enable-kdrive-mouse \
+		--enable-kdrive-evdev \
+		--enable-xfbdev \
 		--enable-config-udev \
 		--disable-config-dbus \
 		--with-fontrootdir=/usr/share/fonts \
 		--with-os-name="SliTaz GNU/Linux" \
 		--with-builder-addr=$MAINTAINER \
 		$CONFIGURE_ARGS &&
-	make &&
-	make DESTDIR=$PWD/_pkg install
+	make && make DESTDIR=$DESTDIR install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.