# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1394256417 -3600
# Node ID 61bec0518c8c135dccb13bac6f4a053d1426793e
# Parent  d814ca840c3c45024399a6bfed1f09c97ff0e488
Up ffmpeg and add to ARM, rm ffmpeg-svn and add git version, up mpg123 and more X pkgs to ARM

diff -r d814ca840c3c -r 61bec0518c8c ffmpeg-dev/receipt
--- a/ffmpeg-dev/receipt	Fri Mar 07 10:50:10 2014 +0000
+++ b/ffmpeg-dev/receipt	Sat Mar 08 06:26:57 2014 +0100
@@ -8,8 +8,7 @@
 LICENSE="GPL2 LGPL2.1"
 WEB_SITE="http://ffmpeg.org/"
 WANTED="ffmpeg"
-
-DEPENDS="ffmpeg pkg-config"
+HOST_ARCH="i486 arm"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r d814ca840c3c -r 61bec0518c8c ffmpeg/receipt
--- a/ffmpeg/receipt	Fri Mar 07 10:50:10 2014 +0000
+++ b/ffmpeg/receipt	Sat Mar 08 06:26:57 2014 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="ffmpeg"
-VERSION="1.0"
+VERSION="2.1.4"
 CATEGORY="multimedia"
 SHORT_DESC="Record, convert and stream audio and video."
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -9,17 +9,31 @@
 WEB_SITE="http://ffmpeg.org/"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="${WEB_SITE}releases/$TARBALL"
+HOST_ARCH="i486 arm"
+
 SUGGESTED="ffplay"
 TAGS="audio video convert stream"
 
-DEPENDS="alsa-lib"
+DEPENDS="alsa-lib libsdl bzip2"
 BUILD_DEPENDS="libsdl-dev zlib-dev bzip2-dev coreutils-file-format \
 coreutils-file-special yasm"
 
+# 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" 
+		ARCH_ARGS="--enable-cross-compile --arch=armel --target-os=linux \
+--cross-prefix=$HOST_SYSTEM-" ;;
+esac
+
+# Handle arch package install
+case "$SLITAZ_ARCH" in
+	arm*) DEPENDS="alsa-lib bzip2" ;;
+esac
+
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	./configure \
 		--prefix=/usr \
 		--enable-shared \
@@ -40,7 +54,7 @@
 		--disable-encoder=msmpeg4v3 \
 		--disable-symver \
 		--disable-debug \
-		--disable-doc &&
+		--disable-doc ${ARCH_ARGS} &&
 	make && make install
 }
 
@@ -53,5 +67,5 @@
 	cp -a $install/usr/share/$PACKAGE $fs/usr/share
 	rm -rf $fs/usr/share/$PACKAGE/examples
 	# ffplay with it SDL dep go in a splited package
-	rm $fs/usr/bin/ffplay
+	rm -f $fs/usr/bin/ffplay
 }
diff -r d814ca840c3c -r 61bec0518c8c mpg123/receipt
--- a/mpg123/receipt	Fri Mar 07 10:50:10 2014 +0000
+++ b/mpg123/receipt	Sat Mar 08 06:26:57 2014 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="mpg123"
-VERSION="1.14.4"
+VERSION="1.18.1"
 CATEGORY="multimedia"
 SHORT_DESC="Command line audio player and streamer"
 MAINTAINER="pankso@slitaz.org"
@@ -9,14 +9,14 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WEB_SITE="http://www.mpg123.de/"
 WGET_URL="http://www.mpg123.de/download/$TARBALL"
+#HOST_ARCH="i486 arm"
 
-DEPENDS="alsa-lib libltdl esound openal portaudio libsdl"
-BUILD_DEPENDS="alsa-lib-dev libtool"
+DEPENDS="alsa-lib"
+BUILD_DEPENDS="alsa-lib-dev"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	./configure \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
diff -r d814ca840c3c -r 61bec0518c8c python/receipt
--- a/python/receipt	Fri Mar 07 10:50:10 2014 +0000
+++ b/python/receipt	Sat Mar 08 06:26:57 2014 +0100
@@ -10,25 +10,40 @@
 TARBALL="$SOURCE-$VERSION.tar.bz2"
 WEB_SITE="http://www.python.org/"
 WGET_URL="http://www.python.org/ftp/python/$VERSION/$TARBALL"
+#HOST_ARCH="i486 arm"
 
 DEPENDS="openssl bzlib readline sqlite zlib ncursesw gdbm"
 BUILD_DEPENDS="openssl-dev bzip2-dev readline-dev sqlite-dev zlib-dev \
 ncursesw-dev tcl-dev tk-dev db-dev gdbm-dev"
 SUGGESTED="tcl tk"
 
+# Handle cross compilation
+case "$ARCH" in
+	arm*) BUILD_DEPENDS="bzip2-dev readline-dev ncursesw-dev tcl-dev" ;;
+esac
+
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	# Temporary workaround for FS#22322
 	# See http://bugs.python.org/issue10835 for upstream report
 	sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c
 	# Enable built-in SQLite3 module to load extensions (fix FS#22122)
 	sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py
-	./configure \
-		--enable-shared \
-		--build=$HOST_SYSTEM \
-		--host=$HOST_SYSTEM &&
+	case "$ARCH" in
+		arm*)
+			#export ac_cv_file_dev__ptmx=yes
+			./configure \
+				--disable-ipv6 \
+				--enable-shared \
+				--build=i486-slitaz-linux \
+				--host=${ARCH}-slitaz-linux-gnueabi ;;
+		i?86)
+			./configure \
+				--enable-shared \
+				--build=${HOST_SYSTEM} \
+				--host=${HOST_SYSTEM} ;;
+	esac &&
 	make &&	make DESTDIR=$DESTDIR install
 }
 
diff -r d814ca840c3c -r 61bec0518c8c tcl-dev/receipt
--- a/tcl-dev/receipt	Fri Mar 07 10:50:10 2014 +0000
+++ b/tcl-dev/receipt	Sat Mar 08 06:26:57 2014 +0100
@@ -8,6 +8,7 @@
 LICENSE="BSD"
 WANTED="tcl"
 WEB_SITE="http://tcl.sourceforge.net/"
+HOST_ARCH="i486 arm"
 
 DEPENDS="tcl"
 
diff -r d814ca840c3c -r 61bec0518c8c tcl/receipt
--- a/tcl/receipt	Fri Mar 07 10:50:10 2014 +0000
+++ b/tcl/receipt	Sat Mar 08 06:26:57 2014 +0100
@@ -10,16 +10,23 @@
 WEB_SITE="http://tcl.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 TAGS="language programming"
+HOST_ARCH="i486 arm"
 
 # Rules to configure and make the package.
 compile_rules()
 {
+	case "$ARCH" in
+		arm*) 
+			export tcl_cv_strtod_buggy=1
+			export ac_cv_func_strtod=yes ;;
+	esac
 	cd $src/unix
 	./configure \
-	 --enable-shared \
-	 --disable-symbols \
-	 --mandir=/usr/share/man $CONFIGURE_ARGS && \
-	make && \
+		 --enable-shared \
+		 --disable-symbols \
+		 --mandir=/usr/share/man \
+		 $CONFIGURE_ARGS &&
+	make &&
 	make install install-private-headers
 }
 
@@ -27,7 +34,7 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	cp -a $install/usr/lib/tcl8* $fs/usr/lib
+	cp -a $install/usr/lib/tcl8* $fs/usr/lib 2>/dev/null
 	cp -a $install/usr/lib/*.so* $fs/usr/lib
 	cp -a $install/usr/bin $fs/usr
 	ln -sf tclsh8.5 $fs/usr/bin/tclsh
diff -r d814ca840c3c -r 61bec0518c8c xorg-libICE-dev/receipt
--- a/xorg-libICE-dev/receipt	Fri Mar 07 10:50:10 2014 +0000
+++ b/xorg-libICE-dev/receipt	Sat Mar 08 06:26:57 2014 +0100
@@ -7,6 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="other"
 WEB_SITE="http://www.x.org/"
+HOST_ARCH="i486 arm"
 
 WANTED="xorg-libICE"
 DEPENDS="xorg-libICE xorg-xproto pkg-config"
diff -r d814ca840c3c -r 61bec0518c8c xorg-libICE/receipt
--- a/xorg-libICE/receipt	Fri Mar 07 10:50:10 2014 +0000
+++ b/xorg-libICE/receipt	Sat Mar 08 06:26:57 2014 +0100
@@ -10,8 +10,9 @@
 SOURCE="libICE"
 TARBALL="$SOURCE-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
+HOST_ARCH="i486 arm"
 
-DEPENDS="glibc-base"
+DEPENDS=""
 BUILD_DEPENDS="xorg-xproto xorg-xtrans"
 
 # Rules to configure and make the package.
diff -r d814ca840c3c -r 61bec0518c8c yasm-dev/receipt
--- a/yasm-dev/receipt	Fri Mar 07 10:50:10 2014 +0000
+++ b/yasm-dev/receipt	Sat Mar 08 06:26:57 2014 +0100
@@ -8,6 +8,7 @@
 LICENSE="BSD GPL2 LGPL2"
 WANTED="yasm"
 WEB_SITE="http://www.tortall.net/projects/yasm/"
+HOST_ARCH="i486 arm"
 
 DEPENDS="yasm"
 
diff -r d814ca840c3c -r 61bec0518c8c yasm/receipt
--- a/yasm/receipt	Fri Mar 07 10:50:10 2014 +0000
+++ b/yasm/receipt	Sat Mar 08 06:26:57 2014 +0100
@@ -5,12 +5,13 @@
 CATEGORY="development"
 MAINTAINER="jozee@slitaz.org"
 LICENSE="BSD GPL2 LGPL2"
-SHORT_DESC="A rewrite of NASM to allow for multiple syntax supported (NASM, TASM, GAS, etc.)"
+SHORT_DESC="A rewrite of NASM with multiple syntax (NASM, TASM, GAS, etc.)"
 WEB_SITE="http://www.tortall.net/projects/yasm/"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/releases/$TARBALL"
+HOST_ARCH="i486 arm"
 
-DEPENDS="glibc-base"
+DEPENDS=""
 
 # Rules to configure and make the package.
 compile_rules()