Merge pull request #4471 from vbgl/smplayer

Updates SMPlayer to 14.9.0 and adds SMTube

pkgs/applications/video/smplayer/basegui.cpp.patch

@@ -0,0 +1,11 @@
+--- a/src/basegui.cpp	2014-08-20 01:04:51.000000000 +0100
++++ b/src/basegui.cpp	2014-10-11 10:25:57.561983556 +0100
+@@ -5235,7 +5235,7 @@
+ #ifdef YOUTUBE_SUPPORT
+ void BaseGui::showTubeBrowser() {
+ 	qDebug("BaseGui::showTubeBrowser");
+-	QString exec = Paths::appPath() + "/smtube";
++	QString exec = "smtube";
+ 	qDebug("BaseGui::showTubeBrowser: '%s'", exec.toUtf8().constData());
+ 	if (!QProcess::startDetached(exec, QStringList())) {
+ 		QMessageBox::warning(this, "SMPlayer",

pkgs/applications/video/smplayer/default.nix

@@ -1,13 +1,15 @@
 { stdenv, fetchurl, qt4 }:
 
 stdenv.mkDerivation rec {
-  name = "smplayer-14.3.0";
+  name = "smplayer-14.9.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/smplayer/${name}.tar.bz2";
-    sha256 = "9b8db20043d1528ee5c6054526779e88a172d2c757429bd7095c794d65ecbc18";
+    sha256 = "04yzgmdj9hm9v7ln49zm2aa1r9mm9q12pym4bvfww7yzsvnx96j2";
   };
 
+  patches = [ ./basegui.cpp.patch ];
+
   buildInputs = [ qt4 ];
 
   preConfigure = ''

pkgs/applications/video/smtube/default.nix

@@ -0,0 +1,23 @@
+{stdenv, fetchurl, qt4}:
+
+stdenv.mkDerivation {
+  name = "smtube-14.8.0";
+  src = fetchurl {
+    url = mirror://sourceforge/smplayer/smtube-14.8.0.tar.bz2;
+    sha256 = "0h0kw4dvdj9sbxp0p6bdib9y8i7854f45lsmrdkykzk6rmgrf1cw";
+  };
+
+  buildInputs = [qt4];
+
+  preConfigure = ''
+    makeFlags="PREFIX=$out"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Play and download Youtube videos";
+    homepage = http://smplayer.sourceforge.net/smtube.php;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ vbgl ];
+    platforms = platforms.linux;
+  };
+}

pkgs/top-level/all-packages.nix

@@ -9871,6 +9871,8 @@ let
 
   smplayer = callPackage ../applications/video/smplayer { };
 
+  smtube = callPackage ../applications/video/smtube {};
+
   sup = with rubyLibs; callPackage ../applications/networking/mailreaders/sup {
     ruby = ruby_1_9_3.override {
       cursesSupport = true;