Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=cd43ae6a6f8c976d992c30189942b0d761321fb1
commit cd43ae6a6f8c976d992c30189942b0d761321fb1 Author: Melko <[email protected]> Date: Wed Oct 12 22:33:52 2011 +0200 kdenlive-0.8-2-i686 * fix against mlt-sdl * change m8r mail diff --git a/source/kde-extra/kdenlive/FrugalBuild b/source/kde-extra/kdenlive/FrugalBuild index ea4eca4..c17cc56 100644 --- a/source/kde-extra/kdenlive/FrugalBuild +++ b/source/kde-extra/kdenlive/FrugalBuild @@ -1,17 +1,20 @@ # Compiling Time: 1.76 SBU -# Maintainer: Melko <[email protected]> +# Maintainer: Melko <[email protected]> pkgname=kdenlive pkgver=0.8 -pkgrel=1 +pkgrel=2 pkgdesc="A Non-Linear Video Editing Suite for KDE" _F_kde_defaults=0 _F_kde_reconf=1 Finclude sourceforge kde -depends=("${depends[@]}" "kdelibs>=$_F_kde_ver" "kdebase-runtime>=$_F_kde_ver" 'mlt-qimage>=0.5.6' 'mlt-sdl>=0.5.6' 'phonon' 'libqtscript') +depends=("${depends[@]}" "kdelibs>=$_F_kde_ver" "kdebase-runtime>=$_F_kde_ver" 'mlt-qimage>=0.5.6' \ + 'mlt-sdl>=0.5.6' 'phonon' 'libqtscript' 'qjson') makedepends=("${makedepends[@]}" 'gettext' 'kdelibs-compiletime') groups=('kde-extra') archs=('i686' 'x86_64') -sha1sums=('ee2b3b5fe6125da4c7520bddec8edefd04c9988c') +source=(${source[@]} kdenlive-newmlt.patch) +sha1sums=('ee2b3b5fe6125da4c7520bddec8edefd04c9988c' \ + 'df7a171319f78589daa127dc2da99f23afe49a20') # optimization OK diff --git a/source/kde-extra/kdenlive/kdenlive-newmlt.patch b/source/kde-extra/kdenlive/kdenlive-newmlt.patch new file mode 100644 index 0000000..676e150 --- /dev/null +++ b/source/kde-extra/kdenlive/kdenlive-newmlt.patch @@ -0,0 +1,66 @@ +diff -ur src.orig/wizard.cpp src/wizard.cpp +--- src.orig/wizard.cpp 2011-04-26 21:44:22.000000000 +0200 ++++ 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()) { _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
