wok rev 16084

Some fixes, up ffplay, add more pkgs to ARM
author Christophe Lincoln <pankso@slitaz.org>
date Sun Mar 16 00:22:05 2014 +0100 (2014-03-16)
parents 6d8a4be89f3d
children d67887b74cbb
files dbus-dev/receipt dbus/receipt enna/receipt ffmpeg/receipt ffplay/receipt fltk-dev/receipt fltk-doc/receipt fltk/receipt gobject-introspection/receipt libmodplug-dev/receipt libmodplug/receipt libsdl-dev/receipt libsdl/receipt libtheora-dev/receipt libtheora-enc/receipt libtheora/receipt pango/receipt xine-lib/receipt xorg-libXinerama/receipt xorg-libXvMC-dev/receipt xorg-libXvMC/receipt
line diff
     1.1 --- a/dbus-dev/receipt	Sat Mar 15 21:09:44 2014 +0100
     1.2 +++ b/dbus-dev/receipt	Sun Mar 16 00:22:05 2014 +0100
     1.3 @@ -8,6 +8,7 @@
     1.4  MAINTAINER="pankso@slitaz.org"
     1.5  LICENSE="GPL2"
     1.6  WEB_SITE="http://www.freedesktop.org/wiki/Software/dbus"
     1.7 +HOST_ARCH="i486 arm"
     1.8  
     1.9  DEPENDS="dbus pkg-config"
    1.10  
     2.1 --- a/dbus/receipt	Sat Mar 15 21:09:44 2014 +0100
     2.2 +++ b/dbus/receipt	Sun Mar 16 00:22:05 2014 +0100
     2.3 @@ -9,6 +9,7 @@
     2.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
     2.5  WEB_SITE="http://www.freedesktop.org/wiki/Software/dbus"
     2.6  WGET_URL="http://dbus.freedesktop.org/releases/dbus/$TARBALL"
     2.7 +HOST_ARCH="i486 arm"
     2.8  
     2.9  DEPENDS="expat xorg-libX11 slitaz-base-files xorg-libICE xorg-libSM \
    2.10  xorg-libXau xorg-libXdmcp util-linux-uuid"
     3.1 --- a/enna/receipt	Sat Mar 15 21:09:44 2014 +0100
     3.2 +++ b/enna/receipt	Sun Mar 16 00:22:05 2014 +0100
     3.3 @@ -17,7 +17,7 @@
     3.4  BUILD_DEPENDS="mercurial automake eina-dev eet-dev ecore-dev evas-dev efreet-dev \
     3.5  edje-dev edbus-dev emotion-dev elementary-dev ethumb-dev libvalhalla-dev curl-dev \
     3.6  xine-lib-dev libexif-dev alsa-lib-dev libplayer-dev libxml2-dev libtool expat-dev \
     3.7 -jpeg-dev glib-dev ffmpeg-svn git eio-dev"
     3.8 +jpeg-dev glib-dev ffmpeg-dev git eio-dev"
     3.9  
    3.10  # Rules to configure and make the package.
    3.11  compile_rules()
     4.1 --- a/ffmpeg/receipt	Sat Mar 15 21:09:44 2014 +0100
     4.2 +++ b/ffmpeg/receipt	Sun Mar 16 00:22:05 2014 +0100
     4.3 @@ -20,8 +20,10 @@
     4.4  
     4.5  # Handle cross compilation. Host coreutils-file-* are used
     4.6  case "$ARCH" in
     4.7 -	i?86) ARCH_ARGS="--arch=$ARCH --cpu=$ARCH" ;;
     4.8 -	arm*) BUILD_DEPENDS="zlib-dev bzip2-dev yasm" 
     4.9 +	i?86) 
    4.10 +		ARCH_ARGS="--arch=$ARCH --cpu=$ARCH" ;;
    4.11 +	arm*) 
    4.12 +		BUILD_DEPENDS="zlib-dev bzip2-dev yasm libsdl-dev" 
    4.13  		ARCH_ARGS="--enable-cross-compile --arch=armel --target-os=linux \
    4.14  --cross-prefix=$HOST_SYSTEM-" ;;
    4.15  esac
     5.1 --- a/ffplay/receipt	Sat Mar 15 21:09:44 2014 +0100
     5.2 +++ b/ffplay/receipt	Sun Mar 16 00:22:05 2014 +0100
     5.3 @@ -1,7 +1,7 @@
     5.4  # SliTaz package receipt.
     5.5  
     5.6  PACKAGE="ffplay"
     5.7 -VERSION="1.0"
     5.8 +VERSION="2.1.4"
     5.9  CATEGORY="multimedia"
    5.10  SHORT_DESC="Very simple and portable media player using the ffmpeg and the SDL library."
    5.11  MAINTAINER="pascal.bellard@slitaz.org"
    5.12 @@ -9,6 +9,7 @@
    5.13  WEB_SITE="http://ffmpeg.org/"
    5.14  WANTED="ffmpeg"
    5.15  TAGS="audio video player"
    5.16 +#HOST_ARCH="i486 arm"
    5.17  
    5.18  DEPENDS="ffmpeg libsdl"
    5.19  
     6.1 --- a/fltk-dev/receipt	Sat Mar 15 21:09:44 2014 +0100
     6.2 +++ b/fltk-dev/receipt	Sun Mar 16 00:22:05 2014 +0100
     6.3 @@ -1,7 +1,7 @@
     6.4  # SliTaz package receipt.
     6.5  
     6.6  PACKAGE="fltk-dev"
     6.7 -VERSION="1.3.0"
     6.8 +VERSION="1.3.2"
     6.9  CATEGORY="development"
    6.10  SHORT_DESC="Fast Light Tool Kit devel files."
    6.11  WANTED="fltk"
     7.1 --- a/fltk-doc/receipt	Sat Mar 15 21:09:44 2014 +0100
     7.2 +++ b/fltk-doc/receipt	Sun Mar 16 00:22:05 2014 +0100
     7.3 @@ -1,7 +1,7 @@
     7.4  # SliTaz package receipt.
     7.5  
     7.6  PACKAGE="fltk-doc"
     7.7 -VERSION="1.3.0"
     7.8 +VERSION="1.3.2"
     7.9  CATEGORY="development"
    7.10  SHORT_DESC="Fast Light Tool Kit documentation and examples."
    7.11  WANTED="fltk"
     8.1 --- a/fltk/receipt	Sat Mar 15 21:09:44 2014 +0100
     8.2 +++ b/fltk/receipt	Sun Mar 16 00:22:05 2014 +0100
     8.3 @@ -1,29 +1,34 @@
     8.4  # SliTaz package receipt.
     8.5  
     8.6  PACKAGE="fltk"
     8.7 -VERSION="1.3.0"
     8.8 +VERSION="1.3.2"
     8.9  CATEGORY="system-tools"
    8.10  SHORT_DESC="Fast Light Tool Kit (provide fluid)."
    8.11  MAINTAINER="pankso@slitaz.org"
    8.12  LICENSE="LGPL2"
    8.13  TARBALL="$PACKAGE-$VERSION-source.tar.gz"
    8.14  WEB_SITE="http://www.fltk.org/"
    8.15 -WGET_URL="http://ftp.easysw.com/pub/fltk/$VERSION/$TARBALL"
    8.16 +WGET_URL="http://fltk.org/pub/fltk/$VERSION/$TARBALL"
    8.17 +#HOST_ARCH="i486 arm"
    8.18  
    8.19  DEPENDS="expat fontconfig freetype libpng jpeg xorg-libX11 xorg-libXau xorg-libXdmcp \
    8.20  xorg-libXext xorg-libXft xorg-libXrender zlib libpng gcc-lib-base mesa libglu-mesa"
    8.21  BUILD_DEPENDS="jpeg-dev libpng-dev libglu-mesa libglu-mesa-dev mesa mesa-dev"
    8.22  
    8.23 +# Handle cross compilation. Host coreutils-file-* are used
    8.24 +case "$ARCH" in
    8.25 +	arm) BUILD_DEPENDS="jpeg-dev libpng-dev xorg-libXft-dev" ;;
    8.26 +esac
    8.27 +
    8.28  # Rules to configure and make the package.
    8.29  compile_rules()
    8.30  {
    8.31 -	cd $src
    8.32  	./configure \
    8.33 -		--prefix=/usr \
    8.34 -		--mandir=/usr/share/man \
    8.35  		--enable-shared \
    8.36  		--enable-xft \
    8.37  		--enable-threads \
    8.38 +		 --x-includes=/cross/arm/sysroot/usr/include \
    8.39 +		 --x-libraries=/cross/arm/sysroot/usr/lib \
    8.40  		$CONFIGURE_ARGS &&
    8.41  	make $MAKEFLAGS &&
    8.42  	make DESTDIR=$DESTDIR install
     9.1 --- a/gobject-introspection/receipt	Sat Mar 15 21:09:44 2014 +0100
     9.2 +++ b/gobject-introspection/receipt	Sun Mar 16 00:22:05 2014 +0100
     9.3 @@ -10,9 +10,20 @@
     9.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
     9.5  SERIES=$(echo $VERSION | cut -d. -f1,2)
     9.6  WGET_URL="$GNOME_MIRROR/$PACKAGE/$SERIES/$TARBALL"
     9.7 +#HOST_ARCH="i486 arm"
     9.8  
     9.9 -DEPENDS="libgio"
    9.10 -BUILD_DEPENDS="flex bison glib-dev python-dev libgio-dev libffi-dev cairo-dev"
    9.11 +DEPENDS="libgio dbux"
    9.12 +BUILD_DEPENDS="flex bison glib-dev python-dev libgio-dev libffi-dev \
    9.13 +cairo-dev dbus-dev"
    9.14 +
    9.15 +# Handle cross compilation
    9.16 +case "$ARCH" in
    9.17 +	arm*)
    9.18 +		export CFLAGS="$CFLAGS -L/cross/$ARCH/sysroot/usr/lib"
    9.19 +		export LDFLAGS="-L/cross/$ARCH/sysroot/usr/lib"
    9.20 +		export PKG_CONFIG_PATH="/cross/$ARCH/sysroot/usr/pkgconfig"
    9.21 +		BUILD_DEPENDS="glib-dev libgio-dev libffi-dev cairo-dev dbus-dev" ;;
    9.22 +esac
    9.23  
    9.24  # Rules to configure and make the package.
    9.25  compile_rules()
    9.26 @@ -20,8 +31,7 @@
    9.27  	./configure \
    9.28  		--disable-static \
    9.29  		$CONFIGURE_ARGS &&
    9.30 -	make &&
    9.31 -	make install
    9.32 +	make && make install
    9.33  }
    9.34  
    9.35  # Rules to gen a SliTaz package suitable for Tazpkg.
    10.1 --- a/libmodplug-dev/receipt	Sat Mar 15 21:09:44 2014 +0100
    10.2 +++ b/libmodplug-dev/receipt	Sun Mar 16 00:22:05 2014 +0100
    10.3 @@ -8,6 +8,7 @@
    10.4  LICENSE="PublicDomain"
    10.5  WANTED="libmodplug"
    10.6  WEB_SITE="http://modplug-xmms.sourceforge.net/"
    10.7 +HOST_ARCH="i486 arm"
    10.8  
    10.9  DEPENDS="pkg-config"
   10.10  
    11.1 --- a/libmodplug/receipt	Sat Mar 15 21:09:44 2014 +0100
    11.2 +++ b/libmodplug/receipt	Sun Mar 16 00:22:05 2014 +0100
    11.3 @@ -9,6 +9,7 @@
    11.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
    11.5  WEB_SITE="http://modplug-xmms.sourceforge.net/" 
    11.6  WGET_URL="http://downloads.sf.net/sourceforge/modplug-xmms/$TARBALL"
    11.7 +HOST_ARCH="i486 arm"
    11.8  
    11.9  DEPENDS="gcc-lib-base"
   11.10  BUILD_DEPENDS="gcc-lib-base"
    12.1 --- a/libsdl-dev/receipt	Sat Mar 15 21:09:44 2014 +0100
    12.2 +++ b/libsdl-dev/receipt	Sun Mar 16 00:22:05 2014 +0100
    12.3 @@ -9,6 +9,7 @@
    12.4  SOURCE="SDL"
    12.5  WANTED="libsdl"
    12.6  WEB_SITE="http://www.libsdl.org/"
    12.7 +HOST_ARCH="i486 arm"
    12.8  
    12.9  DEPENDS="xorg-libXext-dev xorg-libX11-dev xorg-libXrender-dev libsdl pkg-config"
   12.10  
    13.1 --- a/libsdl/receipt	Sat Mar 15 21:09:44 2014 +0100
    13.2 +++ b/libsdl/receipt	Sun Mar 16 00:22:05 2014 +0100
    13.3 @@ -10,7 +10,7 @@
    13.4  TARBALL="$SOURCE-$VERSION.tar.gz"
    13.5  WEB_SITE="http://www.libsdl.org/"
    13.6  WGET_URL="http://www.libsdl.org/release/$TARBALL"
    13.7 -COOK_OPT="!libtool"
    13.8 +HOST_ARCH="i486 arm"
    13.9  
   13.10  DEPENDS="xorg-libXext xorg-libXrender xorg-libX11"
   13.11  BUILD_DEPENDS="libglu-mesa mesa-dev xorg-libXt-dev xorg-libXext-dev xorg-libXrender-dev xorg-libX11-dev"
    14.1 --- a/libtheora-dev/receipt	Sat Mar 15 21:09:44 2014 +0100
    14.2 +++ b/libtheora-dev/receipt	Sun Mar 16 00:22:05 2014 +0100
    14.3 @@ -8,6 +8,7 @@
    14.4  LICENSE="BSD"
    14.5  WANTED="libtheora"
    14.6  WEB_SITE="http://www.theora.org/"
    14.7 +HOST_ARCH="i486 arm"
    14.8  
    14.9  DEPENDS="libtheora pkg-config"
   14.10  
   14.11 @@ -16,7 +17,8 @@
   14.12  {
   14.13  	mkdir -p $fs/usr/lib
   14.14  	cp -a $install/usr/include $fs/usr
   14.15 -	cp -a $install/usr/lib/*.*a $fs/usr/lib
   14.16 -	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
   14.17 +	[ -d "$install/usr/lib/pkgconfig" ] && \
   14.18 +		cp -a $install/usr/lib/pkgconfig $fs/usr/lib
   14.19 +	cp -a $install/usr/lib/*.*a $fs/usr/lib	
   14.20  }
   14.21  
    15.1 --- a/libtheora-enc/receipt	Sat Mar 15 21:09:44 2014 +0100
    15.2 +++ b/libtheora-enc/receipt	Sun Mar 16 00:22:05 2014 +0100
    15.3 @@ -8,6 +8,7 @@
    15.4  LICENSE="BSD"
    15.5  WANTED="libtheora"
    15.6  WEB_SITE="http://www.theora.org/"
    15.7 +HOST_ARCH="i486 arm"
    15.8  
    15.9  DEPENDS="libogg"
   15.10  
    16.1 --- a/libtheora/receipt	Sat Mar 15 21:09:44 2014 +0100
    16.2 +++ b/libtheora/receipt	Sun Mar 16 00:22:05 2014 +0100
    16.3 @@ -9,6 +9,7 @@
    16.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    16.5  WEB_SITE="http://www.theora.org/"
    16.6  WGET_URL="http://downloads.xiph.org/releases/theora/$TARBALL"
    16.7 +HOST_ARCH="i486 arm"
    16.8  
    16.9  DEPENDS="libogg libvorbis"
   16.10  BUILD_DEPENDS="libogg-dev libvorbis-dev"
    17.1 --- a/pango/receipt	Sat Mar 15 21:09:44 2014 +0100
    17.2 +++ b/pango/receipt	Sun Mar 16 00:22:05 2014 +0100
    17.3 @@ -10,11 +10,22 @@
    17.4  WEB_SITE="http://www.pango.org/"
    17.5  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL"
    17.6  CONFIG_FILES="/etc/pango/pango.modules"
    17.7 +#HOST_ARCH="i486 arm"
    17.8  
    17.9  DEPENDS="cairo glib expat libxml2 xorg-libXft fontconfig freetype xcb-util \
   17.10  bzlib slitaz-base-files gcc-lib-base"
   17.11  BUILD_DEPENDS="cairo-dev glib-dev expat-dev libxml2-dev xorg-libXft-dev \
   17.12 -libgio-dev gobject-introspection-dev pkg-config"
   17.13 +libgio-dev"
   17.14 +
   17.15 +# Handle cross compilation
   17.16 +case "$ARCH" in
   17.17 +	arm*) export LDFLAGS="-L/cross/$ARCH/sysroot/usr/lib" ;;
   17.18 +esac
   17.19 +
   17.20 +# Handle cross compilation
   17.21 +case "$ARCH" in
   17.22 +	i?86) BUILD_DEPENDS="$BUILD_DEPENDS gobject-introspection-dev" ;;
   17.23 +esac
   17.24  
   17.25  # Rules to configure and make the package.
   17.26  compile_rules()
    18.1 --- a/xine-lib/receipt	Sat Mar 15 21:09:44 2014 +0100
    18.2 +++ b/xine-lib/receipt	Sun Mar 16 00:22:05 2014 +0100
    18.3 @@ -6,27 +6,33 @@
    18.4  SHORT_DESC="Xine video library."
    18.5  MAINTAINER="pankso@slitaz.org"
    18.6  LICENSE="GPL2"
    18.7 -SUGGESTED="faad2"
    18.8  TARBALL="$PACKAGE-$VERSION.tar.xz"
    18.9  WEB_SITE="http://www.xine-project.org/"
   18.10  WGET_URL="http://downloads.sourceforge.net/project/xine/$PACKAGE/$VERSION/$TARBALL"
   18.11  SUGGESTED="xine-fonts"
   18.12 +#HOST_ARCH="i486 arm"
   18.13  
   18.14 +SUGGESTED="faad2"
   18.15  DEPENDS="zlib xorg-libX11 xorg-libXv xorg-libXvMC alsa-lib libogg libvorbis \
   18.16 -libtheora xorg-libXvMC xorg-libXv libxcb ffmpeg"
   18.17 +libtheora xorg-libXvMC xorg-libXv libxcb ffmpeg libmodplug"
   18.18  BUILD_DEPENDS="xorg-libXvMC-dev xorg-libXv-dev xorg-xextproto xorg-videoproto \
   18.19  alsa-lib-dev libogg-dev libvorbis-dev libtheora-dev freetype-dev perl \
   18.20 -pkg-config util-linux-uuid-dev libxcb-dev libxcb-dev ffmpeg-dev file"
   18.21 +pkg-config util-linux-uuid-dev libxcb-dev libxcb-dev ffmpeg-dev file \
   18.22 +libmodplug-dev"
   18.23 +
   18.24 +# Handle cross compilation
   18.25 +case "$ARCH" in
   18.26 +	arm*)
   18.27 +		export LDFLAGS="-L/cross/$ARCH/sysroot/usr/lib" 
   18.28 +		export LIBTOOL=${HOST_SYSTEM}-libtool 
   18.29 +		ARCH_ARGS="--disable-xinerama" ;;
   18.30 +esac
   18.31  
   18.32  # Rules to configure and make the package.
   18.33  compile_rules()
   18.34  {
   18.35 -	cd $src
   18.36  	sed -i 's/grep -x/grep/' configure
   18.37 -	#grep -qs 'define u8' src/input/vcd/libcdio/_cdio_linux.c ||
   18.38 -	#sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' \
   18.39 -	#	src/input/vcd/libcdio/_cdio_linux.c
   18.40 -	#patch -p0 < $stuff/xine-lib-1.1.19-xvmc.patch
   18.41 +	CPPFLAGS="-DHAVE_NANO_SLEEP" \
   18.42  	./configure \
   18.43  		--prefix=/usr \
   18.44  		--infodir=/usr/share/info \
   18.45 @@ -41,11 +47,10 @@
   18.46  		--disable-glu \
   18.47  		--disable-opengl \
   18.48  		--disable-fb \
   18.49 -		--disable-syncfb \
   18.50  		--without-esound \
   18.51  		--disable-vcd \
   18.52  		--disable-musepack \
   18.53 -		$CONFIGURE_ARGS &&
   18.54 +		$CONFIGURE_ARGS $ARCH_ARGS &&
   18.55  	make && make install
   18.56  }
   18.57  
    19.1 --- a/xorg-libXinerama/receipt	Sat Mar 15 21:09:44 2014 +0100
    19.2 +++ b/xorg-libXinerama/receipt	Sun Mar 16 00:22:05 2014 +0100
    19.3 @@ -10,7 +10,7 @@
    19.4  TARBALL="$SOURCE-$VERSION.tar.bz2"
    19.5  WEB_SITE="http://www.x.org/"
    19.6  WGET_URL="$XORG_MIRROR/lib/$TARBALL"
    19.7 -CROSS="bug: can not run test program"
    19.8 +#HOST_ARCH="i486 arm"
    19.9  
   19.10  DEPENDS="xorg-libXext"
   19.11  BUILD_DEPENDS="xorg-libXext-dev xorg-xineramaproto"
    20.1 --- a/xorg-libXvMC-dev/receipt	Sat Mar 15 21:09:44 2014 +0100
    20.2 +++ b/xorg-libXvMC-dev/receipt	Sun Mar 16 00:22:05 2014 +0100
    20.3 @@ -8,6 +8,7 @@
    20.4  LICENSE="MIT"
    20.5  WANTED="xorg-libXvMC"
    20.6  WEB_SITE="http://www.x.org/"
    20.7 +HOST_ARCH="i486 arm"
    20.8  
    20.9  DEPENDS="xorg-libXvMC xorg-libXv-dev pkg-config"
   20.10  
    21.1 --- a/xorg-libXvMC/receipt	Sat Mar 15 21:09:44 2014 +0100
    21.2 +++ b/xorg-libXvMC/receipt	Sun Mar 16 00:22:05 2014 +0100
    21.3 @@ -10,6 +10,7 @@
    21.4  TARBALL="$SOURCE-$VERSION.tar.bz2"
    21.5  WEB_SITE="http://www.x.org/"
    21.6  WGET_URL="$XORG_MIRROR/lib/$TARBALL"
    21.7 +HOST_ARCH="i486 arm"
    21.8  
    21.9  DEPENDS="xorg-libXv"
   21.10  BUILD_DEPENDS="xorg-libXv-dev"