vokoscreen: 2.5.0 -> 2.5.8-beta (#62144)

vokoscreen: 2.5.0 -> 2.5.8-beta

2 files changed, 20 insertions, 22 deletions

diff --git a/pkgs/applications/video/vokoscreen/default.nix b/pkgs/applications/video/vokoscreen/default.nix
index 67905033ba10..e609c1cd3395 100644
--- a/pkgs/applications/video/vokoscreen/default.nix
+++ b/pkgs/applications/video/vokoscreen/default.nix
@@ -1,14 +1,18 @@
-{ stdenv, fetchgit
-, pkgconfig, qtbase, qttools, qmake, qtx11extras, alsaLib, libv4l, libXrandr
+{ stdenv, fetchFromGitHub
+, pkgconfig, qtbase, qttools, qmake, qtmultimedia, qtx11extras, alsaLib, libv4l, libXrandr
 , ffmpeg
 }:
 
-stdenv.mkDerivation {
-  name = "vokoscreen-2.5.0";
-  src = fetchgit {
-    url = "https://github.com/vkohaupt/vokoscreen.git";
-    rev = "8325c8658d6e777d34d2e6b8c8bc03f8da9b3d2f";
-    sha256 = "1hvw7xz1mj16ishbaip73wddbmgibsz0pad4y586zbarpynss25z";
+stdenv.mkDerivation rec {
+
+  pname = "vokoscreen";
+  version = "2.5.8-beta";
+
+  src = fetchFromGitHub {
+    owner   = "vkohaupt";
+    repo    = "vokoscreen";
+    rev     = version;
+    sha256  = "1a85vbsi53mhzva49smqwcs61c51wv3ic410nvb9is9nlsbifwan";
   };
 
   nativeBuildInputs = [ pkgconfig qmake ];
@@ -16,6 +20,7 @@ stdenv.mkDerivation {
     alsaLib
     libv4l
     qtbase
+    qtmultimedia
     qttools
     qtx11extras
     libXrandr
@@ -35,14 +40,14 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Simple GUI screencast recorder, using ffmpeg";
-    homepage = http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html;
+    homepage = "http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html";
     longDescription = ''
       vokoscreen is an easy to use screencast creator to record
       educational videos, live recordings of browser, installation,
       videoconferences, etc.
     '';
     license = licenses.gpl2Plus;
-    maintainers = [maintainers.league];
+    maintainers = [ maintainers.league ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch b/pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch
index 8f696f263013..afcee3f9715f 100644
--- a/pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch
+++ b/pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch
@@ -1,20 +1,20 @@
 diff --git a/settings/QvkSettings.cpp b/settings/QvkSettings.cpp
-index bbf2abf..187efad 100644
+index 3008e62..07485bd 100644
 --- a/settings/QvkSettings.cpp
 +++ b/settings/QvkSettings.cpp
-@@ -56,17 +56,8 @@ void QvkSettings::readAll()
-       GIFPlayer = settings.value( "GIFplayer" ).toString();
+@@ -66,17 +66,8 @@ void QvkSettings::readAll()
        Minimized = settings.value( "Minimized", 0 ).toUInt();
+       MinimizedByStart = settings.value( "MinimizedByStart", 0 ).toUInt();
        Countdown = settings.value( "Countdown", 0 ).toUInt();
 -      QFile file;
 -      if ( file.exists( qApp->applicationDirPath().append( "/bin/ffmpeg" ) ) == true )
 -      {
--	vokoscreenWithLibs = true;
+-        vokoscreenWithLibs = true;
 -        Recorder = qApp->applicationDirPath().append( "/bin/ffmpeg" );
 -      }
 -      else
 -      {
--	vokoscreenWithLibs = false;
+-        vokoscreenWithLibs = false;
 -        Recorder = settings.value( "Recorder", "ffmpeg" ).toString();
 -      }
 +      vokoscreenWithLibs = true;
@@ -22,10 +22,3 @@ index bbf2abf..187efad 100644
      settings.endGroup();
      
      settings.beginGroup( "Videooptions" );
-@@ -398,4 +389,4 @@ double QvkSettings::getShowClickTime()
- int QvkSettings::getShowKeyOnOff()
- {
-   return showKeyOnOff; 
--}
-\ No newline at end of file
-+}