File use-mlt_datadir.patch of Package kdenlive.4880

Overview Repositories Revisions Requests Users Attributes Meta

File use-mlt_datadir.patch of Package kdenlive.4880

diff -urB kdenlive-15.04.60git/src/CMakeLists.txt new/src/CMakeLists.txt
--- kdenlive-15.04.60git/src/CMakeLists.txt	2015-05-18 09:56:29.000000000 +0200
+++ new/src/CMakeLists.txt	2015-05-18 09:58:09.276828166 +0200
@@ -6,6 +6,24 @@
 
 find_package(OpenGL REQUIRED)
 
+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")
diff -urB kdenlive-15.04.60git/src/mltconnection.cpp new/src/mltconnection.cpp
--- kdenlive-15.04.60git/src/mltconnection.cpp	2015-05-18 09:56:29.000000000 +0200
+++ new/src/mltconnection.cpp	2015-05-18 09:58:09.276828166 +0200
@@ -37,11 +37,11 @@
     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");
         }

Places

File use-mlt_datadir.patch of Package kdenlive.4880

Places