linuxstopmotion: 0.8.0 -> 0.8.5

and qt4 -> qt5
This commit is contained in:
ajs124 2020-10-30 16:33:10 +01:00 committed by Bjørn Forsman
parent 3a12f8588a
commit 0126c86672
3 changed files with 14 additions and 53 deletions

View File

@ -1,32 +1,26 @@
{ stdenv, fetchgit, pkgconfig, qt4, SDL, SDL_image, libvorbis, libtar, libxml2
, gamin, qmake4Hook
}:
{ mkDerivation, lib, fetchgit, pkgconfig, qmake, qtbase, qttools, qtmultimedia, libvorbis, libtar, libxml2 }:
stdenv.mkDerivation rec {
version = "0.8";
mkDerivation rec {
version = "0.8.5";
pname = "linuxstopmotion";
src = fetchgit {
url = "git://git.code.sf.net/p/linuxstopmotion/code";
rev = "refs/tags/${version}";
sha256 = "19v9d0v3laiwi0f1n92lvj2s5s1mxsrfygna0xyw9pkcnk3b26q6";
url = "https://git.code.sf.net/p/linuxstopmotion/code";
rev = version;
sha256 = "1612lkwsfzc59wvdj2zbj5cwsyw66bwn31jrzjrxvygxdh4ab069";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ qt4 SDL SDL_image libvorbis libtar libxml2 gamin qmake4Hook ];
nativeBuildInputs = [ qmake pkgconfig ];
buildInputs = [ qtbase qttools qtmultimedia libvorbis libtar libxml2 ];
patches = [ ./linuxstopmotion-fix-wrong-isProcess-logic.patch ];
# Installation breaks without this
preInstall = ''
mkdir -p "$out/share/stopmotion/translations/"
cp -v build/*.qm "$out/share/stopmotion/translations/"
postPatch = ''
substituteInPlace stopmotion.pro --replace '$$[QT_INSTALL_BINS]' '${lib.getDev qttools}/bin'
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Create stop-motion animation movies";
homepage = "http://linuxstopmotion.org/";
license = licenses.gpl2;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};

View File

@ -1,33 +0,0 @@
From b23b7dab1d540b0710fcb9ded1c6256a49844906 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 20 Aug 2014 22:22:00 +0200
Subject: [PATCH] Fix wrong "isProcess" logic
Stopmotion wrongly thinks that uvccapture should be run as a daemon,
even though configuration for uvccapture has no "daemon-like" command
line to be run (according to "preferences"). The result is an error
popup instead of video/image grabbing.
This brings back the "isProcess" logic that was in stopmotion v0.7.2,
because it seems to work, while the current logic (v0.8.0) seems to
fail.
---
src/presentation/frontends/qtfrontend/frameview.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/presentation/frontends/qtfrontend/frameview.cpp b/src/presentation/frontends/qtfrontend/frameview.cpp
index e44dca7..d2c41fd 100644
--- a/src/presentation/frontends/qtfrontend/frameview.cpp
+++ b/src/presentation/frontends/qtfrontend/frameview.cpp
@@ -270,7 +270,7 @@ bool FrameView::on() {
Preference device(QString("device%1")
.arg(activeDev).toLatin1().constData(), "");
QString pre = QString(prepoll.get()).replace("$VIDEODEVICE", device.get());
- bool isProcess = startDaemon.get();
+ bool isProcess = (strcmp(startDaemon.get(), "") == 0) ? false : true;
bool isCameraReady = true;
this->grabber = new CommandLineGrabber(capturedFile.path(), isProcess);
--
2.0.2

View File

@ -23403,7 +23403,7 @@ in
stella = callPackage ../misc/emulators/stella { };
linuxstopmotion = callPackage ../applications/video/linuxstopmotion { };
linuxstopmotion = libsForQt5.callPackage ../applications/video/linuxstopmotion { };
sweethome3d = recurseIntoAttrs ( (callPackage ../applications/misc/sweethome3d {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731