Hello community, here is the log from the commit of package kdenlive for openSUSE:Factory checked in at 2012-08-26 11:32:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdenlive (Old) and /work/SRC/openSUSE:Factory/.kdenlive.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdenlive", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/kdenlive/kdenlive.changes 2012-06-01 22:31:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdenlive.new/kdenlive.changes 2012-08-26 11:32:06.000000000 +0200 @@ -1,0 +2,16 @@ +Thu Aug 16 11:05:12 UTC 2012 - reddw...@opensuse.org + +- Recommend a package with the avformat module + +------------------------------------------------------------------- +Mon Aug 13 00:30:29 UTC 2012 - reddw...@opensuse.org + +- Require libmltX-modules and libmltX-data + +------------------------------------------------------------------- +Sun Aug 12 16:40:32 UTC 2012 - reddw...@opensuse.org + +- Add kdenlive-0.9.2-mlt_datadir.patch to use the correct MLT data + dir by default + +------------------------------------------------------------------- New: ---- kdenlive-0.9.2-mlt_datadir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdenlive.spec ++++++ --- /var/tmp/diff_new_pack.pzXPVN/_old 2012-08-26 11:32:07.000000000 +0200 +++ /var/tmp/diff_new_pack.pzXPVN/_new 2012-08-26 11:32:07.000000000 +0200 @@ -28,6 +28,8 @@ Group: Productivity/Multimedia/Video/Editors and Convertors Url: http://www.kdenlive.org/ Source0: http://download.kde.org/stable/kdenlive/%{version}/src/kdenlive-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM kdenlive-0.9.2-mlt_datadir.patch http://www.kdenlive.org/mantis/view.php?id=2701 reddw...@opensuse.org -- Use versioned MLT data dir +Patch0: kdenlive-0.9.2-mlt_datadir.patch BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: hicolor-icon-theme @@ -51,12 +53,18 @@ # Waiting for the day all libraries have versioned symbols... Requires: %(rpm -qf $(readlink -qne %{_libdir}/libmlt++.so) --qf '%{NAME}') >= %{mlt_version} Requires: %(rpm -qf $(readlink -qne %{_libdir}/libmlt.so) --qf '%{NAME}') >= %{mlt_version} +# Without a few of the plugins it crashes on start +Requires: %(rpm -qf $(readlink -qne %{_libdir}/libmlt.so) --qf '%{NAME}')-modules +# It requires the profiles +Requires: %(rpm -qf $(readlink -qne %{_libdir}/libmlt.so) --qf '%{NAME}')-data Recommends: %{_bindir}/dvdauthor Recommends: %{_bindir}/dvgrab Recommends: %{_bindir}/ffmpeg Recommends: %{_bindir}/ffplay Recommends: %{_bindir}/genisoimage Recommends: %{_bindir}/recordmydesktop +%define mlt_soname %(pkg-config --variable=moduledir mlt-framework | sed 's/.*-\\([0-9]\\+\\)/\\1/') +Recommends: mlt(%{mlt_soname})(avformat) %kde4_runtime_requires %description @@ -68,6 +76,7 @@ %prep %setup -q +%patch0 %build # V4L support is disabled since it's GPL-2.0 only and incompatible with the GPL-3.0+ parts (bnc#765082) ++++++ kdenlive-0.9.2-mlt_datadir.patch ++++++ Index: src/CMakeLists.txt =================================================================== --- src/CMakeLists.txt.orig +++ src/CMakeLists.txt @@ -11,6 +11,15 @@ endif(APPLE) 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) + option(WITH_V4L "Build capture support with Video4Linux" ON) option(WITH_JogShuttle "Build Jog/Shuttle support" ON) Index: src/mainwindow.cpp =================================================================== --- src/mainwindow.cpp.orig +++ src/mainwindow.cpp @@ -2183,7 +2183,7 @@ void MainWindow::parseProfiles(const QSt } if (KdenliveSettings::mltpath().isEmpty()) - KdenliveSettings::setMltpath(QString(MLT_PREFIX) + QString("/share/mlt/profiles/")); + KdenliveSettings::setMltpath(QString(MLT_DATADIR) + QString("/profiles/")); if (KdenliveSettings::rendererpath().isEmpty() || KdenliveSettings::rendererpath().endsWith("inigo")) { QString meltPath = QString(MLT_PREFIX) + QString("/bin/melt"); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
