diff options
-rw-r--r-- | pkgs/applications/video/kdenlive/default.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/video/kdenlive/kdenlive-newmlt.patch | 70 | ||||
-rw-r--r-- | pkgs/applications/video/kdenlive/qtgl-header-change.patch | 14 | ||||
-rw-r--r-- | pkgs/development/libraries/mlt/default.nix | 6 |
4 files changed, 22 insertions, 78 deletions
diff --git a/pkgs/applications/video/kdenlive/default.nix b/pkgs/applications/video/kdenlive/default.nix index 6db6e630d325..c133c90f8e92 100644 --- a/pkgs/applications/video/kdenlive/default.nix +++ b/pkgs/applications/video/kdenlive/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl, lib, cmake, qt4, perl, kdelibs, automoc4, phonon, mlt, gettext -, qimageblitz, qjson, shared_mime_info, soprano }: +, qimageblitz, qjson, shared_mime_info, soprano, pkgconfig }: stdenv.mkDerivation rec { name = "kdenlive-${version}"; - version = "0.8"; + version = "0.8.2.1"; src = fetchurl { url = "mirror://sourceforge/kdenlive/${name}.tar.gz"; - sha256 = "18e3390c9eb7124af5cd43819c679374aec46dcaf1fc5cdb43918db470c1076f"; + sha256 = "a454a0659c9673453800df8382dfdbcb87acfb9b174712ffeb46b8304bf00717"; }; - patches = [ ./kdenlive-newmlt.patch ]; + patches = [ ./qtgl-header-change.patch ]; buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon mlt gettext - qimageblitz qjson shared_mime_info soprano ]; + qimageblitz qjson shared_mime_info soprano pkgconfig ]; meta = { description = "Free and open source video editor"; diff --git a/pkgs/applications/video/kdenlive/kdenlive-newmlt.patch b/pkgs/applications/video/kdenlive/kdenlive-newmlt.patch deleted file mode 100644 index b3a772a7ac6e..000000000000 --- a/pkgs/applications/video/kdenlive/kdenlive-newmlt.patch +++ /dev/null @@ -1,70 +0,0 @@ -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()) { diff --git a/pkgs/applications/video/kdenlive/qtgl-header-change.patch b/pkgs/applications/video/kdenlive/qtgl-header-change.patch new file mode 100644 index 000000000000..91d9f13737bd --- /dev/null +++ b/pkgs/applications/video/kdenlive/qtgl-header-change.patch @@ -0,0 +1,14 @@ +Correct for changed Qt opengl includes. +Reference: http://www.kdenlive.org/mantis/view.php?id=2396 + +diff -Naur kdenlive-0.8.2.1.orig//src/videoglwidget.cpp kdenlive-0.8.2.1/src/videoglwidget.cpp +--- kdenlive-0.8.2.1.orig//src/videoglwidget.cpp 2012-01-24 00:04:53.588121469 -0430 ++++ kdenlive-0.8.2.1/src/videoglwidget.cpp 2012-01-24 00:05:32.817410938 -0430 +@@ -2,6 +2,7 @@ + #include <QtGui> + #include <QtOpenGL> + #include "videoglwidget.h" ++#include "GL/glu.h" + + #ifndef GL_TEXTURE_RECTANGLE_EXT + #define GL_TEXTURE_RECTANGLE_EXT GL_TEXTURE_RECTANGLE_NV diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 384c31a7cd44..50100e3f1f38 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -2,11 +2,11 @@ libvorbis, sox}: stdenv.mkDerivation { - name = "mlt-0.7.4"; + name = "mlt-0.7.6"; src = fetchurl { - url = mirror://sourceforge/mlt/mlt-0.7.4.tar.gz; - sha256 = "1xcrrd3xbz9hmahgl7xf610cm97chwpxwgcajkd10mpcxbqs08i0"; + url = mirror://sourceforge/mlt/mlt-0.7.6.tar.gz; + sha256 = "f8ea8590417ea2b5543a495f2edc30636d3931932deee7a4e0d8516e9c2b58ae"; }; buildInputs = [ qt4 SDL ffmpeg libdv libxml2 libsamplerate libvorbis sox ]; |