Commit 1515402d authored by Vincent Pinon's avatar Vincent Pinon

Integrate downstream patches

parent 2f53378c
......@@ -126,4 +126,5 @@ X-DocPath[cs]=http://cs.wikibooks.org/wiki/Kdenlive
Terminal=false
MimeType=application/x-kdenlive;
Categories=Qt;KDE;AudioVideo;AudioVideoEditing;
Keywords=editing;video;audio;mlt;kde;
X-DBUS-ServiceName=org.kde.kdenlive
......@@ -21,6 +21,24 @@ else()
PURPOSE "")
endif()
execute_process(
COMMAND pkg-config --variable=mltdatadir mlt-framework
OUTPUT_VARIABLE MLT_DATADIR
RESULT_VARIABLE MLT_DATADIR_failed)
if (NOT MLT_DATADIR_failed)
string(REGEX REPLACE "[\r\n]" "" MLT_DATADIR "${MLT_DATADIR}")
add_definitions(-DMLT_DATADIR=\"${MLT_DATADIR}\")
endif(NOT MLT_DATADIR_failed)
execute_process(
COMMAND pkg-config --variable=meltbin mlt-framework
OUTPUT_VARIABLE MLT_MELTBIN
RESULT_VARIABLE MLT_MELTBIN_failed)
if (NOT MLT_MELTBIN_failed)
string(REGEX REPLACE "[\r\n]" "" MLT_MELTBIN "${MLT_MELTBIN}")
add_definitions(-DMLT_MELTBIN=\"${MLT_MELTBIN}\")
endif(NOT MLT_MELTBIN_failed)
option(WITH_JogShuttle "Build Jog/Shuttle support" ON)
set(FFMPEG_SUFFIX "" CACHE STRING "FFmpeg custom suffix")
......
......@@ -269,7 +269,7 @@ QPixmap ProjectClip::thumbnail(int width, int height)
void ProjectClip::setProducer(ClipController *controller, bool replaceProducer)
{
if (!replaceProducer && m_controller) {
qDebug()<<"// RECIEVED PRODUCER BUT WE ALREADY HAVE ONE\n----------";
qDebug()<<"// RECEIVED PRODUCER BUT WE ALREADY HAVE ONE\n----------";
return;
}
if (m_controller) {
......
......@@ -37,11 +37,11 @@ void MltConnection::locateMeltAndProfilesPath(const QString& mltPath)
if (basePath.isEmpty()){
basePath = QString(MLT_PREFIX);
}
KdenliveSettings::setMltpath(basePath + "/share/mlt/profiles/");
KdenliveSettings::setRendererpath(basePath + "/bin/melt");
KdenliveSettings::setMltpath(QString(MLT_DATADIR) + "/profiles/");
KdenliveSettings::setRendererpath(QString(MLT_MELTBIN));
if (KdenliveSettings::rendererpath().isEmpty() || KdenliveSettings::rendererpath().endsWith(QLatin1String("inigo"))) {
QString meltPath = QString(MLT_PREFIX) + QString("/bin/melt");
QString meltPath = QString(MLT_MELTBIN);
if (!QFile::exists(meltPath)) {
meltPath = QStandardPaths::findExecutable("melt");
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment