Hello community, here is the log from the commit of package kdenlive for openSUSE:Factory checked in at 2015-05-11 19:32:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdenlive (Old) and /work/SRC/openSUSE:Factory/.kdenlive.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdenlive" Changes: -------- --- /work/SRC/openSUSE:Factory/kdenlive/kdenlive.changes 2014-07-10 09:31:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdenlive.new/kdenlive.changes 2015-05-11 19:32:56.000000000 +0200 @@ -1,0 +2,63 @@ +Sat Apr 11 14:12:12 UTC 2015 - tittiatc...@gmail.com + +- Update to KDE Applications 15.04.0 + * KDE Applications 15.04.0 + * https://www.kde.org/announcements/announce-applications-15.04.0.php + +- Drop upstreamed patches: + * kdenlive-0.9.10-no_avformat.patch + +- Renamed and adjusted patch + * use-mlt_datadir.patch + +------------------------------------------------------------------- +Thu Oct 16 15:12:01 UTC 2014 - nico.kru...@gmail.com + +- Update to 0.9.10 + + handle VBR encoding profiles, and use it! + + video stabilizer: added new "vid.stab", removed older ones + + environment variable MLT_PREFIX overrides profiles & melt path + + several fixes for high dpi screens + + change proxy profile, obsolete with libav + + add SVG to image formats for slideshows + + restore project render bitrate (#3326) + + show proxy name in clipproperties + + add link to MLT doc in render edit dialog (#3355) + + update maximum track height (#3241) + + resize render path box (#3300) + + change transition settings layout (#3336) + + heat colormap in spectrogram (#3142) + + fix clip monitor switch on proxy creation end (#3308) + + fix clip jobs (stabilize) operating on proxies (#3337) + + fix timeline corruption by clip resize end + zoom change + + fix title clip duration not taken into account (#3309) + + fix timeline thumbs flicker when fully zoomed (#3247) + + fix thumbnailer aspect ratio + + fix fades for split audio (#3323) + + fix transcoding (#3334) + + fix 'Clip in Timeline' when project monitor is inactive (#3261) + + fix audio analysis (use dynamic memory instead of stack) + + fix render end notification + + fix render timecode overlay (#3260) + + set tooltip for monitor pause button (#3256) + + fix slideshow clips adding 1 frame (#3289) + + fix archive project icon (#3325) + + fix compilation on armhf (#3345) + + don't allow creating keyframes for "fixed" filters (#2956) + + re-enable compilation on KDE < 4.5 (squeeze) (#3319) + + re-enable Clip menu (fix bug #3347) + + fix screen recording failure (#3358) + + fix crash detected with undo/redo (bug #3240) + + fix crash cutting group on a clip edge (#3312, #3350) + + fix crash on image sequence (#3331) + + fix crash in tracks config editor (#3367) + + fix crash on audiofiles + + fix crash on opening project file with images + + fix warnings from static analyzers (cppcheck, krazy) + + sort source files, easier to understand (for new developpers) +- Update kdenlive-0.9.2-mlt_datadir.patch to + kdenlive-0.9.10-mlt_datadir.patch +- Update kdenlive-0.9.2-no_avformat.patch to + kdenlive-0.9.10-no_avformat.patch + +------------------------------------------------------------------- Old: ---- kdenlive-0.9.2-mlt_datadir.patch kdenlive-0.9.2-no_avformat.patch kdenlive-0.9.8.tar.bz2 New: ---- kdenlive-15.04.0.tar.xz use-mlt_datadir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdenlive.spec ++++++ --- /var/tmp/diff_new_pack.ndV7sl/_old 2015-05-11 19:32:57.000000000 +0200 +++ /var/tmp/diff_new_pack.ndV7sl/_new 2015-05-11 19:32:57.000000000 +0200 @@ -16,42 +16,54 @@ # -%define kde_version 4.3 -%define mlt_version 0.8.6 -%define qt_version 4.5 +%define mlt_version 0.9.6 Name: kdenlive -Version: 0.9.8 +Version: 15.04.0 Release: 0 Summary: Non-linear video editor License: GPL-3.0+ Group: Productivity/Multimedia/Video/Editors and Convertors Url: http://www.kdenlive.org/ -Source0: http://download.kde.org/stable/%{name}/%{version}/src/%{name}-%{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 -# PATCH-FIX-UPSTREAM kdenlive-0.9.2-no_avformat.patch http://www.kdenlive.org/mantis/view.php?id=2811 reddw...@opensuse.org -- Make it work even if the avformat plugin is not available -Patch1: kdenlive-0.9.2-no_avformat.patch +Source0: http://download.kde.org/stable/applications/15.04.0/src/%{name}-%{version}.tar.xz +Patch1: use-mlt_datadir.patch BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: hicolor-icon-theme -BuildRequires: libkde4-devel >= %{kde_version} -BuildRequires: libkdecore4-devel >= %{kde_version} BuildRequires: shared-mime-info -BuildRequires: pkgconfig(QJson) >= 0.5 -BuildRequires: pkgconfig(QtCore) >= %{qt_version} -BuildRequires: pkgconfig(QtDBus) >= %{qt_version} -BuildRequires: pkgconfig(QtGui) >= %{qt_version} -BuildRequires: pkgconfig(QtOpenGL) >= %{qt_version} -BuildRequires: pkgconfig(QtScript) >= %{qt_version} -BuildRequires: pkgconfig(QtSvg) >= %{qt_version} -BuildRequires: pkgconfig(QtXml) >= %{qt_version} BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glu) -BuildRequires: pkgconfig(libv4l2) +BuildRequires: pkgconfig(glew) +BuildRequires: libmlt-devel BuildRequires: pkgconfig(mlt++) >= %{mlt_version} BuildRequires: pkgconfig(mlt-framework) >= %{mlt_version} BuildRequires: pkgconfig(x11) +BuildRequires: extra-cmake-modules +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5DBus) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5Script) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5OpenGL) +BuildRequires: pkgconfig(Qt5Test) +BuildRequires: pkgconfig(Qt5Concurrent) +BuildRequires: pkgconfig(Qt5Qml) +BuildRequires: kconfig-devel +BuildRequires: karchive-devel +BuildRequires: kcoreaddons-devel +BuildRequires: kconfigwidgets-devel +BuildRequires: kdbusaddons-devel +BuildRequires: kio-devel +BuildRequires: kdoctools-devel +BuildRequires: knotifications-devel +BuildRequires: kwidgetsaddons-devel +BuildRequires: kplotting-devel +BuildRequires: knotifyconfig-devel +BuildRequires: knewstuff-devel +BuildRequires: kxmlgui-devel +BuildRequires: kiconthemes-devel +BuildRequires: ktextwidgets-devel +BuildRequires: kguiaddons-devel %define melt_path %(pkg-config --variable=meltbin mlt-framework) Requires: %{melt_path} # Waiting for the day all libraries have versioned symbols... @@ -68,7 +80,8 @@ Recommends: %{_bindir}/genisoimage %define mlt_soname %(pkg-config --variable=moduledir mlt-framework | sed 's/.*-\\([0-9]\\+\\)/\\1/') Recommends: mlt(%{mlt_soname})(avformat) -%kde4_runtime_requires +Obsoletes: kdenlive5 < %{version} +Provides: kdenlive5 = %{version} %description Kdenlive is a non-linear video editor for GNU/Linux and FreeBSD, which supports @@ -79,33 +92,19 @@ %prep %setup -q -%patch0 -%patch1 -# fix translations -cd po -for d in */ -do - sed -e "s/fr/$d" -i "$d"CMakeLists.txt -done +%patch1 -p1 %build -%cmake_kde4 -d build +%cmake_kf5 -d build %make_jobs %install -pushd build -%kde4_makeinstall -popd +%kf5_makeinstall -C build # Debian menu system rm -r %{buildroot}%{_datadir}/menu -rm %{buildroot}%{_datadir}/pixmaps/%{name}.xpm - -%find_lang %{name} %fdupes -s %{buildroot} -%kde_post_install - %post %icon_theme_cache_post %icon_theme_cache_post oxygen @@ -118,23 +117,24 @@ %icon_theme_cache_postun oxygen %icon_theme_cache_postun -%files -f %{name}.lang +%files %defattr(0644,root,root,0755) %doc AUTHORS COPYING README %attr(0755,-,-) %{_bindir}/%{name} %attr(0755,-,-) %{_bindir}/%{name}_render -%{_mandir}/man1/%{name}.1* -%{_mandir}/man1/%{name}_render.1* -%{_kde4_appsdir}/%{name} -%{_kde4_modulesdir}/libkdenlive_sampleplugin.so -%{_kde4_modulesdir}/westleypreview.so -%{_kde4_configdir}/%{name}* -%{_kde4_configdir}.kcfg/%{name}* -%{_kde4_servicesdir}/westleypreview.desktop -%{_kde4_applicationsdir}/%{name}.desktop -%{_datadir}/icons/hicolor/*/*/* -%{_datadir}/icons/oxygen/*/*/* -%{_datadir}/mime/packages/%{name}.xml -%{_datadir}/mime/packages/westley.xml - +%_datadir/pixmaps/* +%dir %_kf5_configkcfgdir +%_kf5_configkcfgdir/kdenlivesettings.kcfg +%_datadir/kdenlive/ +%_mandir/man1/* +%_datadir/mime/packages/* +%_kf5_applicationsdir/org.kde.kdenlive.desktop +%_datadir/kxmlgui5/kdenlive/ +%(config) %_kf5_configdir/*.knsrc +%_kf5_plugindir/mltpreview.so +%_datadir/knotifications5/kdenlive.notifyrc +%_kf5_servicesdir/mltpreview.desktop +%_kf5_htmldir/en/kdenlive/ +%_datadir/appdata/ +%{_kf5_iconsdir}/hicolor/*/*/* %changelog ++++++ use-mlt_datadir.patch ++++++ diff -urB a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt 2015-04-08 20:41:11.000000000 +0200 +++ b/src/CMakeLists.txt 2015-04-19 12:57:33.021395125 +0200 @@ -9,6 +9,24 @@ find_package(SDL REQUIRED) endif(APPLE) +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 a/src/mltconnection.cpp b/src/mltconnection.cpp --- a/src/mltconnection.cpp 2015-04-08 20:41:11.000000000 +0200 +++ b/src/mltconnection.cpp 2015-04-19 13:02:19.897468681 +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"); }
