diff --git a/multimedia/video/smplayer/actions.py b/multimedia/video/smplayer/actions.py index 80b81dc39d..629fe5bb01 100644 --- a/multimedia/video/smplayer/actions.py +++ b/multimedia/video/smplayer/actions.py @@ -12,41 +12,25 @@ from pisi.actionsapi import get def setup(): pisitools.dosed("Makefile", "^DOC_PATH=.*$", "DOC_PATH=$(PREFIX)/share/doc/smplayer") + pisitools.dosed("Makefile", "PREFIX=/usr/local", "PREFIX=/usr") def build(): autotools.make("PREFIX=/usr QMAKE=/usr/bin/qmake -j1 LRELEASE=/usr/bin/lrelease") shelltools.cd("smplayer-skins-15.2.0") autotools.make("PREFIX=/usr") + + shelltools.cd("..") + shelltools.cd("smplayer-themes-18.6.0") + autotools.make("PREFIX=/usr") def install(): autotools.rawInstall("PREFIX=/usr DESTDIR=%s DOC_PATH=/usr/share/doc/%s" % (get.installDIR(),get.srcNAME())) - - pisitools.copytree("../smplayer-themes-18.6.0/themes/blackPanther-Light", "%s/usr/share/smplayer/themes/blackPanther-Light" % get.installDIR()) - pisitools.copytree("../smplayer-themes-18.6.0/themes/blackPanther-Real", "%s/usr/share/smplayer/themes/blackPanther-Real" % get.installDIR()) - pisitools.copytree("../smplayer-themes-18.6.0/themes/blackPanther-VistaLike", "%s/usr/share/smplayer/themes/blackPanther-VistaLike" % get.installDIR()) - pisitools.copytree("../smplayer-themes-18.6.0/themes/Breeze", "%s/usr/share/smplayer/themes/Breeze" % get.installDIR()) - pisitools.copytree("../smplayer-themes-18.6.0/themes/Breeze-dark", "%s/usr/share/smplayer/themes/Breeze-dark" % get.installDIR()) - pisitools.copytree("../smplayer-themes-18.6.0/themes/ePapirus", "%s/usr/share/smplayer/themes/ePapirus" % get.installDIR()) - pisitools.copytree("../smplayer-themes-18.6.0/themes/Faenza", "%s/usr/share/smplayer/themes/Faenza" % get.installDIR()) - pisitools.copytree("../smplayer-themes-18.6.0/themes/Faenza-Darkest", "%s/usr/share/smplayer/themes/Faenza-Darkest" % get.installDIR()) - pisitools.copytree("../smplayer-themes-18.6.0/themes/Faenza-Silver", "%s/usr/share/smplayer/themes/Faenza-Silver" % get.installDIR()) - pisitools.copytree("../smplayer-themes-18.6.0/themes/Gartoon", "%s/usr/share/smplayer/themes/Gartoon" % get.installDIR()) - pisitools.copytree("../smplayer-themes-18.6.0/themes/Gnome", "%s/usr/share/smplayer/themes/Gnome" % get.installDIR()) - pisitools.copytree("../smplayer-themes-18.6.0/themes/Masalla", "%s/usr/share/smplayer/themes/Masalla" % get.installDIR()) - pisitools.copytree("../smplayer-themes-18.6.0/themes/Monochrome", "%s/usr/share/smplayer/themes/Monochrome" % get.installDIR()) - pisitools.copytree("../smplayer-themes-18.6.0/themes/Noia", "%s/usr/share/smplayer/themes/Noia" % get.installDIR()) - pisitools.copytree("../smplayer-themes-18.6.0/themes/Numix-remix", "%s/usr/share/smplayer/themes/Numix-remix" % get.installDIR()) - pisitools.copytree("../smplayer-themes-18.6.0/themes/Numix-uTouch", "%s/usr/share/smplayer/themes/Numix-uTouch" % get.installDIR()) - pisitools.copytree("../smplayer-themes-18.6.0/themes/Nuvola", "%s/usr/share/smplayer/themes/Nuvola" % get.installDIR()) - pisitools.copytree("../smplayer-themes-18.6.0/themes/Oxygen", "%s/usr/share/smplayer/themes/Oxygen" % get.installDIR()) - pisitools.copytree("../smplayer-themes-18.6.0/themes/Oxygen-Air", "%s/usr/share/smplayer/themes/Oxygen-Air" % get.installDIR()) - pisitools.copytree("../smplayer-themes-18.6.0/themes/Oxygen-Air", "%s/usr/share/smplayer/themes/Oxygen-KDE" % get.installDIR()) - pisitools.copytree("../smplayer-themes-18.6.0/themes/Oxygen-Refit", "%s/usr/share/smplayer/themes/Oxygen-Refit" % get.installDIR()) - pisitools.copytree("../smplayer-themes-18.6.0/themes/Papirus", "%s/usr/share/smplayer/themes/Papirus" % get.installDIR()) - pisitools.copytree("../smplayer-themes-18.6.0/themes/PapirusDark", "%s/usr/share/smplayer/themes/PapirusDark" % get.installDIR()) - pisitools.copytree("../smplayer-themes-18.6.0/themes/Silk", "%s/usr/share/smplayer/themes/Silk" % get.installDIR()) - pisitools.copytree("../smplayer-themes-18.6.0/themes/Tango", "%s/usr/share/smplayer/themes/Tango" % get.installDIR()) shelltools.cd("smplayer-skins-15.2.0") autotools.rawInstall("DESTDIR=%s PREFIX=/usr install" % get.installDIR()) + + shelltools.cd("..") + shelltools.cd("smplayer-themes-18.6.0") + autotools.rawInstall("DESTDIR=%s PREFIX=/usr install" % get.installDIR()) + diff --git a/multimedia/video/smplayer/files/Fix_control_problem_with_mpv-0.30.patch b/multimedia/video/smplayer/files/Fix_control_problem_with_mpv-0.30.patch new file mode 100644 index 0000000000..e67d9cc92b --- /dev/null +++ b/multimedia/video/smplayer/files/Fix_control_problem_with_mpv-0.30.patch @@ -0,0 +1,36 @@ +Index: src/mpvprocess.cpp +=================================================================== +--- src/mpvprocess.cpp (revision 9231) ++++ src/mpvprocess.cpp (revision 9232) +@@ -122,7 +122,7 @@ + + void MPVProcess::initializeRX() { + #ifdef CUSTOM_STATUS +- rx_av.setPattern("^STATUS: ([0-9\\.-]+) / ([0-9\\.-]+) P: (yes|no) B: (yes|no) I: (yes|no) VB: ([0-9\\.-]+) AB: ([0-9\\.-]+)"); ++ rx_av.setPattern("STATUS: ([0-9\\.-]+) / ([0-9\\.-]+) P: (yes|no) B: (yes|no) I: (yes|no) VB: ([0-9\\.-]+) AB: ([0-9\\.-]+)"); + #else + rx_av.setPattern("^(\\((.*)\\) |)(AV|V|A): ([0-9]+):([0-9]+):([0-9]+) / ([0-9]+):([0-9]+):([0-9]+)"); //AV: 00:02:15 / 00:09:56 + #endif +@@ -197,7 +197,7 @@ + static double last_sec = -1; + + // Parse A: V: line +- //qDebug("MPVProcess::parseLine: %s", line.toUtf8().data()); ++ //qDebug() << "MPVProcess::parseLine:" << line; + if (rx_av.indexIn(line) > -1) { + #ifdef CUSTOM_STATUS + double sec = rx_av.cap(1).toDouble(); +Index: src/mpvoptions.cpp +=================================================================== +--- src/mpvoptions.cpp (revision 9233) ++++ src/mpvoptions.cpp (revision 9234) +@@ -63,7 +63,8 @@ + arg << "--term-playing-msg=" + "MPV_VERSION=${=mpv-version:}\n" + "INFO_VIDEO_WIDTH=${=width}\nINFO_VIDEO_HEIGHT=${=height}\n" +- "INFO_VIDEO_ASPECT=${=video-aspect}\n" ++// "INFO_VIDEO_ASPECT=${=video-aspect}\n" // old ++ "INFO_VIDEO_ASPECT=${=video-params/aspect}\n" + // "INFO_VIDEO_DSIZE=${=dwidth}x${=dheight}\n" + "INFO_VIDEO_FPS=${=container-fps:${=fps}}\n" + // "INFO_VIDEO_BITRATE=${=video-bitrate}\n" diff --git a/multimedia/video/smplayer/pspec.xml b/multimedia/video/smplayer/pspec.xml index 22ed13e165..f4afb32294 100644 --- a/multimedia/video/smplayer/pspec.xml +++ b/multimedia/video/smplayer/pspec.xml @@ -14,15 +14,19 @@ A complete front-end for MPlayer smplayer is Qt application which intends to be a complete front-end for MPlayer, from basic features like playing videos, DVDs, and VCDs to more advanced features like support for MPlayer filters and more. https://sourceforge.net/projects/smplayer/files/SMPlayer/19.5.0/smplayer-19.5.0.tar.bz2 - https://sourceforge.net/projects/smplayer/files/SMPlayer-themes/18.6.0/smplayer-themes-18.6.0.tar.bz2 + https://sourceforge.net/projects/smplayer/files/SMPlayer-themes/18.6.0/smplayer-themes-18.6.0.tar.bz2 http://sourceforge.net/projects/smplayer/files/SMPlayer-skins/15.2.0/smplayer-skins-15.2.0.tar.bz2 - qt5-base-devel - qt5-script-devel - libxkbcommon-devel zlib-devel qt5-linguist + qt5-base-devel + qt5-script-devel + qt5-assistant-devel + libxkbcommon-devel + + Fix_control_problem_with_mpv-0.30.patch + @@ -47,6 +51,13 @@ + + 2019-10-28 + 19.5.0 + Rebuild. + Mustafa Cinasal + muscnsl@gmail.com + 2019-06-03 19.5.0