Accepting request 202993 from home:Kieltux:branches:multimedia:apps

- Update to minitube 2.1.3 - Included a inhibit screensaver patch during playback - Included a patch to enable video download again. This feature is gone in minitube >= 2.1.2, because of a request from the Youtube legal team. This patch is disabled in the spec file (patch #2). OBS-URL: https://build.opensuse.org/request/show/202993 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/minitube?expand=0&rev=10
2013-10-12 09:52:53 +00:00
parent cf8e33ad5f
commit e9e9e80272
6 changed files with 104 additions and 8 deletions
--- a/enable_vid_download_again.patch
+++ b/enable_vid_download_again.patch
@@ -0,0 +1,10 @@
+--- minitube.pro.orig	2013-09-06 16:22:58.000000000 +0200
+++ minitube.pro	2013-10-11 17:04:46.794004254 +0200
+@@ -12,6 +12,7 @@
+ DEFINES *= QT_NO_DEBUG_OUTPUT
+ DEFINES *= QT_USE_QSTRINGBUILDER
+ DEFINES += QT_STRICT_ITERATORS
+DEFINES += APP_DOWNLOADS
+ 
+ TARGET = minitube
+ QT += network xml phonon sql script
--- a/inhibit_screensaver_during_playback.patch
+++ b/inhibit_screensaver_during_playback.patch
@@ -0,0 +1,58 @@
+--- src/mainwindow.cpp.orig	2013-09-06 16:22:58.000000000 +0200
+++ src/mainwindow.cpp	2013-10-11 16:22:09.078721507 +0200
+@@ -52,6 +52,7 @@
+ #else
+ #include "searchlineedit.h"
+ #endif
+#include <QProcess>
+ #include <iostream>
+ #ifdef APP_EXTRA
+ #include "extra.h"
+@@ -1034,11 +1035,13 @@
+         pauseAct->setIcon(Utils::icon("media-playback-pause"));
+         pauseAct->setText(tr("&Pause"));
+         pauseAct->setStatusTip(tr("Pause playback") + " (" +  pauseAct->shortcut().toString(QKeySequence::NativeText) + ")");
+        inhibitScreensaver(new QString("suspend"));
+         // stopAct->setEnabled(true);
+         break;
+ 
+     case Phonon::StoppedState:
+         pauseAct->setEnabled(false);
+        inhibitScreensaver(new QString("resume"));
+         // stopAct->setEnabled(false);
+         break;
+ 
+@@ -1047,6 +1050,7 @@
+         pauseAct->setIcon(Utils::icon("media-playback-start"));
+         pauseAct->setText(tr("&Play"));
+         pauseAct->setStatusTip(tr("Resume playback") + " (" +  pauseAct->shortcut().toString(QKeySequence::NativeText) + ")");
+        inhibitScreensaver(new QString("resume"));
+         // stopAct->setEnabled(true);
+         break;
+ 
+@@ -1063,6 +1067,14 @@
+     }
+ }
+ 
+void MainWindow::inhibitScreensaver(QString *action) {
+    QStringList arguments;
+    QString s = QString::number(winId());
+    arguments << *action << s;
+    QProcess *screensaver = new QProcess();
+    screensaver->start("xdg-screensaver", arguments);
+}
+
+ void MainWindow::stop() {
+     mediaView->stop();
+     showHome();
+--- src/mainwindow.h.orig	2013-09-06 16:22:58.000000000 +0200
+++ src/mainwindow.h	2013-10-11 16:23:38.412274795 +0200
+@@ -103,7 +103,7 @@
+     void setDefinitionMode(QString definitionName);
+     void toggleDefinitionMode();
+     void clearRecentKeywords();
+-
+    void inhibitScreensaver(QString *action);
+     // volume shortcuts
+     void volumeUp();
+     void volumeDown();
--- a/minitube-2.0.tar.gz
+++ b/minitube-2.0.tar.gz
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1ba1dd7725e6e0c92653fdee7bcfa4b833346d2ef4c091d94b181b60bb592554
-size 713577
--- a/minitube-2.1.3.tar.gz
+++ b/minitube-2.1.3.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8050634d21d09fad52cd0f2aff378acd2f841007c997ace80eb903742d4634a9
+size 846554
--- a/minitube.changes
+++ b/minitube.changes
@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Fri Oct 11 15:23:00 UTC 2013 - kieltux@gmail.com
+
+  * included patch to inihibt screensaver during playback from
+    https://launchpadlibrarian.net/105980691/inhibit-screensaver-during-playback
+
+- update to 2.1.3
+  * Downloads only enabled on Creative Commons licensed videos
+  * Fixed playback of some videos
+  * Fixed VEVO videos playback
+  * Fixed Ubuntu skin not being used
+  * Channel subscriptions
+  * Move window by dragging from inside the video area
+  * Faster startup
+  * Optimizations and tweaks to the playlist
+  * Float on top icon was missing on Mac & Windows
+  * Compact mode window fixed aspect ratio on Mac
+  * Ubuntu notifications
+  * Fixed skipping to the next video
+  * Fixed compact mode video cropped with very small window
+  * Fixed long words or URLs in the video description causing a window resize
+  * Fixed crash when resizing the playlist to a very small width
+
 -------------------------------------------------------------------
 Wed Feb 27 13:35:30 UTC 2013 - mvyskocil@opensuse.org

--- a/minitube.spec
+++ b/minitube.spec
@@ -16,14 +16,18 @@
 #

 Name:           minitube
-Version:        2.0
-Release:        1
+Version:        2.1.3
+Release:        1.1
 License:        GPL-3.0+
 Summary:        Native Youtube Client
 Url:            http://flavio.tordini.org/minitube
 Group:          Productivity/Multimedia/Video/Players
 Source:         http://flavio.tordini.org/files/minitube/%{name}-%{version}.tar.gz
 Patch0:         qtlocalpeer.patch
+# https://launchpadlibrarian.net/105980691/inhibit-screensaver-during-playback
+Patch1:         inhibit_screensaver_during_playback.patch
+# YouTube Legal Team asked to remove the download functionality
+Patch2:         enable_vid_download_again.patch
 BuildRequires:  libqt4-devel >= 4.5.0
 BuildRequires:  phonon-devel
 BuildRequires:  update-desktop-files
@@ -46,6 +50,9 @@ Author:
 %prep
 %setup -q -n minitube
 %patch0
+%patch1
+# enable this patch to enable video downloads
+#%patch2

 %build
 qmake PREFIX=%{_prefix}
@@ -65,6 +72,4 @@ rm -rf %{buildroot}
 %{_datadir}/applications/minitube.desktop
 %{_datadir}/icons/*
 %dir %{_datadir}/minitube
-%{_datadir}/minitube/locale/
-
-%changelog
+%{_datadir}/minitube/locale/