summary refs log tree commit diff
path: root/pkgs/applications/video/kdenlive/kdenlive-newmlt.patch
blob: b3a772a7ac6e19f65921edfad16d5532fbe08873 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
From http://kdenlive.org/forum/cant-start-kdnlive-sdl-module-missing-mlt

Kdenlive 0.8 tries to detect mlt by reading from stderr, but between
mlt 0.7.2 and 0.7.4 mlt this has changed from stderr to stdout.
===================================================================
--- kdenlive-0.8/src.orig/wizard.cpp	2011-04-26 21:44:22.000000000 +0200
+++ kdenlive-0.8/src/wizard.cpp	2011-07-21 18:22:18.470831892 +0200
@@ -214,7 +214,7 @@
         button(QWizard::NextButton)->setEnabled(false);
     } else {
         checkProcess.waitForFinished();
-        QByteArray result = checkProcess.readAllStandardError();
+        QByteArray result = checkProcess.readAllStandardOutput();

         // Check MLT avformat module
         QTreeWidgetItem *avformatItem = new QTreeWidgetItem(m_mltCheck.programList, QStringList() << QString() << i18n("Avformat module (FFmpeg)"));
@@ -246,7 +246,7 @@
                     kDebug() << "// Error querying MLT's version";
                 } else {
                     checkProcess.waitForFinished();
-                    mltVersion = checkProcess.readAllStandardError();
+                    mltVersion = checkProcess.readAllStandardOutput();
                     mltVersion = mltVersion.section('\n', 0, 0).simplified();
                     mltVersion = mltVersion.section(' ', -1).simplified();
                     version = 1000 * mltVersion.section('.', 0, 0).toInt() + 100 * mltVersion.section('.', 1, 1).toInt() + mltVersion.section('.', 2, 2).toInt();
@@ -275,7 +275,7 @@
                     kDebug() << "// Error parsing MLT's avformat codecs";
                 } else {
                     checkProcess2.waitForFinished();
-                    QByteArray codecList = checkProcess2.readAllStandardError();
+                    QByteArray codecList = checkProcess2.readAllStandardOutput();
                     QString acodecList(codecList);
                     QStringList result;
                     QStringList alist = acodecList.split('\n', QString::SkipEmptyParts);
@@ -292,7 +292,7 @@
                     kDebug() << "// Error parsing MLT's avformat codecs";
                 } else {
                     checkProcess2.waitForFinished();
-                    QByteArray codecList = checkProcess2.readAllStandardError();
+                    QByteArray codecList = checkProcess2.readAllStandardOutput();
                     QString vcodecList(codecList);
                     QStringList result;
                     QStringList vlist = vcodecList.split('\n', QString::SkipEmptyParts);
@@ -309,7 +309,7 @@
                     kDebug() << "// Error parsing MLT's avformat codecs";
                 } else {
                     checkProcess2.waitForFinished();
-                    QByteArray codecList = checkProcess2.readAllStandardError();
+                    QByteArray codecList = checkProcess2.readAllStandardOutput();
                     QString vcodecList(codecList);
                     QStringList result;
                     QStringList vlist = vcodecList.split('\n', QString::SkipEmptyParts);
@@ -606,7 +606,7 @@

     checkProcess.waitForFinished();

-    QByteArray result = checkProcess.readAllStandardError();
+    QByteArray result = checkProcess.readAllStandardOutput();
     if (!result.contains("- avformat")) errorMessage.append(i18n("MLT's avformat (FFMPEG) module not found. Please check your FFMPEG and MLT install. Kdenlive will not work until this issue is fixed.") + "\n");*/

     QProcess checkProcess2;
@@ -616,7 +616,7 @@

     checkProcess2.waitForFinished();

-    QByteArray result = checkProcess2.readAllStandardError();
+    QByteArray result = checkProcess2.readAllStandardOutput();
     if (!result.contains("sdl") || !result.contains("sdl_preview")) errorMessage.append(i18n("MLT's SDL module not found. Please check your MLT install. Kdenlive will not work until this issue is fixed.") + '\n');

     if (!errorMessage.isEmpty()) {