# HG changeset patch # User Christophe Lincoln # Date 1395610628 -3600 # Node ID 4011b51eb28e3d03383301fa32b22ffd03643e4a # Parent 424066c71c1349d10af817165f14f4f89c1ac4d2 Mplayer up to (1.1.1) and add to ARM arch with esound support diff -r 424066c71c13 -r 4011b51eb28e esound-dev/receipt --- a/esound-dev/receipt Sun Mar 23 22:14:30 2014 +0100 +++ b/esound-dev/receipt Sun Mar 23 22:37:08 2014 +0100 @@ -7,6 +7,7 @@ MAINTAINER="allan316@gmail.com" LICENSE="GPL2" WEB_SITE="http://www.tux.org/~ricdude/EsounD.html" +HOST_ARCH="i486 arm" WANTED="esound" DEPENDS="esound pkg-config" diff -r 424066c71c13 -r 4011b51eb28e esound/receipt --- a/esound/receipt Sun Mar 23 22:14:30 2014 +0100 +++ b/esound/receipt Sun Mar 23 22:37:08 2014 +0100 @@ -10,6 +10,7 @@ TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="http://ftp.acc.umu.se/pub/GNOME/sources/esound/0.2/$TARBALL" TAGS="audio sound" +HOST_ARCH="i486 arm" DEPENDS="audiofile alsa-lib" BUILD_DEPENDS="audiofile-dev alsa-lib-dev" diff -r 424066c71c13 -r 4011b51eb28e mencoder/receipt --- a/mencoder/receipt Sun Mar 23 22:14:30 2014 +0100 +++ b/mencoder/receipt Sun Mar 23 22:37:08 2014 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="mencoder" -VERSION="1.1" +VERSION="1.1.1" CATEGORY="multimedia" SHORT_DESC="MPlayer video and movie encoder." MAINTAINER="pankso@slitaz.org" @@ -13,6 +13,12 @@ fontconfig freetype x264 xvidcore jpeg libmad ncurses zlib lame \ libpng giflib enca lirc" +# Handle arch package install +case "$SLITAZ_ARCH" in + arm*) DEPENDS="alsa-lib zlib libmad xorg-libXv xorg-libXxf86vm libogg \ +libvorbis libtheora xvidcore lame esound" ;; +esac + # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { diff -r 424066c71c13 -r 4011b51eb28e mplayer-codecs/receipt --- a/mplayer-codecs/receipt Sun Mar 23 22:14:30 2014 +0100 +++ b/mplayer-codecs/receipt Sun Mar 23 22:37:08 2014 +0100 @@ -1,14 +1,15 @@ # SliTaz package receipt. PACKAGE="mplayer-codecs" -VERSION="1.1" +VERSION="20110131" CATEGORY="multimedia" SHORT_DESC="All MPlayer codecs for SliTaz." MAINTAINER="pankso@slitaz.org" LICENSE="GPL2" WEB_SITE="http://www.mplayerhq.hu/design7/news.html" TARBALL="$PACKAGE-$VERSION.tar.bz2" -WGET_URL="http://www1.mplayerhq.hu/MPlayer/releases/codecs/all-20110131.tar.bz2" +WGET_URL="http://www1.mplayerhq.hu/MPlayer/releases/codecs/all-$VERSION.tar.bz2" +HOST_ARCH="i486 arm" DEPENDS="mplayer" diff -r 424066c71c13 -r 4011b51eb28e mplayer/receipt --- a/mplayer/receipt Sun Mar 23 22:14:30 2014 +0100 +++ b/mplayer/receipt Sun Mar 23 22:37:08 2014 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="mplayer" -VERSION="1.1" +VERSION="1.1.1" CATEGORY="multimedia" SHORT_DESC="The Ultimate Movie Player For Linux." MAINTAINER="pankso@slitaz.org" @@ -10,7 +10,9 @@ TARBALL="$SOURCE-$VERSION.tar.xz" WEB_SITE="http://www.mplayerhq.hu/design7/news.html" WGET_URL="http://www1.mplayerhq.hu/MPlayer/releases/$TARBALL" +HOST_ARCH="i486 arm" +RELATED="mplayer-codecs mencoder" # Dont forget to update them DEPENDS="gtk+ cdparanoia-III libmad xorg-libXv libtheora alsa-lib ncurses \ lame xorg-libXdamage giflib enca lirc xorg-libXxf86vm esound libmng audiofile \ libvorbis libogg xvidcore x264 zlib xorg-libXss" @@ -20,15 +22,30 @@ audiofile-dev x264-dev libogg-dev libvorbis-dev xvidcore-dev zlib-dev \ xorg-xextproto pkg-config yasm" +# Handle arch package install. Less deps and no GTK gui for ARM +case "$SLITAZ_ARCH" in + arm*) DEPENDS="alsa-lib zlib libmad xorg-libXv xorg-libXxf86vm libogg \ +libvorbis libtheora libsdl xvidcore lame esound" ;; +esac + +# Handle cross compilation. Host coreutils-file-* are used +case "$ARCH" in + i?86) + ARCH_ARGS="--target=i386-linux --enable-gui --disable-sdl" ;; + arm*) + BUILD_DEPENDS="alsa-lib-dev zlib-dev libmad-dev xorg-libXv-dev \ +xorg-libXxf86vm-dev libogg-dev libvorbis-dev libsdl-dev xvidcore-dev lame-dev \ +libtheora-dev esound-dev" + ARCH_ARGS="--target=arm-linux --enable-cross-compile --enable-sdl" ;; +esac + # Rules to configure and make the package. compile_rules() { - cd $src ./configure \ --prefix=/usr \ --confdir=/etc/mplayer \ --libdir=/usr/lib/mplayer \ - --target=i386-linux \ --language="en de es fr it ru" \ --disable-mmx \ --disable-mmxext \ @@ -39,7 +56,6 @@ --disable-ssse3 \ --disable-fastmemcpy \ --disable-gl \ - --disable-sdl \ --disable-jack \ --disable-liblzo \ --disable-libdv \ @@ -50,19 +66,20 @@ --disable-openal \ --disable-faac \ --disable-speex \ - --enable-gui && + ${ARCH_ARGS} && make $MAKEFLAGS && - make DESTDIR=$DESTDIR install + make DESTDIR=$DESTDIR install | sed '/install: strip: .*/'d } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/share + mkdir -p $fs/usr/share/mplayer/skins cp -a $install/usr/bin $fs/usr # Mencoder goes in a splited package. rm $fs/usr/bin/mencoder - cp -a $install/usr/share/mplayer $fs/usr/share + [ -d "$install/usr/share/mplayer" ] && \ + cp -a $install/usr/share/mplayer $fs/usr/share cp -a $install/etc $fs cp $src/etc/example.conf $fs/etc/mplayer # Config to use Xv by default. @@ -72,4 +89,8 @@ cd $fs/usr/share/mplayer/skins && ln -s productive default # Font cd .. && ln -s ../fonts/truetype/ttf-dejavu/DejaVuSans.ttf subfont.ttf + # Xv support dont work for ARM + case "$ARCH" in + arm*) cp -f $stuff/mplayer-arm.conf $fs/etc/mplayer/mplayer.conf ;; + esac } diff -r 424066c71c13 -r 4011b51eb28e mplayer/stuff/mplayer-arm.conf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mplayer/stuff/mplayer-arm.conf Sun Mar 23 22:37:08 2014 +0100 @@ -0,0 +1,10 @@ +# /etc/mplayer/mplayer.conf: MPlayer default configuration for SliTaz. +# For more info and examples, please see: /etc/mplayer/example.conf +# + +# Specify default video driver (see -vo help for a list). +vo=x11 + +# Specify default audio driver (see -ao help for a list). +ao=alsa +