# HG changeset patch # User Xander Ziiryanoff # Date 1407628777 -7200 # Node ID 03f6246616fd0498f5fbe1f4a2a216f536a213b7 # Parent 708048b2db2594b6a0a563de5417d6920021554b mplayer-opt: delete gui diff -r 708048b2db25 -r 03f6246616fd mplayer-opt/receipt --- a/mplayer-opt/receipt Sat Aug 09 13:09:11 2014 -0300 +++ b/mplayer-opt/receipt Sun Aug 10 01:59:37 2014 +0200 @@ -3,7 +3,7 @@ PACKAGE="mplayer-opt" VERSION="1.1.1" CATEGORY="multimedia" -SHORT_DESC="The Ultimate Movie Player For Linux (with CPU optimizations)" +SHORT_DESC="The Ultimate Movie Player For Linux (with minimal depends)" MAINTAINER="pankso@slitaz.org" LICENSE="GPL2" SOURCE="MPlayer" @@ -12,29 +12,26 @@ WGET_URL="http://www1.mplayerhq.hu/MPlayer/releases/$TARBALL" HOST_ARCH="i486 arm" -# Dont forget to update all related pkgs -RELATED="mplayer-codecs mencoder" -DEPENDS="gtk+ cdparanoia-III libmad xorg-libXv alsa-lib ncurses \ -xorg-libXdamage giflib enca xorg-libXxf86vm libmng audiofile \ -libogg zlib xorg-libXss" -BUILD_DEPENDS="gtk+-dev libmad-dev xorg-libXv-dev alsa-lib-dev \ +DEPENDS="libmad xorg-libXv alsa-lib cdparanoia-III giflib ncurses \ +libmng enca xorg-libXdamage xorg-libXxf86vm zlib xorg-libXss" +BUILD_DEPENDS="libmad-dev xorg-libXv-dev alsa-lib-dev \ ncurses-dev xorg-libXdamage-dev giflib-dev xorg-libXxf86vm-dev \ -esound-dev audiofile-dev libogg-dev zlib-dev \ -xorg-xextproto pkg-config yasm" +audiofile-dev libogg-dev zlib-dev xorg-xextproto pkg-config yasm" -# Handle arch package install. Less deps and no GTK gui for ARM +GENERIC_MENUS="no" + +# Handle arch package install. Less deps and no GTK gui case "$SLITAZ_ARCH" in arm*) DEPENDS="alsa-lib zlib libmad xorg-libXv xorg-libXxf86vm libogg \ - libvorbis libtheora libsdl xvidcore lame esound gtk+" ;; + libvorbis libtheora libsdl" ;; esac # Handle cross compilation. Host coreutils-file-* are used case "$ARCH" in i?86) - ARCH_ARGS="--target=i486-linux --disable-sdl" - BUILD_DEPENDS="$BUILD_DEPENDS cdparanoia-III-dev enca-dev \ - libmng-dev lirc-dev" ;; + ARCH_ARGS="--target=i486-linux --disable-sdl --enable-runtime-cpudetection" + BUILD_DEPENDS="$BUILD_DEPENDS cdparanoia-III-dev enca-dev libmng-dev" ;; arm*) BUILD_DEPENDS="$BUILD_DEPENDS libsdl-dev" ARCH_ARGS="--target=arm-linux --enable-cross-compile --enable-sdl" ;; @@ -43,16 +40,11 @@ # Rules to configure and make the package. compile_rules() { - # just remove next configure options: - # --disable-mmx --disable-mmxext --disable-3dnow --disable-3dnowext - # --disable-sse --disable-sse2 --disable-ssse3 ./configure \ --prefix=/usr \ --confdir=/etc/mplayer \ --libdir=/usr/lib/mplayer \ - --enable-gui \ --language="en de es fr it pl ru" \ - --enable-runtime-cpudetection \ --disable-mencoder \ --disable-gl \ --disable-jack \ @@ -74,21 +66,18 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/share/mplayer/skins + mkdir -p $fs/usr/share/mplayer cp -a $install/usr/bin $fs/usr - [ -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 # Add /etc/mplayer/input.conf cp $stuff/input.conf $fs/etc/mplayer # Config to use Xv by default. cp $stuff/mplayer.conf $fs/etc/mplayer - # default skin - tar xjf $stuff/productive-1.0.tar.bz2 -C $fs/usr/share/mplayer/skins - cd $fs/usr/share/mplayer/skins && ln -s productive default + # No-gui + cp $stuff/mplayer.desktop $fs/usr/share/applications # Font - cd .. && ln -s ../fonts/truetype/ttf-dejavu/DejaVuSans.ttf subfont.ttf + cd $fs/usr/share/mplayer && ln -s ../fonts/truetype/ttf-dejavu/DejaVuSans.ttf subfont.ttf # Xv support dont work for ARM and gmplayer symlink not created case "$ARCH" in arm*) diff -r 708048b2db25 -r 03f6246616fd mplayer-opt/stuff/mplayer.conf --- a/mplayer-opt/stuff/mplayer.conf Sat Aug 09 13:09:11 2014 -0300 +++ b/mplayer-opt/stuff/mplayer.conf Sun Aug 10 01:59:37 2014 +0200 @@ -3,10 +3,11 @@ # # Specify default video driver (see -vo help for a list). -vo=xv,x11,fbdev2 +vo=xv,x11,fbdev2, # Specify default audio driver (see -ao help for a list). -ao=alsa:device=hw=0.0,alsa +ao=oss,alsa:device=hw=0.0,alsa, +ac=mad, stop-xscreensaver="1" heartbeat-cmd='echo -n ""' diff -r 708048b2db25 -r 03f6246616fd mplayer-opt/stuff/mplayer.desktop --- a/mplayer-opt/stuff/mplayer.desktop Sat Aug 09 13:09:11 2014 -0300 +++ b/mplayer-opt/stuff/mplayer.desktop Sun Aug 10 01:59:37 2014 +0200 @@ -1,19 +1,13 @@ [Desktop Entry] -Name=MPlayer Media Player -Name[de]=MPlayer Medienwiedergabe -Name[es]=MPlayer Reproductor multimedia -Name[fr]=Lecteur multimédia MPlayer -Name[it]=Lettore multimediale MPlayer -Name[pt]=Reprodutor Multimídia MPlayer -Name[pt_BR]=Reprodutor Multimídia MPlayer -Name[ru]=Медиа-проигрыватель MPlayer -Comment=Play movies and songs -Comment[de]=Filme und Musik wiedergeben -Comment[es]=Reproduce vídeos y música -Comment[fr]=Lit les films et musiques -Comment[it]=Riproduce filmati e musica -Comment[ru]=Воспроизведение фильмов и музыки -Exec=gmplayer %F +Type=Application +Name=...open with pure MPlayer +GenericName=mplayer +X-GNOME-FullName=mplayer +Comment=backend +TryExec=mplayer +Exec=mplayer %F +Terminal=false Icon=mplayer -Categories=GTK;AudioVideo;Audio;Video;Player;TV; +NoDisplay=true +Categories=AudioVideo;Audio;Video;Player;TV; 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; diff -r 708048b2db25 -r 03f6246616fd mplayer-opt/stuff/productive-1.0.tar.bz2 Binary file mplayer-opt/stuff/productive-1.0.tar.bz2 has changed diff -r 708048b2db25 -r 03f6246616fd mplayer/receipt --- a/mplayer/receipt Sat Aug 09 13:09:11 2014 -0300 +++ b/mplayer/receipt Sun Aug 10 01:59:37 2014 +0200 @@ -16,7 +16,7 @@ RELATED="mplayer-codecs mencoder" DEPENDS="gtk+ cdparanoia-III libmad xorg-libXv libtheora alsa-lib ncurses \ lame xorg-libXdamage giflib enca lirc xorg-libXxf86vm esound libmng \ -audiofile libvorbis libogg zlib xorg-libXss" +audiofile libvorbis libogg zlib xvidcore x264 xorg-libXss" BUILD_DEPENDS="gtk+-dev libmad-dev xorg-libXv-dev libtheora-dev \ alsa-lib-dev ncurses-dev lame-dev xorg-libXdamage-dev giflib-dev \ xorg-libXxf86vm-dev esound-dev audiofile-dev libogg-dev libvorbis-dev \ @@ -49,7 +49,6 @@ --libdir=/usr/lib/mplayer \ --enable-gui \ --language="en de es fr it ru" \ - --disable-mencoder \ --disable-gl \ --disable-jack \ --disable-liblzo \ diff -r 708048b2db25 -r 03f6246616fd mplayer/stuff/mplayer.desktop --- a/mplayer/stuff/mplayer.desktop Sat Aug 09 13:09:11 2014 -0300 +++ b/mplayer/stuff/mplayer.desktop Sun Aug 10 01:59:37 2014 +0200 @@ -1,17 +1,19 @@ [Desktop Entry] -Type=Application -Encoding=UTF-8 -Name=MPlayer Multimedia player -Name[zh_CN]=MPlayer多媒体播放器 -Comment[de]=Multimedia-Player -Comment[es]=Reproductor multimedia MPlayer -Name[fr]=Lecteur multimédia MPlayerName +Name=MPlayer Media Player +Name[de]=MPlayer Medienwiedergabe +Name[es]=MPlayer Reproductor multimedia +Name[fr]=Lecteur multimédia MPlayer +Name[it]=Lettore multimediale MPlayer Name[pt]=Reprodutor Multimídia MPlayer Name[pt_BR]=Reprodutor Multimídia MPlayer -Comment[it]=Lettore multimediale MPlayer +Name[ru]=Медиа-проигрыватель MPlayer +Comment=Play movies and songs +Comment[de]=Filme und Musik wiedergeben +Comment[es]=Reproduce vídeos y música +Comment[fr]=Lit les films et musiques +Comment[it]=Riproduce filmati e musica +Comment[ru]=Воспроизведение фильмов и музыки +Exec=gmplayer %F Icon=mplayer -TryExec=gmplayer -Exec=gmplayer -Terminal=false Categories=GTK;AudioVideo;Audio;Video;Player;TV; -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; +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; diff -r 708048b2db25 -r 03f6246616fd mplayer/stuff/oldmplayer.desktop --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mplayer/stuff/oldmplayer.desktop Sun Aug 10 01:59:37 2014 +0200 @@ -0,0 +1,17 @@ +[Desktop Entry] +Type=Application +Encoding=UTF-8 +Name=MPlayer Multimedia player +Name[zh_CN]=MPlayer多媒体播放器 +Comment[de]=Multimedia-Player +Comment[es]=Reproductor multimedia MPlayer +Name[fr]=Lecteur multimédia MPlayerName +Name[pt]=Reprodutor Multimídia MPlayer +Name[pt_BR]=Reprodutor Multimídia MPlayer +Comment[it]=Lettore multimediale MPlayer +Icon=mplayer +TryExec=gmplayer +Exec=gmplayer +Terminal=false +Categories=GTK;AudioVideo;Audio;Video;Player;TV; +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;