wok-6.x rev 16994

mplayer-opt: delete gui
author Xander Ziiryanoff <psychomaniak@xakep.ru>
date Sun Aug 10 01:59:37 2014 +0200 (2014-08-10)
parents 708048b2db25
children 7d1d61c783d6
files mplayer-opt/receipt mplayer-opt/stuff/mplayer.conf mplayer-opt/stuff/mplayer.desktop mplayer-opt/stuff/productive-1.0.tar.bz2 mplayer/receipt mplayer/stuff/mplayer.desktop mplayer/stuff/oldmplayer.desktop
line diff
     1.1 --- a/mplayer-opt/receipt	Sat Aug 09 13:09:11 2014 -0300
     1.2 +++ b/mplayer-opt/receipt	Sun Aug 10 01:59:37 2014 +0200
     1.3 @@ -3,7 +3,7 @@
     1.4  PACKAGE="mplayer-opt"
     1.5  VERSION="1.1.1"
     1.6  CATEGORY="multimedia"
     1.7 -SHORT_DESC="The Ultimate Movie Player For Linux (with CPU optimizations)"
     1.8 +SHORT_DESC="The Ultimate Movie Player For Linux (with minimal depends)"
     1.9  MAINTAINER="pankso@slitaz.org"
    1.10  LICENSE="GPL2"
    1.11  SOURCE="MPlayer"
    1.12 @@ -12,29 +12,26 @@
    1.13  WGET_URL="http://www1.mplayerhq.hu/MPlayer/releases/$TARBALL"
    1.14  HOST_ARCH="i486 arm"
    1.15  
    1.16 -# Dont forget to update all related pkgs
    1.17 -RELATED="mplayer-codecs mencoder" 
    1.18 -DEPENDS="gtk+ cdparanoia-III libmad xorg-libXv alsa-lib ncurses \
    1.19 -xorg-libXdamage giflib enca xorg-libXxf86vm libmng audiofile \
    1.20 -libogg zlib xorg-libXss"
    1.21 -BUILD_DEPENDS="gtk+-dev libmad-dev xorg-libXv-dev alsa-lib-dev \
    1.22 +DEPENDS="libmad xorg-libXv alsa-lib cdparanoia-III giflib ncurses \
    1.23 +libmng enca xorg-libXdamage xorg-libXxf86vm zlib xorg-libXss"
    1.24 +BUILD_DEPENDS="libmad-dev xorg-libXv-dev alsa-lib-dev \
    1.25  ncurses-dev xorg-libXdamage-dev giflib-dev xorg-libXxf86vm-dev \
    1.26 -esound-dev audiofile-dev libogg-dev zlib-dev \
    1.27 -xorg-xextproto pkg-config yasm"
    1.28 +audiofile-dev libogg-dev zlib-dev xorg-xextproto pkg-config yasm"
    1.29  
    1.30 -# Handle arch package install. Less deps and no GTK gui for ARM
    1.31 +GENERIC_MENUS="no"
    1.32 +
    1.33 +# Handle arch package install. Less deps and no GTK gui
    1.34  case "$SLITAZ_ARCH" in
    1.35  	arm*) 
    1.36  		DEPENDS="alsa-lib zlib libmad xorg-libXv xorg-libXxf86vm libogg \
    1.37 -		libvorbis libtheora libsdl xvidcore lame esound gtk+" ;;
    1.38 +		libvorbis libtheora libsdl" ;;
    1.39  esac
    1.40  
    1.41  # Handle cross compilation. Host coreutils-file-* are used
    1.42  case "$ARCH" in
    1.43  	i?86) 
    1.44 -		ARCH_ARGS="--target=i486-linux --disable-sdl" 
    1.45 -		BUILD_DEPENDS="$BUILD_DEPENDS cdparanoia-III-dev enca-dev \
    1.46 -		libmng-dev lirc-dev" ;;
    1.47 +		ARCH_ARGS="--target=i486-linux --disable-sdl --enable-runtime-cpudetection" 
    1.48 +		BUILD_DEPENDS="$BUILD_DEPENDS cdparanoia-III-dev enca-dev libmng-dev" ;;
    1.49  	arm*) 
    1.50  		BUILD_DEPENDS="$BUILD_DEPENDS libsdl-dev" 
    1.51  		ARCH_ARGS="--target=arm-linux --enable-cross-compile --enable-sdl" ;;
    1.52 @@ -43,16 +40,11 @@
    1.53  # Rules to configure and make the package.
    1.54  compile_rules()
    1.55  {
    1.56 -	# just remove next configure options:
    1.57 -	# --disable-mmx --disable-mmxext --disable-3dnow --disable-3dnowext
    1.58 -	# --disable-sse --disable-sse2 --disable-ssse3
    1.59  	./configure \
    1.60  		--prefix=/usr \
    1.61  		--confdir=/etc/mplayer \
    1.62  		--libdir=/usr/lib/mplayer \
    1.63 -		--enable-gui \
    1.64  		--language="en de es fr it pl ru" \
    1.65 -		--enable-runtime-cpudetection \
    1.66  		--disable-mencoder \
    1.67  		--disable-gl \
    1.68  		--disable-jack \
    1.69 @@ -74,21 +66,18 @@
    1.70  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.71  genpkg_rules()
    1.72  {
    1.73 -	mkdir -p $fs/usr/share/mplayer/skins
    1.74 +	mkdir -p $fs/usr/share/mplayer
    1.75  	cp -a $install/usr/bin $fs/usr
    1.76 -	[ -d "$install/usr/share/mplayer" ] && \
    1.77 -		cp -a $install/usr/share/mplayer $fs/usr/share
    1.78  	cp -a $install/etc $fs
    1.79  	cp $src/etc/example.conf $fs/etc/mplayer
    1.80  	# Add /etc/mplayer/input.conf
    1.81  	cp $stuff/input.conf $fs/etc/mplayer
    1.82  	# Config to use Xv by default.
    1.83  	cp $stuff/mplayer.conf $fs/etc/mplayer
    1.84 -	# default skin
    1.85 -	tar xjf $stuff/productive-1.0.tar.bz2 -C $fs/usr/share/mplayer/skins
    1.86 -	cd $fs/usr/share/mplayer/skins && ln -s productive default
    1.87 +	# No-gui
    1.88 +	cp $stuff/mplayer.desktop $fs/usr/share/applications
    1.89  	# Font
    1.90 -	cd .. && ln -s ../fonts/truetype/ttf-dejavu/DejaVuSans.ttf subfont.ttf
    1.91 +	cd $fs/usr/share/mplayer && ln -s ../fonts/truetype/ttf-dejavu/DejaVuSans.ttf subfont.ttf
    1.92  	# Xv support dont work for ARM and gmplayer symlink not created
    1.93  	case "$ARCH" in
    1.94  		arm*)

     2.1 --- a/mplayer-opt/stuff/mplayer.conf	Sat Aug 09 13:09:11 2014 -0300
     2.2 +++ b/mplayer-opt/stuff/mplayer.conf	Sun Aug 10 01:59:37 2014 +0200
     2.3 @@ -3,10 +3,11 @@
     2.4  #
     2.5  
     2.6  # Specify default video driver (see -vo help for a list).
     2.7 -vo=xv,x11,fbdev2
     2.8 +vo=xv,x11,fbdev2,
     2.9  
    2.10  # Specify default audio driver (see -ao help for a list).
    2.11 -ao=alsa:device=hw=0.0,alsa
    2.12 +ao=oss,alsa:device=hw=0.0,alsa,
    2.13 +ac=mad,
    2.14  
    2.15  stop-xscreensaver="1"
    2.16  heartbeat-cmd='echo -n ""'

     3.1 --- a/mplayer-opt/stuff/mplayer.desktop	Sat Aug 09 13:09:11 2014 -0300
     3.2 +++ b/mplayer-opt/stuff/mplayer.desktop	Sun Aug 10 01:59:37 2014 +0200
     3.3 @@ -1,19 +1,13 @@
     3.4  [Desktop Entry]
     3.5 -Name=MPlayer Media Player
     3.6 -Name[de]=MPlayer Medienwiedergabe
     3.7 -Name[es]=MPlayer Reproductor multimedia
     3.8 -Name[fr]=Lecteur multimédia MPlayer
     3.9 -Name[it]=Lettore multimediale MPlayer
    3.10 -Name[pt]=Reprodutor Multimídia MPlayer
    3.11 -Name[pt_BR]=Reprodutor Multimídia MPlayer
    3.12 -Name[ru]=Медиа-проигрыватель MPlayer
    3.13 -Comment=Play movies and songs
    3.14 -Comment[de]=Filme und Musik wiedergeben
    3.15 -Comment[es]=Reproduce vídeos y música
    3.16 -Comment[fr]=Lit les films et musiques
    3.17 -Comment[it]=Riproduce filmati e musica
    3.18 -Comment[ru]=Воспроизведение фильмов и музыки
    3.19 -Exec=gmplayer %F
    3.20 +Type=Application
    3.21 +Name=...open with pure MPlayer
    3.22 +GenericName=mplayer
    3.23 +X-GNOME-FullName=mplayer
    3.24 +Comment=backend
    3.25 +TryExec=mplayer
    3.26 +Exec=mplayer %F
    3.27 +Terminal=false
    3.28  Icon=mplayer
    3.29 -Categories=GTK;AudioVideo;Audio;Video;Player;TV;
    3.30 +NoDisplay=true
    3.31 +Categories=AudioVideo;Audio;Video;Player;TV;
    3.32  MimeType=application/mxf;application/x-netshow-channel;application/ogg;application/ram;application/vnd.rn-realmedia;application/x-shockwave-flash;application/smil;audio/ac3;audio/x-adpcm;audio/x-aiff;audio/AMR;audio/AMR-WB;audio/x-ape;audio/basic;audio/flac;audio/x-flac;audio/x-flac+ogg;audio/x-m4b;audio/x-matroska;audio/mp2;audio/mp4;audio/mpeg;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/ogg;audio/vnd.rn-realaudio;audio/x-scpls;audio/x-voc;audio/x-vorbis+ogg;audio/x-wav;audio/x-wavpack;video/3gpp;video/3gpp2;video/dv;video/x-flic;video/x-flv;video/x-matroska;video/mp2t;video/mp4;video/mpeg;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/ogg;video/x-ogm+ogg;video/quicktime;video/vnd.rn-realvideo;video/x-theora+ogg;video/webm;

     4.1 Binary file mplayer-opt/stuff/productive-1.0.tar.bz2 has changed

     5.1 --- a/mplayer/receipt	Sat Aug 09 13:09:11 2014 -0300
     5.2 +++ b/mplayer/receipt	Sun Aug 10 01:59:37 2014 +0200
     5.3 @@ -16,7 +16,7 @@
     5.4  RELATED="mplayer-codecs mencoder" 
     5.5  DEPENDS="gtk+ cdparanoia-III libmad xorg-libXv libtheora alsa-lib ncurses \
     5.6  lame xorg-libXdamage giflib enca lirc xorg-libXxf86vm esound libmng \
     5.7 -audiofile libvorbis libogg zlib xorg-libXss"
     5.8 +audiofile libvorbis libogg zlib xvidcore x264 xorg-libXss"
     5.9  BUILD_DEPENDS="gtk+-dev libmad-dev xorg-libXv-dev libtheora-dev \
    5.10  alsa-lib-dev ncurses-dev lame-dev xorg-libXdamage-dev giflib-dev \
    5.11  xorg-libXxf86vm-dev esound-dev audiofile-dev libogg-dev libvorbis-dev \
    5.12 @@ -49,7 +49,6 @@
    5.13  		--libdir=/usr/lib/mplayer \
    5.14  		--enable-gui \
    5.15  		--language="en de es fr it ru" \
    5.16 -		--disable-mencoder \
    5.17  		--disable-gl \
    5.18  		--disable-jack \
    5.19  		--disable-liblzo \

     6.1 --- a/mplayer/stuff/mplayer.desktop	Sat Aug 09 13:09:11 2014 -0300
     6.2 +++ b/mplayer/stuff/mplayer.desktop	Sun Aug 10 01:59:37 2014 +0200
     6.3 @@ -1,17 +1,19 @@
     6.4  [Desktop Entry]
     6.5 -Type=Application
     6.6 -Encoding=UTF-8
     6.7 -Name=MPlayer Multimedia player
     6.8 -Name[zh_CN]=MPlayer多媒体播放器
     6.9 -Comment[de]=Multimedia-Player
    6.10 -Comment[es]=Reproductor multimedia MPlayer
    6.11 -Name[fr]=Lecteur multimédia MPlayerName
    6.12 +Name=MPlayer Media Player
    6.13 +Name[de]=MPlayer Medienwiedergabe
    6.14 +Name[es]=MPlayer Reproductor multimedia
    6.15 +Name[fr]=Lecteur multimédia MPlayer
    6.16 +Name[it]=Lettore multimediale MPlayer
    6.17  Name[pt]=Reprodutor Multimídia MPlayer
    6.18  Name[pt_BR]=Reprodutor Multimídia MPlayer
    6.19 -Comment[it]=Lettore multimediale MPlayer
    6.20 +Name[ru]=Медиа-проигрыватель MPlayer
    6.21 +Comment=Play movies and songs
    6.22 +Comment[de]=Filme und Musik wiedergeben
    6.23 +Comment[es]=Reproduce vídeos y música
    6.24 +Comment[fr]=Lit les films et musiques
    6.25 +Comment[it]=Riproduce filmati e musica
    6.26 +Comment[ru]=Воспроизведение фильмов и музыки
    6.27 +Exec=gmplayer %F
    6.28  Icon=mplayer
    6.29 -TryExec=gmplayer
    6.30 -Exec=gmplayer
    6.31 -Terminal=false
    6.32  Categories=GTK;AudioVideo;Audio;Video;Player;TV;
    6.33 -MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-theora;video/x-matroska;
    6.34 +MimeType=application/mxf;application/x-netshow-channel;application/ogg;application/ram;application/vnd.rn-realmedia;application/x-shockwave-flash;application/smil;audio/ac3;audio/x-adpcm;audio/x-aiff;audio/AMR;audio/AMR-WB;audio/x-ape;audio/basic;audio/flac;audio/x-flac;audio/x-flac+ogg;audio/x-m4b;audio/x-matroska;audio/mp2;audio/mp4;audio/mpeg;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/ogg;audio/vnd.rn-realaudio;audio/x-scpls;audio/x-voc;audio/x-vorbis+ogg;audio/x-wav;audio/x-wavpack;video/3gpp;video/3gpp2;video/dv;video/x-flic;video/x-flv;video/x-matroska;video/mp2t;video/mp4;video/mpeg;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/ogg;video/x-ogm+ogg;video/quicktime;video/vnd.rn-realvideo;video/x-theora+ogg;video/webm;

     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/mplayer/stuff/oldmplayer.desktop	Sun Aug 10 01:59:37 2014 +0200
     7.3 @@ -0,0 +1,17 @@
     7.4 +[Desktop Entry]
     7.5 +Type=Application
     7.6 +Encoding=UTF-8
     7.7 +Name=MPlayer Multimedia player
     7.8 +Name[zh_CN]=MPlayer多媒体播放器
     7.9 +Comment[de]=Multimedia-Player
    7.10 +Comment[es]=Reproductor multimedia MPlayer
    7.11 +Name[fr]=Lecteur multimédia MPlayerName
    7.12 +Name[pt]=Reprodutor Multimídia MPlayer
    7.13 +Name[pt_BR]=Reprodutor Multimídia MPlayer
    7.14 +Comment[it]=Lettore multimediale MPlayer
    7.15 +Icon=mplayer
    7.16 +TryExec=gmplayer
    7.17 +Exec=gmplayer
    7.18 +Terminal=false
    7.19 +Categories=GTK;AudioVideo;Audio;Video;Player;TV;
    7.20 +MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-theora;video/x-matroska;