wok-current rev 17066

qtconfig: fix "broken", mplayer:fix osd menu, ln -s source
author Xander Ziiryanoff <psychomaniak@xakep.ru>
date Fri Aug 22 13:41:54 2014 +0200 (2014-08-22)
parents 27b7a2f535d7
children 6ac830804b1f
files mplayer-opt/receipt qtconfig/receipt
line diff
     1.1 --- a/mplayer-opt/receipt	Fri Aug 22 05:24:00 2014 +0200
     1.2 +++ b/mplayer-opt/receipt	Fri Aug 22 13:41:54 2014 +0200
     1.3 @@ -6,10 +6,8 @@
     1.4  SHORT_DESC="The Ultimate Movie Player For Linux (with minimal depends)"
     1.5  MAINTAINER="psychomaniak@xakep.ru"
     1.6  LICENSE="GPL2"
     1.7 -SOURCE="MPlayer"
     1.8 -TARBALL="$SOURCE-$VERSION.tar.xz"
     1.9 +WANTED="mplayer"
    1.10  WEB_SITE="http://www.mplayerhq.hu/design7/news.html"
    1.11 -WGET_URL="http://www1.mplayerhq.hu/MPlayer/releases/$TARBALL"
    1.12  HOST_ARCH="i486 arm"
    1.13  
    1.14  DEPENDS="libmad xorg-libXv alsa-lib cdparanoia-III giflib ncurses \
    1.15 @@ -28,7 +26,7 @@
    1.16  # Handle cross compilation. Host coreutils-file-* are used
    1.17  case "$ARCH" in
    1.18  	i?86) 
    1.19 -		ARCH_ARGS="--target=i486-linux --disable-sdl --enable-runtime-cpudetection" 
    1.20 +		ARCH_ARGS="--target=i486-linux --disable-sdl --enable-runtime-cpudetection"
    1.21  		BUILD_DEPENDS="$BUILD_DEPENDS cdparanoia-III-dev enca-dev" ;;
    1.22  	arm*) 
    1.23  		BUILD_DEPENDS="$BUILD_DEPENDS libsdl-dev" 
    1.24 @@ -38,6 +36,10 @@
    1.25  # Rules to configure and make the package.
    1.26  compile_rules()
    1.27  {
    1.28 +	rm -rf $WOK/$PACKAGE/source/ && mkdir -p $WOK/$PACKAGE/source/
    1.29 +	ln -s $WOK/$WANTED/source/$WANTED-$VERSION \
    1.30 +	$WOK/$PACKAGE/source/$PACKAGE-$VERSION &&
    1.31 +	cd $src &&
    1.32  	./configure \
    1.33  		--prefix=/usr \
    1.34  		--confdir=/etc/mplayer \
    1.35 @@ -76,7 +78,7 @@
    1.36  	# No-gui, OSD ($username@slitaz:~$ mplayer -menu filename)
    1.37  	mkdir -p $fs/usr/share/applications
    1.38  	cp -f $stuff/mplayer.desktop $fs/usr/share/applications/mplayer.desktop
    1.39 -	cp $src/etc/input.conf $fs/etc/mplayer
    1.40 +	cp $src/etc/*menu.conf $fs/etc/mplayer
    1.41  	# Font
    1.42  	cd $fs/usr/share/mplayer && ln -s ../fonts/truetype/ttf-dejavu/DejaVuSans.ttf subfont.ttf
    1.43  }
     2.1 --- a/qtconfig/receipt	Fri Aug 22 05:24:00 2014 +0200
     2.2 +++ b/qtconfig/receipt	Fri Aug 22 13:41:54 2014 +0200
     2.3 @@ -14,7 +14,7 @@
     2.4  # Rules to gen a SliTaz package suitable for Tazpkg.
     2.5  genpkg_rules()
     2.6  {
     2.7 -	mkdir -p $fs/usr/bin $fs/usr/share/qt/translations
     2.8 +	mkdir -p $fs/usr/bin $fs/usr/share/qt/translations $fs/usr/share/icons/hicolor/22x22/apps
     2.9  	cp -a $install/usr/bin/qtconfig $fs/usr/bin
    2.10  	cp -a $install/usr/share/qt/translations/qtconfig*.qm $fs/usr/share/qt/translations
    2.11  	cp -a $WOK/qt4/source/qt4-4.8.6/tools/designer/src/components/formeditor/images/qtlogo.png \