# HG changeset patch # User Xander Ziiryanoff # Date 1481371609 -3600 # Node ID 9a9d8eb38212c9021e60d64d00eb1387858e8754 # Parent 9e247dfd5b856e8f3dfa6d357e6be1dff69b9c51 Up smtube (16.7.2), smplayer (16.11.0) diff -r 9e247dfd5b85 -r 9a9d8eb38212 mplayer-opt/receipt --- a/mplayer-opt/receipt Sat Dec 10 09:51:54 2016 +0000 +++ b/mplayer-opt/receipt Sat Dec 10 13:06:49 2016 +0100 @@ -12,27 +12,19 @@ WGET_URL="http://www1.mplayerhq.hu/MPlayer/releases/$TARBALL" HOST_ARCH="i486 arm" -DEPENDS="libmad xorg-libXv alsa-lib cdparanoia-III giflib ncurses \ -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 \ -audiofile-dev libogg-dev zlib-dev xorg-xextproto pkg-config yasm" +CONFIG_FILES="/etc/mplayer" -# 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" ;; -esac +DEPENDS="xorg-libXv alsa-lib giflib ncurses fontconfig libsdl \ +libxml2 pcre libpng xorg-libXdamage xorg-libXxf86vm zlib xorg-libXss" +BUILD_DEPENDS="ncurses-dev xorg-libXv-dev alsa-lib-dev libsdl-dev \ +xorg-libXdamage-dev giflib-dev xorg-libXxf86vm-dev xorg-xextproto \ +freetype-dev fontconfig-dev zlib-dev pkg-config yasm" +PROVIDE="mplayer" # Handle cross compilation. Host coreutils-file-* are used case "$ARCH" in - i?86) - ARCH_ARGS="--target=i486-linux --disable-sdl --enable-runtime-cpudetection" - BUILD_DEPENDS="$BUILD_DEPENDS cdparanoia-III-dev enca-dev" ;; - arm*) - BUILD_DEPENDS="$BUILD_DEPENDS libsdl-dev" - ARCH_ARGS="--target=arm-linux --enable-cross-compile --enable-sdl" ;; + i?86) ARCH_ARGS="--target=i486-linux --enable-runtime-cpudetection" ;; + arm*) ARCH_ARGS="--target=arm-linux --enable-cross-compile" ;; esac # Rules to configure and make the package. @@ -52,7 +44,6 @@ --disable-fribidi \ --disable-ivtv \ --disable-smb \ - --disable-ftp \ --disable-openal \ --disable-faac \ --disable-speex --disable-esd \ @@ -79,4 +70,4 @@ cp $src/etc/*menu.conf $fs/etc/mplayer # Font cd $fs/usr/share/mplayer && ln -s ../fonts/truetype/ttf-dejavu/DejaVuSans.ttf subfont.ttf -} \ No newline at end of file +} diff -r 9e247dfd5b85 -r 9a9d8eb38212 mplayer-opt/stuff/mplayer.conf --- a/mplayer-opt/stuff/mplayer.conf Sat Dec 10 09:51:54 2016 +0000 +++ b/mplayer-opt/stuff/mplayer.conf Sat Dec 10 13:06:49 2016 +0100 @@ -3,11 +3,16 @@ # # Specify default video driver (see -vo help for a list). +# xv is slow with xcompmgr/compton vo=xv,x11,fbdev2, +# vf=scale +# vf=eq2 + # Specify default audio driver (see -ao help for a list). -ao=oss,alsa:device=hw=0.0,alsa, -ac=mad, +ao=oss,sdl,alsa, +# ao=oss,sdl,alsa:device=hw=0.0,alsa, +# af= stop-xscreensaver="1" heartbeat-cmd='echo -n ""' diff -r 9e247dfd5b85 -r 9a9d8eb38212 smplayer-themes/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/smplayer-themes/receipt Sat Dec 10 13:06:49 2016 +0100 @@ -0,0 +1,27 @@ +# SliTaz package receipt. + +PACKAGE="smplayer-themes" +VERSION="16.8.0" +CATEGORY="multimedia" +SHORT_DESC="Icon themes for smplayer" +MAINTAINER="psychomaniak@xakep.ru" +LICENSE="GPL2" +TARBALL="$PACKAGE-$VERSION.tar.bz2" +WEB_SITE="http://smplayer.sourceforge.net/" +WGET_URL="$SF_MIRROR/${PACKAGE/-themes/}/$TARBALL" + +DEPENDS="smplayer" +BUILD_DEPENDS="Qt4-dev qmake" + +# Rules to configure and make the package. +compile_rules() +{ + make PREFIX=/usr && + make PREFIX=/usr DESTDIR=$DESTDIR install +} + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mv $install/* $fs +} diff -r 9e247dfd5b85 -r 9a9d8eb38212 smplayer/receipt --- a/smplayer/receipt Sat Dec 10 09:51:54 2016 +0000 +++ b/smplayer/receipt Sat Dec 10 13:06:49 2016 +0100 @@ -1,41 +1,43 @@ # SliTaz package receipt. PACKAGE="smplayer" -VERSION="0.6.9" +VERSION="16.11.0" CATEGORY="multimedia" -SHORT_DESC="QT-based front-end for MPlayer" -MAINTAINER="jozee@slitaz.org" +SHORT_DESC="QT-based front-end for MPlayer or mpv" +MAINTAINER="psychomaniak@xakep.ru" LICENSE="GPL2" TARBALL="$PACKAGE-$VERSION.tar.bz2" -WEB_SITE="http://smplayer.sourceforge.net/" +WEB_SITE="http://smplayer.sourceforge.net/" WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" TAGS="player audio video movie" -DEPENDS="mplayer-opt libQtCore libQtGui libQtXml gcc-lib-base" -BUILD_DEPENDS="qt4 Qt4-dev qmake libQtNetwork libegl-mesa" +DEPENDS="mplayer-opt libQtCore libQtGui libQtXml libQtScript libQtDBus" +BUILD_DEPENDS="Qt4-dev qmake" +SUGGESTED="smplayer-themes mpv" # Rules to configure and make the package. compile_rules() { - cd $src + # Some default setting incompatible with minimal mplayer + sed '/use_ass_subtitles/s/true/false/' -i src/preferences.cpp make PREFIX=/usr && make PREFIX=/usr DESTDIR=$DESTDIR install - } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/share $fs/usr/share/applications + mkdir -p $fs/usr/share cp -a $install/usr/bin $fs/usr - cp -a $install/usr/share/$PACKAGE $fs/usr/share - - # Remove extra translations or locales + cp -a $install/usr/share/$PACKAGE $fs/usr/share + cp -a $install/usr/share/icons $fs/usr/share rm $fs/usr/share/$PACKAGE/translations/* - cp -a $install/usr/share/$PACKAGE/translations/smplayer_en_US.qm \ - $install/usr/share/$PACKAGE/translations/smplayer_fr.qm \ - $fs/usr/share/$PACKAGE/translations/ - - # copy .desktop file. - cp -a $stuff/smplayer_enqueue.desktop $fs/usr/share/applications/ + + for i in de en_US es fr it pt_BR ru_RU + do cp -a $install/usr/share/$PACKAGE/translations/smplayer_$i.qm \ + $fs/usr/share/$PACKAGE/translations/ + done + for size in 64 128 192 256 512 scalable; do + rm -rf $fs/usr/share/icons/hicolor/${size}* + done } diff -r 9e247dfd5b85 -r 9a9d8eb38212 smplayer/stuff/smplayer.desktop --- a/smplayer/stuff/smplayer.desktop Sat Dec 10 09:51:54 2016 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -[Desktop Entry] -Categories=Qt;AudioVideo;Player;Video; -Comment=A great MPlayer front-end -Comment[es]=A great MPlayer front-end -Comment[it]=Un grande front-end per MPlayer -Comment[ja]=MPlayer フロントエンド -Comment[nl]=Een uitstekend frontend voor MPlayer -Comment[pl]=Świetna nakładka na Mplayer -Comment[ru_RU]=Мощный интерфейс для MPlayer -Comment[uk]=Потужний інтерфейс до MPlayer -Exec=smplayer %f -GenericName=A great MPlayer front-end -GenericName[es]=A great MPlayer front-end -GenericName[it]=Un grande front-end per MPlayer -GenericName[ja]=MPlayer フロントエンド -GenericName[nl]=Een uitstekend frontend voor MPlayer -GenericName[pl]=Świetna nakładka na Mplayer -GenericName[ru_RU]=Мощный интерфейс для MPlayer -GenericName[uk]=Потужний інтерфейс до MPlayer -Icon=mplayer -MimeType=audio/ac3;audio/mp4;audio/mpeg;audio/vnd.rn-realaudio;audio/vorbis;audio/x-adpcm;audio/x-matroska;audio/x-mp2;audio/x-mp3;audio/x-ms-wma;audio/x-vorbis;audio/x-wav;audio/mpegurl;audio/x-mpegurl;audio/x-pn-realaudio;audio/x-scpls;video/avi;video/mp4;video/flv;video/mpeg;video/quicktime;video/vnd.rn-realvideo;video/x-matroska;video/x-ms-asf;video/x-msvideo;video/x-ms-wmv;video/x-ogm;video/x-theora -Name=SMPlayer -Type=Application -X-KDE-StartupNotify=false diff -r 9e247dfd5b85 -r 9a9d8eb38212 smplayer/stuff/smplayer_enqueue.desktop --- a/smplayer/stuff/smplayer_enqueue.desktop Sat Dec 10 09:51:54 2016 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -[Desktop Entry] -Categories=Qt;AudioVideo;Player;Video; -Exec=smplayer -add-to-playlist %F -Icon=mplayer -MimeType=audio/ac3;audio/mp4;audio/mpeg;audio/vnd.rn-realaudio;audio/vorbis;audio/x-adpcm;audio/x-matroska;audio/x-mp2;audio/x-mp3;audio/x-ms-wma;audio/x-vorbis;audio/x-wav;audio/mpegurl;audio/x-mpegurl;audio/x-pn-realaudio;audio/x-scpls;video/avi;video/mp4;video/flv;video/mpeg;video/quicktime;video/vnd.rn-realvideo;video/x-matroska;video/x-ms-asf;video/x-msvideo;video/x-ms-wmv;video/x-ogm;video/x-theora; -Name=Enqueue in SMPlayer -Name[zh_CN]=加入SMplayer的播放列表 -Name[es]=Añadir a la lista de reproducción de SMPlayer -Name[ja]=SMPlayer でエンキュー -Name[it]=In coda in SMPlayer -Name[nl]=In wachtrij van SMPlayer -Name[uk]=Додати до черги SMPlayer -Comment=Add file(s) to the SMPlayer playlist -Comment[es]=Añade ficheros a la lista de reproducción de SMPlayer -Comment[ja]=ファイルを SMPlayer のプレイリストに追加します -Comment[it]=Aggiungi alla lista di riproduzione di SMPlayer -Comment[nl]=Bestanden toevoegen aan de afspeellijst van SMPlayer -Comment[uk]=Додати файл(и) до переліку програвання SMPlayer -Type=Application -X-KDE-StartupNotify=false -NoDisplay=true diff -r 9e247dfd5b85 -r 9a9d8eb38212 smtube/receipt --- a/smtube/receipt Sat Dec 10 09:51:54 2016 +0000 +++ b/smtube/receipt Sat Dec 10 13:06:49 2016 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="smtube" -VERSION="15.5.17" +VERSION="16.7.2" CATEGORY="multimedia" SHORT_DESC="Qt Youtube browser using *mplayer or vlc." MAINTAINER="psychomaniak@xakep.ru" @@ -10,12 +10,14 @@ WEB_SITE="http://smtube.sourceforge.net/" WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" -DEPENDS="mplayer-opt libQtGui libQtXml libQtScript libQtWebkit cacerts" +DEPENDS="smplayer libQtGui libQtXml libQtScript libQtWebkit cacerts" BUILD_DEPENDS="wget qmake Qt4-dev" # Rules to configure and make the package. compile_rules() { + # Do not show/promote any video by default + sed 's|tonvid.com/|&terms-of-use.php|' -i src/browserwindow.cpp make PREFIX=/usr && make PREFIX=/usr DESTDIR=$DESTDIR install }