pyrox.dev
shotcut: 24.11.17 -> 25.01.25
+11
-11
pkgs/by-name/sh/shotcut/fix-mlt-ffmpeg-path.patch
+11
-11
pkgs/by-name/sh/shotcut/fix-mlt-ffmpeg-path.patch
···
1
1
diff --git a/src/docks/encodedock.cpp b/src/docks/encodedock.cpp
2
-
index 3359f676..24e44f98 100644
2
+
index bba23d7..2d74f8c 100755
3
3
--- a/src/docks/encodedock.cpp
4
4
+++ b/src/docks/encodedock.cpp
5
-
@@ -2177,7 +2177,7 @@ bool EncodeDock::detectHardwareEncoders()
5
+
@@ -2570,7 +2570,7 @@ bool EncodeDock::detectHardwareEncoders()
6
6
{
7
7
MAIN.showStatusMessage(tr("Detecting hardware encoders..."));
8
8
QStringList hwlist;
9
9
- QFileInfo ffmpegPath(qApp->applicationDirPath(), "ffmpeg");
10
10
+ QFileInfo ffmpegPath("@ffmpeg@/bin/ffmpeg");
11
-
foreach (const QString &codec, codecs()) {
11
+
for (const QString &codec : codecs()) {
12
12
LOG_INFO() << "checking for" << codec;
13
13
QProcess proc;
14
-
@@ -2220,7 +2220,7 @@ bool EncodeDock::detectHardwareEncoders()
14
+
@@ -2617,7 +2617,7 @@ bool EncodeDock::detectHardwareEncoders()
15
15
QString &EncodeDock::defaultFormatExtension()
16
16
{
17
17
auto format = ui->formatCombo->currentText();
···
21
21
QStringList args;
22
22
args << "-hide_banner" << "-h" << format.prepend("muxer=");
23
23
diff --git a/src/jobs/ffmpegjob.cpp b/src/jobs/ffmpegjob.cpp
24
-
index 1f15e647..b6ad6633 100644
24
+
index fe390d3..39b847a 100644
25
25
--- a/src/jobs/ffmpegjob.cpp
26
26
+++ b/src/jobs/ffmpegjob.cpp
27
-
@@ -54,7 +54,7 @@ FfmpegJob::~FfmpegJob()
27
+
@@ -55,7 +55,7 @@ FfmpegJob::~FfmpegJob()
28
28
void FfmpegJob::start()
29
29
{
30
30
QString shotcutPath = qApp->applicationDirPath();
···
34
34
LOG_DEBUG() << ffmpegPath.absoluteFilePath() + " " + m_args.join(' ');
35
35
AbstractJob::start(ffmpegPath.absoluteFilePath(), m_args);
36
36
diff --git a/src/jobs/meltjob.cpp b/src/jobs/meltjob.cpp
37
-
index fd8c00b8..9150fe7b 100644
37
+
index 019f693..15b8969 100644
38
38
--- a/src/jobs/meltjob.cpp
39
39
+++ b/src/jobs/meltjob.cpp
40
-
@@ -98,9 +98,9 @@ void MeltJob::start()
40
+
@@ -115,9 +115,9 @@ void MeltJob::start()
41
41
}
42
42
QString shotcutPath = qApp->applicationDirPath();
43
43
#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
···
50
50
setReadChannel(QProcess::StandardError);
51
51
QStringList args;
52
52
diff --git a/src/mltcontroller.cpp b/src/mltcontroller.cpp
53
-
index 1e2299ac..b8f39f12 100644
53
+
index 3d3b070..f57cfd1 100644
54
54
--- a/src/mltcontroller.cpp
55
55
+++ b/src/mltcontroller.cpp
56
-
@@ -1555,9 +1555,9 @@ int Controller::checkFile(const QString &path)
56
+
@@ -1668,9 +1668,9 @@ int Controller::checkFile(const QString &path)
57
57
|| path.endsWith(".aep")) {
58
58
QString shotcutPath = qApp->applicationDirPath();
59
59
#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
···
66
66
QStringList args;
67
67
args << "-quiet" << "-consumer" << "null" << "real_time=0" << "out=0" << "terminate_on_pause=1" <<
68
68
diff --git a/src/widgets/directshowvideowidget.cpp b/src/widgets/directshowvideowidget.cpp
69
-
index c91ba821..73dd5a61 100644
69
+
index a636a22..7a7b068 100644
70
70
--- a/src/widgets/directshowvideowidget.cpp
71
71
+++ b/src/widgets/directshowvideowidget.cpp
72
72
@@ -35,7 +35,7 @@ DirectShowVideoWidget::DirectShowVideoWidget(QWidget *parent) :
+3
-2
pkgs/by-name/sh/shotcut/package.nix
+3
-2
pkgs/by-name/sh/shotcut/package.nix
···
17
17
gitUpdater,
18
18
ffmpeg,
19
19
}:
20
+
20
21
stdenv.mkDerivation (finalAttrs: {
21
22
pname = "shotcut";
22
-
version = "24.11.17";
23
+
version = "25.01.25";
23
24
24
25
src = fetchFromGitHub {
25
26
owner = "mltframework";
26
27
repo = "shotcut";
27
28
tag = "v${finalAttrs.version}";
28
-
hash = "sha256-sOBGLQYRGHcXNoKTmqbBqmheUFHe7p696BTCiwtF5JY=";
29
+
hash = "sha256-YrnmhxD7Yf2LgdEaBU4mmRdvZdO6VQ6IAb4s+V9QvLM=";
29
30
};
30
31
31
32
nativeBuildInputs = [