# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1394654043 -3600
# Node ID 9be2dfe2fe72bf84a04fc20ad84ca127be5fd62f
# Parent  89f18ec827a9fddee1c00ffd3da60fcb3b5e28cd
ARM: xorg-server-light cross compile and add more needed packages

diff -r 89f18ec827a9 -r 9be2dfe2fe72 attr/receipt
--- a/attr/receipt	Wed Mar 12 19:55:40 2014 +0100
+++ b/attr/receipt	Wed Mar 12 20:54:03 2014 +0100
@@ -44,4 +44,7 @@
 	cp -a $install/usr/lib/*.so* $fs/usr/lib
 	cp -a $install/usr/bin $fs/usr
 	find $fs -type f -name '*.so*' -exec chmod a+x \{\} \;
+	# Fix /usr/lib/libattr.so
+	cd $fs/usr/lib
+	rm libattr.so && ln -s ../../lib/libattr.so
 }
diff -r 89f18ec827a9 -r 9be2dfe2fe72 giflib-dev/receipt
--- a/giflib-dev/receipt	Wed Mar 12 19:55:40 2014 +0100
+++ b/giflib-dev/receipt	Wed Mar 12 20:54:03 2014 +0100
@@ -8,6 +8,7 @@
 MAINTAINER="rcx@zoominternet.net"
 LICENSE="MIT"
 WANTED="giflib"
+HOST_ARCH="i486 arm"
 
 DEPENDS="giflib"
 
diff -r 89f18ec827a9 -r 9be2dfe2fe72 giflib/receipt
--- a/giflib/receipt	Wed Mar 12 19:55:40 2014 +0100
+++ b/giflib/receipt	Wed Mar 12 20:54:03 2014 +0100
@@ -9,6 +9,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WEB_SITE="http://sourceforge.net/projects/giflib/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
+HOST_ARCH="i486 arm"
 
 DEPENDS="glibc-base xorg-libSM xorg-libICE xorg-libX11 xorg-libXau \
 xorg-libXdmcp"
@@ -17,19 +18,22 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	sed -i '/AC_PATH_XTRA/d' configure.ac
 	libtoolize -f
 	autoreconf
 	./configure \
 		$CONFIGURE_ARGS &&
 	make && make DESTDIR=$DESTDIR install
-	# libungif compatibility - instructions taken from Redhat specfile
-	MAJOR=`echo $VERSION | sed 's/\([0-9]\+\)\..*/\1/'`
-	gcc -shared -Wl,-soname,libungif.so.${MAJOR} -Llib/.libs -lgif -o libungif.so.$VERSION
-	install -m755 libungif.so.${VERSION} "$DESTDIR/usr/lib/"
-	ln -sf libungif.so.$VERSIN "$DESTDIR/usr/lib/libungif.so.4"
-	ln -sf libungif.so.4 "$DESTDIR/usr/lib/libungif.so"
+	case "$ARCH" in
+		i?86)
+			# libungif compatibility - instructions taken from Redhat specfile
+			MAJOR=`echo $VERSION | sed 's/\([0-9]\+\)\..*/\1/'`
+			gcc -shared -Wl,-soname,libungif.so.${MAJOR} \
+				-Llib/.libs -lgif -o libungif.so.$VERSION
+			install -m755 libungif.so.${VERSION} "$DESTDIR/usr/lib/"
+			ln -sf libungif.so.$VERSIN "$DESTDIR/usr/lib/libungif.so.4"
+			ln -sf libungif.so.4 "$DESTDIR/usr/lib/libungif.so" ;;
+	esac
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r 89f18ec827a9 -r 9be2dfe2fe72 hsetroot/receipt
--- a/hsetroot/receipt	Wed Mar 12 19:55:40 2014 +0100
+++ b/hsetroot/receipt	Wed Mar 12 20:54:03 2014 +0100
@@ -10,20 +10,20 @@
 WEB_SITE="http://thegraveyard.org/hsetroot.php"
 WGET_URL="http://thegraveyard.org/files/$TARBALL"
 TAGS="wallpaper"
+HOST_ARCH="i486 arm"
 
 DEPENDS="imlib2 libpng freetype xorg-libX11 xorg-libXau xorg-libXdmcp \
 xorg-libXext"
 BUILD_DEPENDS="imlib2-dev libpng-dev"
 
+# ARM: imlib2-dev must be installed in build chroot
+
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	./configure \
-		--prefix=/usr \
 		$CONFIGURE_ARGS &&
-	make &&
-	make DESTDIR=$DESTDIR install
+	make && make install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r 89f18ec827a9 -r 9be2dfe2fe72 imlib2-dev/receipt
--- a/imlib2-dev/receipt	Wed Mar 12 19:55:40 2014 +0100
+++ b/imlib2-dev/receipt	Wed Mar 12 20:54:03 2014 +0100
@@ -8,6 +8,7 @@
 LICENSE="GPL LGPL2"
 WANTED="imlib2"
 WEB_SITE="http://sourceforge.net/projects/enlightenment/"
+HOST_ARCH="i486 arm"
 
 DEPENDS="imlib2 pkg-config"
 
diff -r 89f18ec827a9 -r 9be2dfe2fe72 imlib2/receipt
--- a/imlib2/receipt	Wed Mar 12 19:55:40 2014 +0100
+++ b/imlib2/receipt	Wed Mar 12 20:54:03 2014 +0100
@@ -9,18 +9,21 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://sourceforge.net/projects/enlightenment/"
 WGET_URL="$SF_MIRROR/enlightenment/$TARBALL"
+HOST_ARCH="i486 arm"
 
 DEPENDS="libpng tiff jpeg xorg-libXpm bzlib freetype libid3tag \
 xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext giflib xorg-libSM \
 xorg-libICE"
 BUILD_DEPENDS="libpng-dev tiff-dev jpeg-dev giflib-dev bzip2-dev \
-xorg-libXpm-dev xorg-xextproto libid3tag-dev xorg-dev pkg-config \
-freetype-dev zlib-dev util-linux-uuid-dev"
+xorg-libXpm-dev xorg-xextproto libid3tag-dev pkg-config freetype-dev \
+zlib-dev util-linux-uuid-dev"
+
+# ARM: jpeg-dev must be installed in build chroot and libjpeg.la must
+# be modified manually
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	./configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
diff -r 89f18ec827a9 -r 9be2dfe2fe72 jwm/receipt
--- a/jwm/receipt	Wed Mar 12 19:55:40 2014 +0100
+++ b/jwm/receipt	Wed Mar 12 20:54:03 2014 +0100
@@ -10,11 +10,17 @@
 WEB_SITE="http://www.joewing.net/programs/jwm/"
 WGET_URL="http://www.joewing.net/programs/jwm/releases/$TARBALL"
 TAGS="wm window-manager"
+HOST_ARCH="i486 arm"
 
 DEPENDS="xorg-libX11 xorg-libXft xorg-libXrender xorg-libXpm xorg-libXext \
 xorg-libXmu xorg-libXinerama xorg-libXau xorg-libXdmcp xorg-libXt libjpeg \
 libpng slitaz-configs-base xorg-xload xorg-xclock nano imlib2 hsetroot compton"
-BUILD_DEPENDS="xorg-dev xorg-libXft-dev jpeg-dev libpng-dev"
+BUILD_DEPENDS="xorg-libX11-dev xorg-libXft-dev jpeg-dev libpng-dev"
+
+# Handle cross compilation
+case "$ARCH" in
+	arm) ARCH_ARGS="--disable-nls" ;;
+esac
 
 # Rules to configure and make the package.
 compile_rules()
@@ -26,11 +32,18 @@
     	--mandir=/usr/share/man \
 		--sysconfdir=/etc/xdg/jwm \
 		--disable-fribidi \
-		$CONFIGURE_ARGS 2>&1 | \
-		sed 's/config.rpath: No such/config.rpath: no such/' &&
+		--disable-rpath \
+		--disable-rsvg \
+		--disable-confirm \
+		$CONFIGURE_ARGS $ARCH_ARGS 2>/dev/null &&
 	make && make install
 }
 
+testsuite()
+{
+	readelf -h $install/usr/bin/jwm
+}
+
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
diff -r 89f18ec827a9 -r 9be2dfe2fe72 kmod-dev/receipt
--- a/kmod-dev/receipt	Wed Mar 12 19:55:40 2014 +0100
+++ b/kmod-dev/receipt	Wed Mar 12 20:54:03 2014 +0100
@@ -1,13 +1,14 @@
 # SliTaz package receipt.
 
 PACKAGE="kmod-dev"
-VERSION="14"
+VERSION="16"
 CATEGORY="development"
 SHORT_DESC="Kmod devel files."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WANTED="kmod"
 WEB_SITE="http://ftp.kernel.org/pub/linux/utils/kernel/kmod/"
+HOST_ARCH="i486 arm"
 
 DEPENDS="kmod liblzma-dev pkg-config"
 
@@ -15,7 +16,7 @@
 genpkg_rules()
 {
 	mkdir -p $fs/lib $fs/usr/lib
-	cp -a $install/lib/*.*a $fs/lib
+	cp -a $install/usr/lib/*.*a $fs/usr/lib
 	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
 	cp -a $install/usr/include $fs/usr
 }
diff -r 89f18ec827a9 -r 9be2dfe2fe72 kmod/receipt
--- a/kmod/receipt	Wed Mar 12 19:55:40 2014 +0100
+++ b/kmod/receipt	Wed Mar 12 20:54:03 2014 +0100
@@ -10,14 +10,19 @@
 WEB_SITE="http://ftp.kernel.org/pub/linux/utils/kernel/kmod/"
 WGET_URL="ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/$TARBALL"
 PROVIDE="modules-init-tools"
+HOST_ARCH="i486 arm"
 
 DEPENDS="zlib liblzma"
 BUILD_DEPENDS="zlib-dev liblzma-dev tar"
 
+# Handle cross compilation. ARM use build host: tar
+case "$ARCH" in
+	arm) BUILD_DEPENDS="zlib-dev liblzma-dev" ;;
+esac
+
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	./configure \
 		--bindir=/sbin \
 		--with-rootlibdir=/lib \
@@ -32,9 +37,11 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/lib $fs/bin
+	mkdir -p $fs/lib $fs/bin $fs/usr/lib
+	cp -a $install/sbin $fs
 	cp -a $install/lib/*.so* $fs/lib
-	cp -a $install/sbin $fs
+	cp -a $install/usr/lib/*.so* $fs/usr/lib
+	
 	cd $fs/sbin
 	# The kmod tools symlinks
 	for tool in rmmod insmod modinfo modprobe depmod
diff -r 89f18ec827a9 -r 9be2dfe2fe72 libgudev-dev/receipt
--- a/libgudev-dev/receipt	Wed Mar 12 19:55:40 2014 +0100
+++ b/libgudev-dev/receipt	Wed Mar 12 20:54:03 2014 +0100
@@ -8,6 +8,7 @@
 LICENSE="GPL2"
 WANTED="udev"
 WEB_SITE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
+HOST_ARCH="i486 arm"
 
 DEPENDS="udev udev-dev pkg-config"
 
diff -r 89f18ec827a9 -r 9be2dfe2fe72 libgudev/receipt
--- a/libgudev/receipt	Wed Mar 12 19:55:40 2014 +0100
+++ b/libgudev/receipt	Wed Mar 12 20:54:03 2014 +0100
@@ -8,6 +8,7 @@
 LICENSE="GPL2"
 WANTED="udev"
 WEB_SITE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
+HOST_ARCH="i486 arm"
 
 DEPENDS="udev"
 
diff -r 89f18ec827a9 -r 9be2dfe2fe72 udev-dev/receipt
--- a/udev-dev/receipt	Wed Mar 12 19:55:40 2014 +0100
+++ b/udev-dev/receipt	Wed Mar 12 20:54:03 2014 +0100
@@ -8,6 +8,7 @@
 LICENSE="GPL2"
 WANTED="udev"
 WEB_SITE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
+HOST_ARCH="i486 arm"
 
 DEPENDS="udev pkg-config"
 
diff -r 89f18ec827a9 -r 9be2dfe2fe72 udev/receipt
--- a/udev/receipt	Wed Mar 12 19:55:40 2014 +0100
+++ b/udev/receipt	Wed Mar 12 20:54:03 2014 +0100
@@ -10,16 +10,30 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WEB_SITE="http://www.freedesktop.org/software/systemd/man/udev.html"
 WGET_URL="http://www.kernel.org/pub/linux/utils/kernel/hotplug/$TARBALL"
+HOST_ARCH="i486 arm"
 
 DEPENDS="util-linux-blkid pciids usbids acl kmod"
 BUILD_DEPENDS="util-linux-blkid-dev gperf pkg-config pciutils acl-dev \
 libgio-dev usbutils-dev libusb-dev glib-dev pciids usbids kmod-dev \
 libgudev-dev pcre-dev liblzma-dev util-linux-uuid-dev"
 
+# Use build host: gperf
+BUILD_DEPENDS="util-linux-blkid-dev kmod-dev acl-dev glib-dev"
+
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
+	case "$ARCH" in
+		arm*) 
+			# ARM Hack
+			for la in libgthread-2.0.la libglib-2.0.la
+			do
+				if grep -q "^libdir='/usr/lib'" /usr/lib/${la}; then
+					sed -i s"#/usr/lib#/cross/$ARCH/sysroot/usr/lib#" \
+						/usr/lib/${la}
+				fi 
+			done ;;
+	esac
 	./configure \
 		--exec-prefix="" \
 		--with-rootprefix="" \
diff -r 89f18ec827a9 -r 9be2dfe2fe72 xorg-libXcomposite-dev/receipt
--- a/xorg-libXcomposite-dev/receipt	Wed Mar 12 19:55:40 2014 +0100
+++ b/xorg-libXcomposite-dev/receipt	Wed Mar 12 20:54:03 2014 +0100
@@ -7,6 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="other"
 WEB_SITE="http://www.x.org/"
+HOST_ARCH="i486 arm"
 
 WANTED="xorg-libXcomposite"
 DEPENDS="xorg-libXcomposite xorg-compositeproto xorg-libXfixes-dev pkg-config"
diff -r 89f18ec827a9 -r 9be2dfe2fe72 xorg-libXcomposite/receipt
--- a/xorg-libXcomposite/receipt	Wed Mar 12 19:55:40 2014 +0100
+++ b/xorg-libXcomposite/receipt	Wed Mar 12 20:54:03 2014 +0100
@@ -10,6 +10,7 @@
 SOURCE="libXcomposite"
 TARBALL="$SOURCE-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
+HOST_ARCH="i486 arm"
 
 DEPENDS="xorg-libX11"
 BUILD_DEPENDS="xorg-compositeproto xorg-libXfixes-dev"
diff -r 89f18ec827a9 -r 9be2dfe2fe72 xorg-libXfixes-dev/receipt
--- a/xorg-libXfixes-dev/receipt	Wed Mar 12 19:55:40 2014 +0100
+++ b/xorg-libXfixes-dev/receipt	Wed Mar 12 20:54:03 2014 +0100
@@ -7,6 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="other"
 WEB_SITE="http://www.x.org/"
+HOST_ARCH="i486 arm"
 
 WANTED="xorg-libXfixes"
 DEPENDS="xorg-libXfixes xorg-fixesproto xorg-libX11-dev pkg-config"
diff -r 89f18ec827a9 -r 9be2dfe2fe72 xorg-libXfixes/receipt
--- a/xorg-libXfixes/receipt	Wed Mar 12 19:55:40 2014 +0100
+++ b/xorg-libXfixes/receipt	Wed Mar 12 20:54:03 2014 +0100
@@ -10,6 +10,7 @@
 SOURCE="libXfixes"
 TARBALL="$SOURCE-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
+HOST_ARCH="i486 arm"
 
 DEPENDS="xorg-libX11"
 BUILD_DEPENDS="xorg-fixesproto xorg-libX11-dev"
diff -r 89f18ec827a9 -r 9be2dfe2fe72 xorg-libXxf86vm-dev/receipt
--- a/xorg-libXxf86vm-dev/receipt	Wed Mar 12 19:55:40 2014 +0100
+++ b/xorg-libXxf86vm-dev/receipt	Wed Mar 12 20:54:03 2014 +0100
@@ -9,6 +9,7 @@
 WANTED="xorg-libXxf86vm"
 SOURCE="libXxf86vm"
 WEB_SITE="http://www.x.org/"
+HOST_ARCH="i486 arm"
 
 DEPENDS="xorg-libXxf86vm xorg-libXext-dev xorg-xf86vidmodeproto pkg-config"
 
diff -r 89f18ec827a9 -r 9be2dfe2fe72 xorg-libXxf86vm/receipt
--- a/xorg-libXxf86vm/receipt	Wed Mar 12 19:55:40 2014 +0100
+++ b/xorg-libXxf86vm/receipt	Wed Mar 12 20:54:03 2014 +0100
@@ -10,7 +10,7 @@
 TARBALL="$SOURCE-$VERSION.tar.bz2"
 WEB_SITE="http://www.x.org/"
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
-#HOST_ARCH="i486 arm"
+HOST_ARCH="i486 arm"
 
 DEPENDS="xorg-libX11 xorg-libXext"
 BUILD_DEPENDS="xorg-libX11-dev xorg-libXext-dev xorg-xf86vidmodeproto"
diff -r 89f18ec827a9 -r 9be2dfe2fe72 xorg-server-Xfbdev/receipt
--- a/xorg-server-Xfbdev/receipt	Wed Mar 12 19:55:40 2014 +0100
+++ b/xorg-server-Xfbdev/receipt	Wed Mar 12 20:54:03 2014 +0100
@@ -9,91 +9,17 @@
 WANTED="xorg-server"
 SOURCE="xorg-server"
 WEB_SITE="http://www.x.org/"
-HOST_ARCH="i486 arm"
+HOST_ARCH="i486"
 
 DEPENDS="xorg-libXfont xorg-libXau xorg-libXdmcp zlib pixman libgcrypt \
 xorg-libxkbfile xorg-xkeyboard-config"
 
-#
-# This is the default Xserver for ARM platform until full Xorg or Xorg light
-# dont cross compile nicely. Note: on the RPi the Xorg driver is fbdev so
-# using Kdrive Xfbdev is a light and fast solution.
-#
-case "$ARCH" in
-	arm)
-		unset WANTED
-		SOURCE="xorg-server"
-		TARBALL="$SOURCE-$VERSION.tar.bz2"
-		WGET_URL="http://xorg.freedesktop.org/releases/individual/xserver/$TARBALL"
-		PROVIDE="xorg-server"
-		BUILD_DEPENDS="xorg-libxkbfile-dev xorg-libpciaccess-dev pixman-dev \
-xorg-util-macros xorg-libXfont-dev libgcrypt-dev xorg-resourceproto \
-xorg-bigreqsproto xorg-xcmiscproto xorg-renderproto xorg-damageproto \
-xorg-compositeproto xorg-xf86dgaproto  xorg-randrproto xorg-recordproto \
-xorg-videoproto xorg-xtrans libgpg-error-dev libgcrypt-dev freetype-dev \
-libxcb-dev bzip2-dev"
-		export ARM_LIBS="/cross/$arch/sysroot/usr/lib" 
-		export LIBTOOL=${HOST_SYSTEM}-libtool  
-		export XSERVERCFLAGS_LIBS="-L${ARM_LIBS} -lrt -lpthread -lgcrypt \
--lm -lz -lcrypto -lxkbfile -lXfont -lfreetype -lXau -lfontenc -lXdmcp" 
-		export XSERVERLIBS_LIBS="-L${ARM_LIBS} -lrt -lpthread -lgcrypt \
--lm -lz -lcrypto -lxkbfile -lXfont -lfreetype -lXau -lfontenc -lXdmcp" ;;
-esac
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	case "$ARCH" in
-		arm*)
-			./configure \
-				--prefix=/usr \
-				--sysconfdir=/etc \
-				--localstatedir=/var \
-				--with-module-dir=/usr/lib/X11/modules \
-				--with-xkb-output=/var/lib/xkb \
-				--with-serverconfig-path=/etc/X11 \
-				--with-fontrootdir=/usr/share/fonts \
-				--with-os-name="SliTaz ARM" \
-				--with-vendor-web="http://arm.slitaz.org/" \
-				--with-builder-addr="$MAINTAINER" \
-				--enable-install-setuid \
-				--enable-kdrive \
-				--enable-kdrive-kbd \
-				--enable-kdrive-mouse \
-				--enable-kdrive-evdev \
-				--enable-xfbdev \
-				--disable-config-dbus \
-				--disable-config-udev \
-				--disable-screensaver \
-				--disable-glx \
-				--disable-dri \
-				--disable-dri2 \
-				--disable-xinerama \
-				--disable-libdrm \
-				--disable-xvfb \
-				--disable-xnest \
-				--disable-xephyr \
-				--disable-xfake \
-				--disable-xv \
-				--disable-xorg \
-				${CONFIGURE_ARGS} &&
-			make && make install ;;
-		*)
-			echo "Nothing to do for: $ARCH" ;;
-	esac
-}
-
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	mkdir -p $fs/usr/bin
 	cp -a $install/usr/bin/Xfbdev $fs/usr/bin
 	chmod 4711 $fs/usr/bin/Xfbdev
-	case "$ARCH" in
-		arm) 
-			cp -a $install/etc $fs 
-			cp -a $install/var $fs ;;
-	esac
 }
 
 # We need /var/tmp rw to let xkbcomp builr XKB definition.
diff -r 89f18ec827a9 -r 9be2dfe2fe72 xorg-server-dev/receipt
--- a/xorg-server-dev/receipt	Wed Mar 12 19:55:40 2014 +0100
+++ b/xorg-server-dev/receipt	Wed Mar 12 20:54:03 2014 +0100
@@ -6,8 +6,8 @@
 SHORT_DESC="Xorg server devel files needed to build drivers."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
-WANTED="xorg-server"
 WEB_SITE="http://www.x.org/"
+HOST_ARCH="i486 arm"
 
 DEPENDS="xorg-libxkbfile-dev xorg-libpciaccess-dev xorg-libXxf86vm-dev \
 xorg-libXfont-dev libgcrypt-dev pixman-dev udev-dev mesa-dev pkg-config \
@@ -18,6 +18,15 @@
 xorg-fontcacheproto xorg-printproto xorg-resourceproto xorg-xineramaproto \
 xorg-xf86bigfontproto xorg-xf86miscproto xorg-trapproto"
 
+# Use devel files from ARCH default Xserver
+case "$ARCH" in
+	i?86) 
+		WANTED="xorg-server" ;;
+	arm) 
+		WANTED="xorg-server-light" 
+		DEPENDS="" ;;
+esac
+
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
diff -r 89f18ec827a9 -r 9be2dfe2fe72 xorg-server-light/receipt
--- a/xorg-server-light/receipt	Wed Mar 12 19:55:40 2014 +0100
+++ b/xorg-server-light/receipt	Wed Mar 12 20:54:03 2014 +0100
@@ -1,44 +1,47 @@
 # SliTaz package receipt.
 
 PACKAGE="xorg-server-light"
-VERSION="1.12.4"
+VERSION="1.12.1"
 CATEGORY="x-window"
 SHORT_DESC="Xorg core server light version (no dri, gl, and friends)."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
-SUGGESTED="xorg-xf86-video-vesa"
 SOURCE="xorg-server"
 TARBALL="$SOURCE-$VERSION.tar.bz2"
 WEB_SITE="http://www.x.org/"
 WGET_URL="http://xorg.freedesktop.org/releases/individual/xserver/$TARBALL"
 PROVIDE="xorg-server"
-#HOST_ARCH="i486 arm"
+HOST_ARCH="i486 arm"
 
+SUGGESTED="xorg-xf86-video-vesa xorg-xf86-video-fbdev"
 DEPENDS="xorg-xkeyboard-config xorg-libpciaccess xorg-libXxf86vm \
-xorg-libXfont xorg-libXau xorg-base-fonts libgcrypt pixman udev \
-xorg-xf86-input-evdev libgpg-error libgcrypt freetype libxcb bzip2"
-BUILD_DEPENDS="xorg-libxkbfile-dev xorg-libpciaccess-dev xorg-libXxf86vm-dev \
-xorg-libXfont-dev libgpg-error-dev libgcrypt-dev pixman-dev udev-dev perl \
-flex xorg-dev-proto freetype-dev libxcb-dev bzip2-dev"
-
-# Handle cross compilation: ARM can't find -lmd
-case "$ARCH" in
-	arm)
-		BUILD_DEPENDS="xorg-libxkbfile-dev xorg-libpciaccess-dev pixman-dev \
+xorg-libXfont xorg-libXau xorg-base-fonts libgcrypt pixman \
+xorg-xf86-input-evdev libgpg-error libgcrypt freetype libxcb \
+xorg-libXcomposite bzip2"
+BUILD_DEPENDS="xorg-libxkbfile-dev xorg-libpciaccess-dev pixman-dev \
 xorg-util-macros xorg-libXfont-dev libgcrypt-dev xorg-resourceproto \
 xorg-bigreqsproto xorg-xcmiscproto xorg-renderproto xorg-damageproto \
 xorg-compositeproto xorg-xf86dgaproto  xorg-randrproto xorg-recordproto \
 xorg-videoproto xorg-xtrans libgpg-error-dev libgcrypt-dev freetype-dev \
-libxcb-dev bzip2-dev" 
-		ARCH_ARGS="--disable-config-udev --disable-xf86vidmode"
-		export ARM_LIBS="/cross/$arch/sysroot/usr/lib" 
-		export LIBTOOL=${HOST_SYSTEM}-libtool 
-		export XSERVERCFLAGS_LIBS="-L${ARM_LIBS} -lrt -lpthread -lmd -lgcrypt \
--lm -lz -lcrypto -lxkbfile -lXfont -lfreetype -lXau -lfontenc -lXdmcp" 
-		export XSERVERLIBS_LIBS="-L${ARM_LIBS} -lrt -lpthread -lmd -lgcrypt \
--lm -lz -lcrypto -lxkbfile -lXfont -lfreetype -lXau -lfontenc -lXdmcp" ;;
+libxcb-dev xorg-libXcomposite-dev xorg-libXxf86vm-dev bzip2-dev"
+
+# Handle arch installation
+case "$SLITAZ_ARCH" in
+	i?86) DEPENDS="$DEPENDS udev" ;;
+esac
+
+# Handle cross compilation. ARM use build host: perl flex
+case "$ARCH" in
+	arm)
+		#--disable-static
+		ARCH_ARGS="--disable-config-udev --enable-malloc0returnsnull" 
+		OS_NAME="SliTaz ARM"
+		VENDOR="http://arm.slitaz.org" ;;
 	i?86)
-		ARCH_ARGS="--enable-config-udev" ;;
+		BUILD_DEPENDS="$BUILD_DEPENDS perl flex udev-dev"
+		ARCH_ARGS="--enable-config-udev" 
+		OS_NAME="SliTaz GNU/Linux"
+		VENDOR="http://www.slitaz.org" ;;
 esac
 
 # Rules to configure and make the package.
@@ -52,8 +55,8 @@
 		--with-xkb-output=/var/lib/xkb \
 		--with-serverconfig-path=/etc/X11 \
 		--with-fontrootdir=/usr/share/fonts \
-		--with-os-name="SliTaz GNU/Linux" \
-		--with-vendor-web="http://www.slitaz.org/" \
+		--with-os-name="$OS_NAME" \
+		--with-vendor-web="$VENDOR" \
 		--with-builder-addr="$MAINTAINER" \
 		--enable-install-setuid \
 		--enable-xorg \
@@ -70,10 +73,19 @@
 		--disable-xephyr \
 		--disable-xfake \
 		--disable-xv \
+		--disable-ipv6 \
+		--disable-docs \
+		--disable-devel-docs \
 		${CONFIGURE_ARGS} ${ARCH_ARGS} &&
 	make && make install
 }
 
+# Be sure it as cross compile
+testsuite()
+{
+	readelf -h $install/usr/bin/Xorg
+}
+
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
diff -r 89f18ec827a9 -r 9be2dfe2fe72 xorg-xclock/receipt
--- a/xorg-xclock/receipt	Wed Mar 12 19:55:40 2014 +0100
+++ b/xorg-xclock/receipt	Wed Mar 12 20:54:03 2014 +0100
@@ -10,6 +10,7 @@
 TARBALL="$SOURCE-$VERSION.tar.bz2"
 WEB_SITE="http://www.x.org/"
 WGET_URL="$XORG_MIRROR/app/$TARBALL"
+HOST_ARCH="i486 arm"
 
 DEPENDS="xorg-libxkbfile xorg-libXft xorg-libXmu xorg-libXaw zlib"
 BUILD_DEPENDS="xorg-libXft-dev xorg-libXmu-dev xorg-libXaw-dev"
@@ -17,7 +18,6 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	./configure \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
diff -r 89f18ec827a9 -r 9be2dfe2fe72 xorg-xf86-input-evdev/receipt
--- a/xorg-xf86-input-evdev/receipt	Wed Mar 12 19:55:40 2014 +0100
+++ b/xorg-xf86-input-evdev/receipt	Wed Mar 12 20:54:03 2014 +0100
@@ -10,17 +10,22 @@
 TARBALL="$SOURCE-$VERSION.tar.bz2"
 WEB_SITE="http://www.x.org/"
 WGET_URL="$XORG_MIRROR/driver/$TARBALL"
+HOST_ARCH="i486 arm"
 
 # We can use xorg-server-light with evdev and vesa driver.
 #DEPENDS="xorg-server"
-BUILD_DEPENDS="xorg-server-dev"
+BUILD_DEPENDS="xorg-server-dev udev-dev"
 
 MODS='/usr/lib/X11/modules'
 
+# ARM use build system xorg-server-dev or manually install it in sysroot
+case "$ARCH" in
+	arm) BUILD_DEPENDS="udev-dev" ;;
+esac
+
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	./configure \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
diff -r 89f18ec827a9 -r 9be2dfe2fe72 xorg-xf86-video-fbdev/receipt
--- a/xorg-xf86-video-fbdev/receipt	Wed Mar 12 19:55:40 2014 +0100
+++ b/xorg-xf86-video-fbdev/receipt	Wed Mar 12 20:54:03 2014 +0100
@@ -10,15 +10,20 @@
 TARBALL="$SOURCE-$VERSION.tar.bz2"
 WEB_SITE="http://www.x.org/"
 WGET_URL="$XORG_MIRROR/driver/$TARBALL"
+HOST_ARCH="i486 arm"
 
-# We can use xorg-server-light with evdev and vesa driver.
+# We can use xorg-server-light with evdev and fbdev driver.
 #DEPENDS="xorg-server"
 BUILD_DEPENDS="xorg-server-dev"
 
+# ARM use build system xorg-server-dev or manually install it in sysroot
+case "$ARCH" in
+	arm) BUILD_DEPENDS="" ;;
+esac
+
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \