# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1394060638 -3600
# Node ID 73fb2ebfd59a6b7cac98bb821a7d173249806caf
# Parent  ece91be34a06f06a2155d5d7eeb61bb73651cd60
arm: Add a bunch of Xorg pkgs

diff -r ece91be34a06 -r 73fb2ebfd59a glib/receipt
--- a/glib/receipt	Wed Mar 05 23:46:52 2014 +0100
+++ b/glib/receipt	Thu Mar 06 00:03:58 2014 +0100
@@ -37,11 +37,6 @@
 				$CONFIGURE_ARGS ;;
 		arm)
 			# Native ARM build --> if ARCH != SLITAZ_ARCH ?
-			
-			# Libtool fixes: /usr/bin/cross libhack (when released)
-			sed -i s"#/usr/lib#/cross/$ARCH/sysroot/usr/lib#" \
-				/cross/${ARCH}/sysroot/usr/lib/libpcre.la \
-				/cross/${ARCH}/sysroot/usr/lib/libffi.la || exit 1
 			#export LIBTOOL=arm-slitaz-linux-gnueabi-libtool 
 			export LD_LIBRARY_PATH=/cross/arm/sysroot/usr/lib:/usr/lib:/lib
 			export PKG_CONFIG_LIBPATH=/cross/arm/sysroot/usr/lib/pkgconfig
diff -r ece91be34a06 -r 73fb2ebfd59a libid3tag-dev/receipt
--- a/libid3tag-dev/receipt	Wed Mar 05 23:46:52 2014 +0100
+++ b/libid3tag-dev/receipt	Thu Mar 06 00:03:58 2014 +0100
@@ -8,6 +8,7 @@
 LICENSE="GPL2"
 WANTED="libid3tag"
 WEB_SITE="http://www.underbit.com/products/mad"
+HOST_ARCH="i486 arm"
 
 DEPENDS="libid3tag pkg-config"
 
diff -r ece91be34a06 -r 73fb2ebfd59a libid3tag/receipt
--- a/libid3tag/receipt	Wed Mar 05 23:46:52 2014 +0100
+++ b/libid3tag/receipt	Thu Mar 06 00:03:58 2014 +0100
@@ -9,6 +9,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://www.underbit.com/products/mad/"
 WGET_URL="http://downloads.sourceforge.net/mad/$TARBALL"
+HOST_ARCH="i486 arm"
 
 DEPENDS="zlib"
 BUILD_DEPENDS="zlib-dev"
@@ -16,10 +17,8 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
-	./configure --prefix=/usr $CONFIGURE_ARGS
-	make
-	make DESTDIR=$DESTDIR install
+	./configure --prefix=/usr $CONFIGURE_ARGS &&
+	make && make DESTDIR=$DESTDIR install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r ece91be34a06 -r 73fb2ebfd59a libxcb-dev/receipt
--- a/libxcb-dev/receipt	Wed Mar 05 23:46:52 2014 +0100
+++ b/libxcb-dev/receipt	Thu Mar 06 00:03:58 2014 +0100
@@ -7,7 +7,7 @@
 MAINTAINER="mallory@sweetpeople.org"
 LICENSE="other"
 WEB_SITE="http://xcb.freedesktop.org/"
-#HOST_ARCH="i486 arm"
+HOST_ARCH="i486 arm"
 
 WANTED="libxcb"
 DEPENDS="libxcb xorg-libXau-dev xorg-libXdmcp-dev pkg-config"
diff -r ece91be34a06 -r 73fb2ebfd59a libxcb/receipt
--- a/libxcb/receipt	Wed Mar 05 23:46:52 2014 +0100
+++ b/libxcb/receipt	Thu Mar 06 00:03:58 2014 +0100
@@ -9,14 +9,16 @@
 WEB_SITE="http://xcb.freedesktop.org/"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="${WEB_SITE}dist/$TARBALL"
-#HOST_ARCH="i486 arm"
+HOST_ARCH="i486 arm"
 
 DEPENDS="glibc-base xorg-libXau xorg-libXdmcp"
 BUILD_DEPENDS="libxslt-dev xcb-proto xorg-libXau-dev xorg-libXdmcp-dev \
 autoconf automake libtool"
 
 case "$ARCH" in
-	arm) BUILD_DEPENDS="libxslt-dev xcb-proto xorg-libXau-dev" ;;
+	arm)
+		# We need host xcb-proto libxslt-dev file installed
+		BUILD_DEPENDS="libxslt-dev xcb-proto xorg-libXau-dev xorg-libXdmcp-dev" ;;
 esac
 
 # Rules to configure and make the package.
diff -r ece91be34a06 -r 73fb2ebfd59a libxslt-dev/receipt
--- a/libxslt-dev/receipt	Wed Mar 05 23:46:52 2014 +0100
+++ b/libxslt-dev/receipt	Thu Mar 06 00:03:58 2014 +0100
@@ -8,7 +8,7 @@
 LICENSE="MIT"
 WANTED="libxslt"
 WEB_SITE="http://xmlsoft.org/"
-#HOST_ARCH="i486 arm"
+HOST_ARCH="i486 arm"
 
 DEPENDS="libxslt libxslt-python libgcrypt-dev libxml2-dev zlib-dev"
 
diff -r ece91be34a06 -r 73fb2ebfd59a libxslt/receipt
--- a/libxslt/receipt	Wed Mar 05 23:46:52 2014 +0100
+++ b/libxslt/receipt	Thu Mar 06 00:03:58 2014 +0100
@@ -9,13 +9,15 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://www.xmlsoft.org/XSLT/"
 WGET_URL="ftp://xmlsoft.org/libxslt/$TARBALL"
-#HOST_ARCH="i486 arm"
+HOST_ARCH="i486 arm"
 
-DEPENDS="libgcrypt libxml2 zlib"
-BUILD_DEPENDS="libgcrypt-dev libxml2-dev zlib-dev python-dev"
+DEPENDS="libgcrypt libgpg-error libxml2 zlib"
+BUILD_DEPENDS="libgcrypt-dev libgpg-error-dev libxml2-dev zlib-dev \
+python-dev"
 
+# Handle cross compilation
 case "$ARCH" in
-	arm) BUILD_DEPENDS="libgcrypt-dev libxml2-dev" ;;
+	arm) BUILD_DEPENDS="libgcrypt-dev libgpg-error-dev libxml2-dev" ;;
 esac
 
 # Rules to configure and make the package.
diff -r ece91be34a06 -r 73fb2ebfd59a moc/receipt
--- a/moc/receipt	Wed Mar 05 23:46:52 2014 +0100
+++ b/moc/receipt	Thu Mar 06 00:03:58 2014 +0100
@@ -9,17 +9,22 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WEB_SITE="http://moc.daper.net/"
 WGET_URL="ftp://ftp.daper.net/pub/soft/moc/stable/$TARBALL"
+#HOST_ARCH="i486 arm"
 
 DEPENDS="alsa-lib libvorbis libogg libmad libid3tag flac curl \
 libsamplerate libsndfile libtool ffmpeg ncursesw"
 BUILD_DEPENDS="libvorbis-dev libogg-dev libmad-dev libid3tag-dev flac-dev \
-curl-dev libsamplerate-dev alsa-lib-dev libcurl ncurses-dev \
-libsndfile-dev libsndfile libid3tag pkg-config libsamplerate" 
+curl-dev libsamplerate-dev alsa-lib-dev ncurses-dev libsndfile-dev libsamplerate"
+
+# Handle cross compilation
+case "$ARCH" in
+	arm) BUILD_DEPENDS="alsa-lib-dev libid3tag-dev libogg-dev libvorbis-dev" ;;
+esac
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
+	export LIBTOOL=${HOST_SYSTEM}-libtool
 	./configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
diff -r ece91be34a06 -r 73fb2ebfd59a xorg-fontsproto/receipt
--- a/xorg-fontsproto/receipt	Wed Mar 05 23:46:52 2014 +0100
+++ b/xorg-fontsproto/receipt	Thu Mar 06 00:03:58 2014 +0100
@@ -10,6 +10,7 @@
 SOURCE="fontsproto"
 TARBALL="$SOURCE-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/proto/$TARBALL"
+HOST_ARCH="i486 arm"
 
 DEPENDS="xorg-xproto pkg-config"
 BUILD_DEPENDS="xorg-util-macros"
diff -r ece91be34a06 -r 73fb2ebfd59a xorg-inputproto/receipt
--- a/xorg-inputproto/receipt	Wed Mar 05 23:46:52 2014 +0100
+++ b/xorg-inputproto/receipt	Thu Mar 06 00:03:58 2014 +0100
@@ -10,6 +10,7 @@
 SOURCE="inputproto"
 TARBALL="$SOURCE-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/proto/$TARBALL"
+HOST_ARCH="i486 arm"
 
 DEPENDS="xorg-xproto pkg-config"
 BUILD_DEPENDS="xorg-util-macros"
diff -r ece91be34a06 -r 73fb2ebfd59a xorg-kbproto/receipt
--- a/xorg-kbproto/receipt	Wed Mar 05 23:46:52 2014 +0100
+++ b/xorg-kbproto/receipt	Thu Mar 06 00:03:58 2014 +0100
@@ -10,6 +10,7 @@
 SOURCE="kbproto"
 TARBALL="$SOURCE-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/proto/$TARBALL"
+HOST_ARCH="i486 arm"
 
 DEPENDS="xorg-utils-macros pkg-config"
 BUILD_DEPENDS="xorg-util-macros"
diff -r ece91be34a06 -r 73fb2ebfd59a xorg-libX11-dev/receipt
--- a/xorg-libX11-dev/receipt	Wed Mar 05 23:46:52 2014 +0100
+++ b/xorg-libX11-dev/receipt	Thu Mar 06 00:03:58 2014 +0100
@@ -7,6 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="other"
 WEB_SITE="http://www.x.org/"
+HOST_ARCH="i486 arm"
 
 WANTED="xorg-libX11"
 DEPENDS="xorg-libX11 xorg-xtrans libxcb-dev xorg-kbproto xorg-inputproto \
diff -r ece91be34a06 -r 73fb2ebfd59a xorg-libX11/receipt
--- a/xorg-libX11/receipt	Wed Mar 05 23:46:52 2014 +0100
+++ b/xorg-libX11/receipt	Thu Mar 06 00:03:58 2014 +0100
@@ -10,10 +10,11 @@
 SOURCE="libX11"
 TARBALL="$SOURCE-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
+HOST_ARCH="i486 arm"
 
-DEPENDS="libxcb"
+DEPENDS="libxcb xorg-libXau xorg-libXdmcp"
 BUILD_DEPENDS="xorg-xtrans libxcb-dev xorg-kbproto xorg-xf86bigfontproto \
-xorg-inputproto xorg-xextproto"
+xorg-inputproto xorg-xextproto xorg-libXau-dev xorg-libXdmcp-dev"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r ece91be34a06 -r 73fb2ebfd59a xorg-libXext/receipt
--- a/xorg-libXext/receipt	Wed Mar 05 23:46:52 2014 +0100
+++ b/xorg-libXext/receipt	Thu Mar 06 00:03:58 2014 +0100
@@ -10,6 +10,7 @@
 SOURCE="libXext"
 TARBALL="$SOURCE-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
+HOST_ARCH="i486 arm"
 
 DEPENDS="xorg-libX11"
 BUILD_DEPENDS="xorg-libX11-dev"
diff -r ece91be34a06 -r 73fb2ebfd59a xorg-libXfont-dev/receipt
--- a/xorg-libXfont-dev/receipt	Wed Mar 05 23:46:52 2014 +0100
+++ b/xorg-libXfont-dev/receipt	Thu Mar 06 00:03:58 2014 +0100
@@ -7,6 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="other"
 WEB_SITE="http://www.x.org/"
+HOST_ARCH="i486 arm"
 
 WANTED="xorg-libXfont"
 DEPENDS="xorg-libXfont xorg-fontsproto xorg-libfontenc-dev freetype-dev \
diff -r ece91be34a06 -r 73fb2ebfd59a xorg-libXfont/receipt
--- a/xorg-libXfont/receipt	Wed Mar 05 23:46:52 2014 +0100
+++ b/xorg-libXfont/receipt	Thu Mar 06 00:03:58 2014 +0100
@@ -10,9 +10,11 @@
 TARBALL="$SOURCE-$VERSION.tar.bz2"
 WEB_SITE="http://www.x.org/"
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
+HOST_ARCH="i486 arm"
 
-DEPENDS="bzlib freetype xorg-libfontenc"
-BUILD_DEPENDS="freetype-dev zlib-dev xorg-xtrans xorg-fontsproto xorg-libfontenc-dev"
+DEPENDS="bzlib freetype xorg-libfontenc xorg-libXfont"
+BUILD_DEPENDS="bzip2-dev freetype-dev zlib-dev xorg-xtrans xorg-fontsproto \
+xorg-libfontenc-dev"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r ece91be34a06 -r 73fb2ebfd59a xorg-libXxf86vm/receipt
--- a/xorg-libXxf86vm/receipt	Wed Mar 05 23:46:52 2014 +0100
+++ b/xorg-libXxf86vm/receipt	Thu Mar 06 00:03:58 2014 +0100
@@ -10,9 +10,10 @@
 TARBALL="$SOURCE-$VERSION.tar.bz2"
 WEB_SITE="http://www.x.org/"
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
+#HOST_ARCH="i486 arm"
 
-DEPENDS="xorg-libXext"
-BUILD_DEPENDS="xorg-libXext-dev xorg-xf86vidmodeproto"
+DEPENDS="xorg-libX11 xorg-libXext"
+BUILD_DEPENDS="xorg-libX11-dev xorg-libXext-dev xorg-xf86vidmodeproto"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r ece91be34a06 -r 73fb2ebfd59a xorg-libfontenc-dev/receipt
--- a/xorg-libfontenc-dev/receipt	Wed Mar 05 23:46:52 2014 +0100
+++ b/xorg-libfontenc-dev/receipt	Thu Mar 06 00:03:58 2014 +0100
@@ -7,9 +7,10 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="other"
 WEB_SITE="http://www.x.org/"
+HOST_ARCH="i486 arm"
 
 WANTED="xorg-libfontenc"
-DEPENDS="xorg-libfontenc pkg-config"
+DEPENDS="$WANTED"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r ece91be34a06 -r 73fb2ebfd59a xorg-libfontenc/receipt
--- a/xorg-libfontenc/receipt	Wed Mar 05 23:46:52 2014 +0100
+++ b/xorg-libfontenc/receipt	Thu Mar 06 00:03:58 2014 +0100
@@ -10,6 +10,7 @@
 TARBALL="$SOURCE-$VERSION.tar.bz2"
 WEB_SITE="http://www.x.org/"
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
+HOST_ARCH="i486 arm"
 
 DEPENDS="zlib"
 BUILD_DEPENDS="zlib-dev xorg-xproto"
diff -r ece91be34a06 -r 73fb2ebfd59a xorg-libpciaccess-dev/receipt
--- a/xorg-libpciaccess-dev/receipt	Wed Mar 05 23:46:52 2014 +0100
+++ b/xorg-libpciaccess-dev/receipt	Thu Mar 06 00:03:58 2014 +0100
@@ -9,6 +9,7 @@
 WANTED="xorg-libpciaccess"
 SOURCE="libpciaccess"
 WEB_SITE="http://www.x.org/"
+HOST_ARCH="i486 arm"
 
 DEPENDS="xorg-libpciaccess pkg-config"
 
diff -r ece91be34a06 -r 73fb2ebfd59a xorg-libpciaccess/receipt
--- a/xorg-libpciaccess/receipt	Wed Mar 05 23:46:52 2014 +0100
+++ b/xorg-libpciaccess/receipt	Thu Mar 06 00:03:58 2014 +0100
@@ -10,6 +10,7 @@
 TARBALL="$SOURCE-$VERSION.tar.bz2"
 WEB_SITE="http://www.x.org/"
 WGET_URL="ftp://ftp.solnet.ch/mirror/x.org/pub/individual/lib/$TARBALL"
+HOST_ARCH="i486 arm"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r ece91be34a06 -r 73fb2ebfd59a xorg-libxkbfile-dev/receipt
--- a/xorg-libxkbfile-dev/receipt	Wed Mar 05 23:46:52 2014 +0100
+++ b/xorg-libxkbfile-dev/receipt	Thu Mar 06 00:03:58 2014 +0100
@@ -9,8 +9,9 @@
 SOURCE="libxkbfile"
 WANTED="xorg-libxkbfile"
 WEB_SITE="http://www.x.org/"
+HOST_ARCH="i486 arm"
 
-DEPENDS="xorg-libX11-dev xorg-libxkbfile pkg-config"
+DEPENDS="xorg-libX11-dev xorg-libxkbfile"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r ece91be34a06 -r 73fb2ebfd59a xorg-libxkbfile/receipt
--- a/xorg-libxkbfile/receipt	Wed Mar 05 23:46:52 2014 +0100
+++ b/xorg-libxkbfile/receipt	Thu Mar 06 00:03:58 2014 +0100
@@ -10,19 +10,20 @@
 TARBALL="$SOURCE-$VERSION.tar.bz2"
 WEB_SITE="http://www.x.org/"
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
+HOST_ARCH="i486 arm"
 
-DEPENDS="xorg-libX11"
-BUILD_DEPENDS="xorg-libX11-dev"
+DEPENDS="xorg-libX11 libxcb xorg-libXau xorg-libXdmcp"
+BUILD_DEPENDS="xorg-libX11-dev libxcb-dev xorg-libXau-dev xorg-libXdmcp-dev"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-    cd $src
-    ./configure --prefix=/usr --sysconfdir=/etc \
-    --mandir=/usr/share/man --localstatedir=/var \
-    $CONFIGURE_ARGS
-    make
-    make DESTDIR=$DESTDIR install
+	./configure \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		$CONFIGURE_ARGS &&
+	make &&
+	make DESTDIR=$DESTDIR install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r ece91be34a06 -r 73fb2ebfd59a xorg-server-light/receipt
--- a/xorg-server-light/receipt	Wed Mar 05 23:46:52 2014 +0100
+++ b/xorg-server-light/receipt	Thu Mar 06 00:03:58 2014 +0100
@@ -12,6 +12,7 @@
 WEB_SITE="http://www.x.org/"
 WGET_URL="http://xorg.freedesktop.org/releases/individual/xserver/$TARBALL"
 PROVIDE="xorg-server"
+#HOST_ARCH="i486 arm"
 
 DEPENDS="xorg-xkeyboard-config xorg-libpciaccess xorg-libXxf86vm \
 xorg-libXfont xorg-libXau xorg-base-fonts libgcrypt pixman udev \
@@ -19,13 +20,15 @@
 BUILD_DEPENDS="xorg-libxkbfile-dev xorg-libpciaccess-dev xorg-libXxf86vm-dev \
 xorg-libXfont-dev libgcrypt-dev pixman-dev udev-dev perl flex xorg-dev-proto"
 
+# Handle arch compilation
+case "$ARCH" in
+	arm) BUILD_DEPENDS="xorg-libxkbfile-dev xorg-libpciaccess-dev \
+xorg-libXfont-dev libgcrypt-dev pixman-dev" ;;
+esac
+
 # 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 \
@@ -49,6 +52,7 @@
 		--disable-xvfb \
 		--disable-xnest \
 		--disable-xfbdev \
+		--disable-xv \
 		$CONFIGURE_ARGS &&
 	make && make install
 }
diff -r ece91be34a06 -r 73fb2ebfd59a xorg-xextproto/receipt
--- a/xorg-xextproto/receipt	Wed Mar 05 23:46:52 2014 +0100
+++ b/xorg-xextproto/receipt	Thu Mar 06 00:03:58 2014 +0100
@@ -10,6 +10,7 @@
 SOURCE="xextproto"
 TARBALL="$SOURCE-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/proto/$TARBALL"
+HOST_ARCH="i486 arm"
 
 DEPENDS="xorg-util-macros pkg-config"
 BUILD_DEPENDS="xorg-util-macros"
diff -r ece91be34a06 -r 73fb2ebfd59a xorg-xf86bigfontproto/receipt
--- a/xorg-xf86bigfontproto/receipt	Wed Mar 05 23:46:52 2014 +0100
+++ b/xorg-xf86bigfontproto/receipt	Thu Mar 06 00:03:58 2014 +0100
@@ -10,6 +10,7 @@
 SOURCE="xf86bigfontproto"
 TARBALL="$SOURCE-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/proto/$TARBALL"
+HOST_ARCH="i486 arm"
 
 DEPENDS="xorg-util-macros pkg-config"
 BUILD_DEPENDS="xorg-util-macros"
diff -r ece91be34a06 -r 73fb2ebfd59a xorg-xf86vidmodeproto/receipt
--- a/xorg-xf86vidmodeproto/receipt	Wed Mar 05 23:46:52 2014 +0100
+++ b/xorg-xf86vidmodeproto/receipt	Thu Mar 06 00:03:58 2014 +0100
@@ -10,6 +10,7 @@
 SOURCE="xf86vidmodeproto"
 TARBALL="$SOURCE-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/proto/$TARBALL"
+HOST_ARCH="i486 arm"
 
 DEPENDS="xorg-xproto pkg-config"
 BUILD_DEPENDS="xorg-util-macros"
diff -r ece91be34a06 -r 73fb2ebfd59a xorg-xtrans/receipt
--- a/xorg-xtrans/receipt	Wed Mar 05 23:46:52 2014 +0100
+++ b/xorg-xtrans/receipt	Thu Mar 06 00:03:58 2014 +0100
@@ -10,6 +10,7 @@
 SOURCE="xtrans"
 TARBALL="$SOURCE-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
+HOST_ARCH="i486 arm"
 
 DEPENDS="xorg-xproto"
 BUILD_DEPENDS="xorg-util-macros"