wok rev 16026

Up ffmpeg and add to ARM, rm ffmpeg-svn and add git version, up mpg123 and more X pkgs to ARM
author Christophe Lincoln <pankso@slitaz.org>
date Sat Mar 08 06:26:57 2014 +0100 (2014-03-08)
parents d814ca840c3c
children e47c0281ba48
files ffmpeg-dev/receipt ffmpeg/receipt mpg123/receipt python/receipt tcl-dev/receipt tcl/receipt xorg-libICE-dev/receipt xorg-libICE/receipt yasm-dev/receipt yasm/receipt
line diff
     1.1 --- a/ffmpeg-dev/receipt	Fri Mar 07 10:50:10 2014 +0000
     1.2 +++ b/ffmpeg-dev/receipt	Sat Mar 08 06:26:57 2014 +0100
     1.3 @@ -8,8 +8,7 @@
     1.4  LICENSE="GPL2 LGPL2.1"
     1.5  WEB_SITE="http://ffmpeg.org/"
     1.6  WANTED="ffmpeg"
     1.7 -
     1.8 -DEPENDS="ffmpeg pkg-config"
     1.9 +HOST_ARCH="i486 arm"
    1.10  
    1.11  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.12  genpkg_rules()
     2.1 --- a/ffmpeg/receipt	Fri Mar 07 10:50:10 2014 +0000
     2.2 +++ b/ffmpeg/receipt	Sat Mar 08 06:26:57 2014 +0100
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="ffmpeg"
     2.7 -VERSION="1.0"
     2.8 +VERSION="2.1.4"
     2.9  CATEGORY="multimedia"
    2.10  SHORT_DESC="Record, convert and stream audio and video."
    2.11  MAINTAINER="pascal.bellard@slitaz.org"
    2.12 @@ -9,17 +9,31 @@
    2.13  WEB_SITE="http://ffmpeg.org/"
    2.14  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    2.15  WGET_URL="${WEB_SITE}releases/$TARBALL"
    2.16 +HOST_ARCH="i486 arm"
    2.17 +
    2.18  SUGGESTED="ffplay"
    2.19  TAGS="audio video convert stream"
    2.20  
    2.21 -DEPENDS="alsa-lib"
    2.22 +DEPENDS="alsa-lib libsdl bzip2"
    2.23  BUILD_DEPENDS="libsdl-dev zlib-dev bzip2-dev coreutils-file-format \
    2.24  coreutils-file-special yasm"
    2.25  
    2.26 +# Handle cross compilation. Host coreutils-file-* are used
    2.27 +case "$ARCH" in
    2.28 +	i?86) ARCH_ARGS="--arch=$ARCH --cpu=$ARCH" ;;
    2.29 +	arm*) BUILD_DEPENDS="zlib-dev bzip2-dev yasm" 
    2.30 +		ARCH_ARGS="--enable-cross-compile --arch=armel --target-os=linux \
    2.31 +--cross-prefix=$HOST_SYSTEM-" ;;
    2.32 +esac
    2.33 +
    2.34 +# Handle arch package install
    2.35 +case "$SLITAZ_ARCH" in
    2.36 +	arm*) DEPENDS="alsa-lib bzip2" ;;
    2.37 +esac
    2.38 +
    2.39  # Rules to configure and make the package.
    2.40  compile_rules()
    2.41  {
    2.42 -	cd $src
    2.43  	./configure \
    2.44  		--prefix=/usr \
    2.45  		--enable-shared \
    2.46 @@ -40,7 +54,7 @@
    2.47  		--disable-encoder=msmpeg4v3 \
    2.48  		--disable-symver \
    2.49  		--disable-debug \
    2.50 -		--disable-doc &&
    2.51 +		--disable-doc ${ARCH_ARGS} &&
    2.52  	make && make install
    2.53  }
    2.54  
    2.55 @@ -53,5 +67,5 @@
    2.56  	cp -a $install/usr/share/$PACKAGE $fs/usr/share
    2.57  	rm -rf $fs/usr/share/$PACKAGE/examples
    2.58  	# ffplay with it SDL dep go in a splited package
    2.59 -	rm $fs/usr/bin/ffplay
    2.60 +	rm -f $fs/usr/bin/ffplay
    2.61  }
     3.1 --- a/mpg123/receipt	Fri Mar 07 10:50:10 2014 +0000
     3.2 +++ b/mpg123/receipt	Sat Mar 08 06:26:57 2014 +0100
     3.3 @@ -1,7 +1,7 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="mpg123"
     3.7 -VERSION="1.14.4"
     3.8 +VERSION="1.18.1"
     3.9  CATEGORY="multimedia"
    3.10  SHORT_DESC="Command line audio player and streamer"
    3.11  MAINTAINER="pankso@slitaz.org"
    3.12 @@ -9,14 +9,14 @@
    3.13  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    3.14  WEB_SITE="http://www.mpg123.de/"
    3.15  WGET_URL="http://www.mpg123.de/download/$TARBALL"
    3.16 +#HOST_ARCH="i486 arm"
    3.17  
    3.18 -DEPENDS="alsa-lib libltdl esound openal portaudio libsdl"
    3.19 -BUILD_DEPENDS="alsa-lib-dev libtool"
    3.20 +DEPENDS="alsa-lib"
    3.21 +BUILD_DEPENDS="alsa-lib-dev"
    3.22  
    3.23  # Rules to configure and make the package.
    3.24  compile_rules()
    3.25  {
    3.26 -	cd $src
    3.27  	./configure \
    3.28  		--prefix=/usr \
    3.29  		--mandir=/usr/share/man \
     4.1 --- a/python/receipt	Fri Mar 07 10:50:10 2014 +0000
     4.2 +++ b/python/receipt	Sat Mar 08 06:26:57 2014 +0100
     4.3 @@ -10,25 +10,40 @@
     4.4  TARBALL="$SOURCE-$VERSION.tar.bz2"
     4.5  WEB_SITE="http://www.python.org/"
     4.6  WGET_URL="http://www.python.org/ftp/python/$VERSION/$TARBALL"
     4.7 +#HOST_ARCH="i486 arm"
     4.8  
     4.9  DEPENDS="openssl bzlib readline sqlite zlib ncursesw gdbm"
    4.10  BUILD_DEPENDS="openssl-dev bzip2-dev readline-dev sqlite-dev zlib-dev \
    4.11  ncursesw-dev tcl-dev tk-dev db-dev gdbm-dev"
    4.12  SUGGESTED="tcl tk"
    4.13  
    4.14 +# Handle cross compilation
    4.15 +case "$ARCH" in
    4.16 +	arm*) BUILD_DEPENDS="bzip2-dev readline-dev ncursesw-dev tcl-dev" ;;
    4.17 +esac
    4.18 +
    4.19  # Rules to configure and make the package.
    4.20  compile_rules()
    4.21  {
    4.22 -	cd $src
    4.23  	# Temporary workaround for FS#22322
    4.24  	# See http://bugs.python.org/issue10835 for upstream report
    4.25  	sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c
    4.26  	# Enable built-in SQLite3 module to load extensions (fix FS#22122)
    4.27  	sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py
    4.28 -	./configure \
    4.29 -		--enable-shared \
    4.30 -		--build=$HOST_SYSTEM \
    4.31 -		--host=$HOST_SYSTEM &&
    4.32 +	case "$ARCH" in
    4.33 +		arm*)
    4.34 +			#export ac_cv_file_dev__ptmx=yes
    4.35 +			./configure \
    4.36 +				--disable-ipv6 \
    4.37 +				--enable-shared \
    4.38 +				--build=i486-slitaz-linux \
    4.39 +				--host=${ARCH}-slitaz-linux-gnueabi ;;
    4.40 +		i?86)
    4.41 +			./configure \
    4.42 +				--enable-shared \
    4.43 +				--build=${HOST_SYSTEM} \
    4.44 +				--host=${HOST_SYSTEM} ;;
    4.45 +	esac &&
    4.46  	make &&	make DESTDIR=$DESTDIR install
    4.47  }
    4.48  
     5.1 --- a/tcl-dev/receipt	Fri Mar 07 10:50:10 2014 +0000
     5.2 +++ b/tcl-dev/receipt	Sat Mar 08 06:26:57 2014 +0100
     5.3 @@ -8,6 +8,7 @@
     5.4  LICENSE="BSD"
     5.5  WANTED="tcl"
     5.6  WEB_SITE="http://tcl.sourceforge.net/"
     5.7 +HOST_ARCH="i486 arm"
     5.8  
     5.9  DEPENDS="tcl"
    5.10  
     6.1 --- a/tcl/receipt	Fri Mar 07 10:50:10 2014 +0000
     6.2 +++ b/tcl/receipt	Sat Mar 08 06:26:57 2014 +0100
     6.3 @@ -10,16 +10,23 @@
     6.4  WEB_SITE="http://tcl.sourceforge.net/"
     6.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
     6.6  TAGS="language programming"
     6.7 +HOST_ARCH="i486 arm"
     6.8  
     6.9  # Rules to configure and make the package.
    6.10  compile_rules()
    6.11  {
    6.12 +	case "$ARCH" in
    6.13 +		arm*) 
    6.14 +			export tcl_cv_strtod_buggy=1
    6.15 +			export ac_cv_func_strtod=yes ;;
    6.16 +	esac
    6.17  	cd $src/unix
    6.18  	./configure \
    6.19 -	 --enable-shared \
    6.20 -	 --disable-symbols \
    6.21 -	 --mandir=/usr/share/man $CONFIGURE_ARGS && \
    6.22 -	make && \
    6.23 +		 --enable-shared \
    6.24 +		 --disable-symbols \
    6.25 +		 --mandir=/usr/share/man \
    6.26 +		 $CONFIGURE_ARGS &&
    6.27 +	make &&
    6.28  	make install install-private-headers
    6.29  }
    6.30  
    6.31 @@ -27,7 +34,7 @@
    6.32  genpkg_rules()
    6.33  {
    6.34  	mkdir -p $fs/usr/lib
    6.35 -	cp -a $install/usr/lib/tcl8* $fs/usr/lib
    6.36 +	cp -a $install/usr/lib/tcl8* $fs/usr/lib 2>/dev/null
    6.37  	cp -a $install/usr/lib/*.so* $fs/usr/lib
    6.38  	cp -a $install/usr/bin $fs/usr
    6.39  	ln -sf tclsh8.5 $fs/usr/bin/tclsh
     7.1 --- a/xorg-libICE-dev/receipt	Fri Mar 07 10:50:10 2014 +0000
     7.2 +++ b/xorg-libICE-dev/receipt	Sat Mar 08 06:26:57 2014 +0100
     7.3 @@ -7,6 +7,7 @@
     7.4  MAINTAINER="pankso@slitaz.org"
     7.5  LICENSE="other"
     7.6  WEB_SITE="http://www.x.org/"
     7.7 +HOST_ARCH="i486 arm"
     7.8  
     7.9  WANTED="xorg-libICE"
    7.10  DEPENDS="xorg-libICE xorg-xproto pkg-config"
     8.1 --- a/xorg-libICE/receipt	Fri Mar 07 10:50:10 2014 +0000
     8.2 +++ b/xorg-libICE/receipt	Sat Mar 08 06:26:57 2014 +0100
     8.3 @@ -10,8 +10,9 @@
     8.4  SOURCE="libICE"
     8.5  TARBALL="$SOURCE-$VERSION.tar.bz2"
     8.6  WGET_URL="$XORG_MIRROR/lib/$TARBALL"
     8.7 +HOST_ARCH="i486 arm"
     8.8  
     8.9 -DEPENDS="glibc-base"
    8.10 +DEPENDS=""
    8.11  BUILD_DEPENDS="xorg-xproto xorg-xtrans"
    8.12  
    8.13  # Rules to configure and make the package.
     9.1 --- a/yasm-dev/receipt	Fri Mar 07 10:50:10 2014 +0000
     9.2 +++ b/yasm-dev/receipt	Sat Mar 08 06:26:57 2014 +0100
     9.3 @@ -8,6 +8,7 @@
     9.4  LICENSE="BSD GPL2 LGPL2"
     9.5  WANTED="yasm"
     9.6  WEB_SITE="http://www.tortall.net/projects/yasm/"
     9.7 +HOST_ARCH="i486 arm"
     9.8  
     9.9  DEPENDS="yasm"
    9.10  
    10.1 --- a/yasm/receipt	Fri Mar 07 10:50:10 2014 +0000
    10.2 +++ b/yasm/receipt	Sat Mar 08 06:26:57 2014 +0100
    10.3 @@ -5,12 +5,13 @@
    10.4  CATEGORY="development"
    10.5  MAINTAINER="jozee@slitaz.org"
    10.6  LICENSE="BSD GPL2 LGPL2"
    10.7 -SHORT_DESC="A rewrite of NASM to allow for multiple syntax supported (NASM, TASM, GAS, etc.)"
    10.8 +SHORT_DESC="A rewrite of NASM with multiple syntax (NASM, TASM, GAS, etc.)"
    10.9  WEB_SITE="http://www.tortall.net/projects/yasm/"
   10.10  TARBALL="$PACKAGE-$VERSION.tar.gz"
   10.11  WGET_URL="$WEB_SITE/releases/$TARBALL"
   10.12 +HOST_ARCH="i486 arm"
   10.13  
   10.14 -DEPENDS="glibc-base"
   10.15 +DEPENDS=""
   10.16  
   10.17  # Rules to configure and make the package.
   10.18  compile_rules()