# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1394925725 -3600
# Node ID 53082fab5f1e623e5425586a7d412c6e48a1e25e
# Parent  6d8a4be89f3da16a50f75fa1052711d507659d7d
Some fixes, up ffplay, add more pkgs to ARM

diff -r 6d8a4be89f3d -r 53082fab5f1e dbus-dev/receipt
--- a/dbus-dev/receipt	Sat Mar 15 21:09:44 2014 +0100
+++ b/dbus-dev/receipt	Sun Mar 16 00:22:05 2014 +0100
@@ -8,6 +8,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.freedesktop.org/wiki/Software/dbus"
+HOST_ARCH="i486 arm"
 
 DEPENDS="dbus pkg-config"
 
diff -r 6d8a4be89f3d -r 53082fab5f1e dbus/receipt
--- a/dbus/receipt	Sat Mar 15 21:09:44 2014 +0100
+++ b/dbus/receipt	Sun Mar 16 00:22:05 2014 +0100
@@ -9,6 +9,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://www.freedesktop.org/wiki/Software/dbus"
 WGET_URL="http://dbus.freedesktop.org/releases/dbus/$TARBALL"
+HOST_ARCH="i486 arm"
 
 DEPENDS="expat xorg-libX11 slitaz-base-files xorg-libICE xorg-libSM \
 xorg-libXau xorg-libXdmcp util-linux-uuid"
diff -r 6d8a4be89f3d -r 53082fab5f1e enna/receipt
--- a/enna/receipt	Sat Mar 15 21:09:44 2014 +0100
+++ b/enna/receipt	Sun Mar 16 00:22:05 2014 +0100
@@ -17,7 +17,7 @@
 BUILD_DEPENDS="mercurial automake eina-dev eet-dev ecore-dev evas-dev efreet-dev \
 edje-dev edbus-dev emotion-dev elementary-dev ethumb-dev libvalhalla-dev curl-dev \
 xine-lib-dev libexif-dev alsa-lib-dev libplayer-dev libxml2-dev libtool expat-dev \
-jpeg-dev glib-dev ffmpeg-svn git eio-dev"
+jpeg-dev glib-dev ffmpeg-dev git eio-dev"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 6d8a4be89f3d -r 53082fab5f1e ffmpeg/receipt
--- a/ffmpeg/receipt	Sat Mar 15 21:09:44 2014 +0100
+++ b/ffmpeg/receipt	Sun Mar 16 00:22:05 2014 +0100
@@ -20,8 +20,10 @@
 
 # Handle cross compilation. Host coreutils-file-* are used
 case "$ARCH" in
-	i?86) ARCH_ARGS="--arch=$ARCH --cpu=$ARCH" ;;
-	arm*) BUILD_DEPENDS="zlib-dev bzip2-dev yasm" 
+	i?86) 
+		ARCH_ARGS="--arch=$ARCH --cpu=$ARCH" ;;
+	arm*) 
+		BUILD_DEPENDS="zlib-dev bzip2-dev yasm libsdl-dev" 
 		ARCH_ARGS="--enable-cross-compile --arch=armel --target-os=linux \
 --cross-prefix=$HOST_SYSTEM-" ;;
 esac
diff -r 6d8a4be89f3d -r 53082fab5f1e ffplay/receipt
--- a/ffplay/receipt	Sat Mar 15 21:09:44 2014 +0100
+++ b/ffplay/receipt	Sun Mar 16 00:22:05 2014 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="ffplay"
-VERSION="1.0"
+VERSION="2.1.4"
 CATEGORY="multimedia"
 SHORT_DESC="Very simple and portable media player using the ffmpeg and the SDL library."
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -9,6 +9,7 @@
 WEB_SITE="http://ffmpeg.org/"
 WANTED="ffmpeg"
 TAGS="audio video player"
+#HOST_ARCH="i486 arm"
 
 DEPENDS="ffmpeg libsdl"
 
diff -r 6d8a4be89f3d -r 53082fab5f1e fltk-dev/receipt
--- a/fltk-dev/receipt	Sat Mar 15 21:09:44 2014 +0100
+++ b/fltk-dev/receipt	Sun Mar 16 00:22:05 2014 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="fltk-dev"
-VERSION="1.3.0"
+VERSION="1.3.2"
 CATEGORY="development"
 SHORT_DESC="Fast Light Tool Kit devel files."
 WANTED="fltk"
diff -r 6d8a4be89f3d -r 53082fab5f1e fltk-doc/receipt
--- a/fltk-doc/receipt	Sat Mar 15 21:09:44 2014 +0100
+++ b/fltk-doc/receipt	Sun Mar 16 00:22:05 2014 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="fltk-doc"
-VERSION="1.3.0"
+VERSION="1.3.2"
 CATEGORY="development"
 SHORT_DESC="Fast Light Tool Kit documentation and examples."
 WANTED="fltk"
diff -r 6d8a4be89f3d -r 53082fab5f1e fltk/receipt
--- a/fltk/receipt	Sat Mar 15 21:09:44 2014 +0100
+++ b/fltk/receipt	Sun Mar 16 00:22:05 2014 +0100
@@ -1,29 +1,34 @@
 # SliTaz package receipt.
 
 PACKAGE="fltk"
-VERSION="1.3.0"
+VERSION="1.3.2"
 CATEGORY="system-tools"
 SHORT_DESC="Fast Light Tool Kit (provide fluid)."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="LGPL2"
 TARBALL="$PACKAGE-$VERSION-source.tar.gz"
 WEB_SITE="http://www.fltk.org/"
-WGET_URL="http://ftp.easysw.com/pub/fltk/$VERSION/$TARBALL"
+WGET_URL="http://fltk.org/pub/fltk/$VERSION/$TARBALL"
+#HOST_ARCH="i486 arm"
 
 DEPENDS="expat fontconfig freetype libpng jpeg xorg-libX11 xorg-libXau xorg-libXdmcp \
 xorg-libXext xorg-libXft xorg-libXrender zlib libpng gcc-lib-base mesa libglu-mesa"
 BUILD_DEPENDS="jpeg-dev libpng-dev libglu-mesa libglu-mesa-dev mesa mesa-dev"
 
+# Handle cross compilation. Host coreutils-file-* are used
+case "$ARCH" in
+	arm) BUILD_DEPENDS="jpeg-dev libpng-dev xorg-libXft-dev" ;;
+esac
+
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
 		--enable-shared \
 		--enable-xft \
 		--enable-threads \
+		 --x-includes=/cross/arm/sysroot/usr/include \
+		 --x-libraries=/cross/arm/sysroot/usr/lib \
 		$CONFIGURE_ARGS &&
 	make $MAKEFLAGS &&
 	make DESTDIR=$DESTDIR install
diff -r 6d8a4be89f3d -r 53082fab5f1e gobject-introspection/receipt
--- a/gobject-introspection/receipt	Sat Mar 15 21:09:44 2014 +0100
+++ b/gobject-introspection/receipt	Sun Mar 16 00:22:05 2014 +0100
@@ -10,9 +10,20 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 SERIES=$(echo $VERSION | cut -d. -f1,2)
 WGET_URL="$GNOME_MIRROR/$PACKAGE/$SERIES/$TARBALL"
+#HOST_ARCH="i486 arm"
 
-DEPENDS="libgio"
-BUILD_DEPENDS="flex bison glib-dev python-dev libgio-dev libffi-dev cairo-dev"
+DEPENDS="libgio dbux"
+BUILD_DEPENDS="flex bison glib-dev python-dev libgio-dev libffi-dev \
+cairo-dev dbus-dev"
+
+# Handle cross compilation
+case "$ARCH" in
+	arm*)
+		export CFLAGS="$CFLAGS -L/cross/$ARCH/sysroot/usr/lib"
+		export LDFLAGS="-L/cross/$ARCH/sysroot/usr/lib"
+		export PKG_CONFIG_PATH="/cross/$ARCH/sysroot/usr/pkgconfig"
+		BUILD_DEPENDS="glib-dev libgio-dev libffi-dev cairo-dev dbus-dev" ;;
+esac
 
 # Rules to configure and make the package.
 compile_rules()
@@ -20,8 +31,7 @@
 	./configure \
 		--disable-static \
 		$CONFIGURE_ARGS &&
-	make &&
-	make install
+	make && make install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r 6d8a4be89f3d -r 53082fab5f1e libmodplug-dev/receipt
--- a/libmodplug-dev/receipt	Sat Mar 15 21:09:44 2014 +0100
+++ b/libmodplug-dev/receipt	Sun Mar 16 00:22:05 2014 +0100
@@ -8,6 +8,7 @@
 LICENSE="PublicDomain"
 WANTED="libmodplug"
 WEB_SITE="http://modplug-xmms.sourceforge.net/"
+HOST_ARCH="i486 arm"
 
 DEPENDS="pkg-config"
 
diff -r 6d8a4be89f3d -r 53082fab5f1e libmodplug/receipt
--- a/libmodplug/receipt	Sat Mar 15 21:09:44 2014 +0100
+++ b/libmodplug/receipt	Sun Mar 16 00:22:05 2014 +0100
@@ -9,6 +9,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://modplug-xmms.sourceforge.net/" 
 WGET_URL="http://downloads.sf.net/sourceforge/modplug-xmms/$TARBALL"
+HOST_ARCH="i486 arm"
 
 DEPENDS="gcc-lib-base"
 BUILD_DEPENDS="gcc-lib-base"
diff -r 6d8a4be89f3d -r 53082fab5f1e libsdl-dev/receipt
--- a/libsdl-dev/receipt	Sat Mar 15 21:09:44 2014 +0100
+++ b/libsdl-dev/receipt	Sun Mar 16 00:22:05 2014 +0100
@@ -9,6 +9,7 @@
 SOURCE="SDL"
 WANTED="libsdl"
 WEB_SITE="http://www.libsdl.org/"
+HOST_ARCH="i486 arm"
 
 DEPENDS="xorg-libXext-dev xorg-libX11-dev xorg-libXrender-dev libsdl pkg-config"
 
diff -r 6d8a4be89f3d -r 53082fab5f1e libsdl/receipt
--- a/libsdl/receipt	Sat Mar 15 21:09:44 2014 +0100
+++ b/libsdl/receipt	Sun Mar 16 00:22:05 2014 +0100
@@ -10,7 +10,7 @@
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://www.libsdl.org/"
 WGET_URL="http://www.libsdl.org/release/$TARBALL"
-COOK_OPT="!libtool"
+HOST_ARCH="i486 arm"
 
 DEPENDS="xorg-libXext xorg-libXrender xorg-libX11"
 BUILD_DEPENDS="libglu-mesa mesa-dev xorg-libXt-dev xorg-libXext-dev xorg-libXrender-dev xorg-libX11-dev"
diff -r 6d8a4be89f3d -r 53082fab5f1e libtheora-dev/receipt
--- a/libtheora-dev/receipt	Sat Mar 15 21:09:44 2014 +0100
+++ b/libtheora-dev/receipt	Sun Mar 16 00:22:05 2014 +0100
@@ -8,6 +8,7 @@
 LICENSE="BSD"
 WANTED="libtheora"
 WEB_SITE="http://www.theora.org/"
+HOST_ARCH="i486 arm"
 
 DEPENDS="libtheora pkg-config"
 
@@ -16,7 +17,8 @@
 {
 	mkdir -p $fs/usr/lib
 	cp -a $install/usr/include $fs/usr
-	cp -a $install/usr/lib/*.*a $fs/usr/lib
-	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
+	[ -d "$install/usr/lib/pkgconfig" ] && \
+		cp -a $install/usr/lib/pkgconfig $fs/usr/lib
+	cp -a $install/usr/lib/*.*a $fs/usr/lib	
 }
 
diff -r 6d8a4be89f3d -r 53082fab5f1e libtheora-enc/receipt
--- a/libtheora-enc/receipt	Sat Mar 15 21:09:44 2014 +0100
+++ b/libtheora-enc/receipt	Sun Mar 16 00:22:05 2014 +0100
@@ -8,6 +8,7 @@
 LICENSE="BSD"
 WANTED="libtheora"
 WEB_SITE="http://www.theora.org/"
+HOST_ARCH="i486 arm"
 
 DEPENDS="libogg"
 
diff -r 6d8a4be89f3d -r 53082fab5f1e libtheora/receipt
--- a/libtheora/receipt	Sat Mar 15 21:09:44 2014 +0100
+++ b/libtheora/receipt	Sun Mar 16 00:22:05 2014 +0100
@@ -9,6 +9,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WEB_SITE="http://www.theora.org/"
 WGET_URL="http://downloads.xiph.org/releases/theora/$TARBALL"
+HOST_ARCH="i486 arm"
 
 DEPENDS="libogg libvorbis"
 BUILD_DEPENDS="libogg-dev libvorbis-dev"
diff -r 6d8a4be89f3d -r 53082fab5f1e pango/receipt
--- a/pango/receipt	Sat Mar 15 21:09:44 2014 +0100
+++ b/pango/receipt	Sun Mar 16 00:22:05 2014 +0100
@@ -10,11 +10,22 @@
 WEB_SITE="http://www.pango.org/"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL"
 CONFIG_FILES="/etc/pango/pango.modules"
+#HOST_ARCH="i486 arm"
 
 DEPENDS="cairo glib expat libxml2 xorg-libXft fontconfig freetype xcb-util \
 bzlib slitaz-base-files gcc-lib-base"
 BUILD_DEPENDS="cairo-dev glib-dev expat-dev libxml2-dev xorg-libXft-dev \
-libgio-dev gobject-introspection-dev pkg-config"
+libgio-dev"
+
+# Handle cross compilation
+case "$ARCH" in
+	arm*) export LDFLAGS="-L/cross/$ARCH/sysroot/usr/lib" ;;
+esac
+
+# Handle cross compilation
+case "$ARCH" in
+	i?86) BUILD_DEPENDS="$BUILD_DEPENDS gobject-introspection-dev" ;;
+esac
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 6d8a4be89f3d -r 53082fab5f1e xine-lib/receipt
--- a/xine-lib/receipt	Sat Mar 15 21:09:44 2014 +0100
+++ b/xine-lib/receipt	Sun Mar 16 00:22:05 2014 +0100
@@ -6,27 +6,33 @@
 SHORT_DESC="Xine video library."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
-SUGGESTED="faad2"
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WEB_SITE="http://www.xine-project.org/"
 WGET_URL="http://downloads.sourceforge.net/project/xine/$PACKAGE/$VERSION/$TARBALL"
 SUGGESTED="xine-fonts"
+#HOST_ARCH="i486 arm"
 
+SUGGESTED="faad2"
 DEPENDS="zlib xorg-libX11 xorg-libXv xorg-libXvMC alsa-lib libogg libvorbis \
-libtheora xorg-libXvMC xorg-libXv libxcb ffmpeg"
+libtheora xorg-libXvMC xorg-libXv libxcb ffmpeg libmodplug"
 BUILD_DEPENDS="xorg-libXvMC-dev xorg-libXv-dev xorg-xextproto xorg-videoproto \
 alsa-lib-dev libogg-dev libvorbis-dev libtheora-dev freetype-dev perl \
-pkg-config util-linux-uuid-dev libxcb-dev libxcb-dev ffmpeg-dev file"
+pkg-config util-linux-uuid-dev libxcb-dev libxcb-dev ffmpeg-dev file \
+libmodplug-dev"
+
+# Handle cross compilation
+case "$ARCH" in
+	arm*)
+		export LDFLAGS="-L/cross/$ARCH/sysroot/usr/lib" 
+		export LIBTOOL=${HOST_SYSTEM}-libtool 
+		ARCH_ARGS="--disable-xinerama" ;;
+esac
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	sed -i 's/grep -x/grep/' configure
-	#grep -qs 'define u8' src/input/vcd/libcdio/_cdio_linux.c ||
-	#sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' \
-	#	src/input/vcd/libcdio/_cdio_linux.c
-	#patch -p0 < $stuff/xine-lib-1.1.19-xvmc.patch
+	CPPFLAGS="-DHAVE_NANO_SLEEP" \
 	./configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
@@ -41,11 +47,10 @@
 		--disable-glu \
 		--disable-opengl \
 		--disable-fb \
-		--disable-syncfb \
 		--without-esound \
 		--disable-vcd \
 		--disable-musepack \
-		$CONFIGURE_ARGS &&
+		$CONFIGURE_ARGS $ARCH_ARGS &&
 	make && make install
 }
 
diff -r 6d8a4be89f3d -r 53082fab5f1e xorg-libXinerama/receipt
--- a/xorg-libXinerama/receipt	Sat Mar 15 21:09:44 2014 +0100
+++ b/xorg-libXinerama/receipt	Sun Mar 16 00:22:05 2014 +0100
@@ -10,7 +10,7 @@
 TARBALL="$SOURCE-$VERSION.tar.bz2"
 WEB_SITE="http://www.x.org/"
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
-CROSS="bug: can not run test program"
+#HOST_ARCH="i486 arm"
 
 DEPENDS="xorg-libXext"
 BUILD_DEPENDS="xorg-libXext-dev xorg-xineramaproto"
diff -r 6d8a4be89f3d -r 53082fab5f1e xorg-libXvMC-dev/receipt
--- a/xorg-libXvMC-dev/receipt	Sat Mar 15 21:09:44 2014 +0100
+++ b/xorg-libXvMC-dev/receipt	Sun Mar 16 00:22:05 2014 +0100
@@ -8,6 +8,7 @@
 LICENSE="MIT"
 WANTED="xorg-libXvMC"
 WEB_SITE="http://www.x.org/"
+HOST_ARCH="i486 arm"
 
 DEPENDS="xorg-libXvMC xorg-libXv-dev pkg-config"
 
diff -r 6d8a4be89f3d -r 53082fab5f1e xorg-libXvMC/receipt
--- a/xorg-libXvMC/receipt	Sat Mar 15 21:09:44 2014 +0100
+++ b/xorg-libXvMC/receipt	Sun Mar 16 00:22:05 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="xorg-libXv"
 BUILD_DEPENDS="xorg-libXv-dev"