gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shotcut: 24.11.17 -> 25.01.25 (#378619)

Browse Source
This commit is contained in:
Wolfgang Walther
2025-02-09 17:03:37 +01:00
committed by GitHub
parent f348d95205 d1eb432ffc
commit 14dbb427a4
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/sh/shotcut/fix-mlt-ffmpeg-path.patch
+11 -11
View File
@@ -1,17 +1,17 @@
diff --git a/src/docks/encodedock.cpp b/src/docks/encodedock.cpp
index 3359f676..24e44f98 100644
index bba23d7..2d74f8c 100755
--- a/src/docks/encodedock.cpp
+++ b/src/docks/encodedock.cpp
@@ -2177,7 +2177,7 @@ bool EncodeDock::detectHardwareEncoders()
@@ -2570,7 +2570,7 @@ bool EncodeDock::detectHardwareEncoders()
{
MAIN.showStatusMessage(tr("Detecting hardware encoders..."));
QStringList hwlist;
- QFileInfo ffmpegPath(qApp->applicationDirPath(), "ffmpeg");
+ QFileInfo ffmpegPath("@ffmpeg@/bin/ffmpeg");
foreach (const QString &codec, codecs()) {
for (const QString &codec : codecs()) {
LOG_INFO() << "checking for" << codec;
QProcess proc;
@@ -2220,7 +2220,7 @@ bool EncodeDock::detectHardwareEncoders()
@@ -2617,7 +2617,7 @@ bool EncodeDock::detectHardwareEncoders()
QString &EncodeDock::defaultFormatExtension()
{
auto format = ui->formatCombo->currentText();
@@ -21,10 +21,10 @@ index 3359f676..24e44f98 100644
QStringList args;
args << "-hide_banner" << "-h" << format.prepend("muxer=");
diff --git a/src/jobs/ffmpegjob.cpp b/src/jobs/ffmpegjob.cpp
index 1f15e647..b6ad6633 100644
index fe390d3..39b847a 100644
--- a/src/jobs/ffmpegjob.cpp
+++ b/src/jobs/ffmpegjob.cpp
@@ -54,7 +54,7 @@ FfmpegJob::~FfmpegJob()
@@ -55,7 +55,7 @@ FfmpegJob::~FfmpegJob()
void FfmpegJob::start()
{
QString shotcutPath = qApp->applicationDirPath();
@@ -34,10 +34,10 @@ index 1f15e647..b6ad6633 100644
LOG_DEBUG() << ffmpegPath.absoluteFilePath() + " " + m_args.join(' ');
AbstractJob::start(ffmpegPath.absoluteFilePath(), m_args);
diff --git a/src/jobs/meltjob.cpp b/src/jobs/meltjob.cpp
index fd8c00b8..9150fe7b 100644
index 019f693..15b8969 100644
--- a/src/jobs/meltjob.cpp
+++ b/src/jobs/meltjob.cpp
@@ -98,9 +98,9 @@ void MeltJob::start()
@@ -115,9 +115,9 @@ void MeltJob::start()
}
QString shotcutPath = qApp->applicationDirPath();
#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
@@ -50,10 +50,10 @@ index fd8c00b8..9150fe7b 100644
setReadChannel(QProcess::StandardError);
QStringList args;
diff --git a/src/mltcontroller.cpp b/src/mltcontroller.cpp
index 1e2299ac..b8f39f12 100644
index 3d3b070..f57cfd1 100644
--- a/src/mltcontroller.cpp
+++ b/src/mltcontroller.cpp
@@ -1555,9 +1555,9 @@ int Controller::checkFile(const QString &path)
@@ -1668,9 +1668,9 @@ int Controller::checkFile(const QString &path)
|| path.endsWith(".aep")) {
QString shotcutPath = qApp->applicationDirPath();
#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
@@ -66,7 +66,7 @@ index 1e2299ac..b8f39f12 100644
QStringList args;
args << "-quiet" << "-consumer" << "null" << "real_time=0" << "out=0" << "terminate_on_pause=1" <<
diff --git a/src/widgets/directshowvideowidget.cpp b/src/widgets/directshowvideowidget.cpp
index c91ba821..73dd5a61 100644
index a636a22..7a7b068 100644
--- a/src/widgets/directshowvideowidget.cpp
+++ b/src/widgets/directshowvideowidget.cpp
@@ -35,7 +35,7 @@ DirectShowVideoWidget::DirectShowVideoWidget(QWidget *parent) :
pkgs/by-name/sh/shotcut/package.nix
+3 -2
View File
@@ -17,15 +17,16 @@
gitUpdater,
ffmpeg,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "shotcut";
version = "24.11.17";
version = "25.01.25";
src = fetchFromGitHub {
owner = "mltframework";
repo = "shotcut";
tag = "v${finalAttrs.version}";
hash = "sha256-sOBGLQYRGHcXNoKTmqbBqmheUFHe7p696BTCiwtF5JY=";
hash = "sha256-YrnmhxD7Yf2LgdEaBU4mmRdvZdO6VQ6IAb4s+V9QvLM=";
};
nativeBuildInputs = [