Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:wolfi323:branches:KDE:Frameworks5
kdenlive4
kdenlive-0.9.10-mlt_datadir.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File kdenlive-0.9.10-mlt_datadir.patch of Package kdenlive4
diff -U 3 -H -d -r -N -- kdenlive-0.9.10.orig/src/CMakeLists.txt kdenlive-0.9.10/src/CMakeLists.txt --- kdenlive-0.9.10.orig/src/CMakeLists.txt 2014-09-12 12:11:29.000000000 +0200 +++ kdenlive-0.9.10/src/CMakeLists.txt 2014-10-16 17:15:39.293347257 +0200 @@ -11,6 +11,24 @@ macro_optional_find_package(Nepomuk) macro_optional_find_package(QJSON) +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 -U 3 -H -d -r -N -- kdenlive-0.9.10.orig/src/mainwindow.cpp kdenlive-0.9.10/src/mainwindow.cpp --- kdenlive-0.9.10.orig/src/mainwindow.cpp 2014-09-21 22:10:48.000000000 +0200 +++ kdenlive-0.9.10/src/mainwindow.cpp 2014-10-16 17:23:42.045655606 +0200 @@ -2343,12 +2343,12 @@ KdenliveSettings::setRendererpath(qgetenv("MLT_PREFIX") + "/bin/melt"); } if (KdenliveSettings::mltpath().isEmpty()) { - KdenliveSettings::setMltpath(QString(MLT_PREFIX) + "/share/mlt/profiles/"); - KdenliveSettings::setRendererpath(QString(MLT_PREFIX) + "/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 = KStandardDirs::findExe("melt"); }
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor