Hello community, here is the log from the commit of package ffmpegthumbs for openSUSE:Factory checked in at 2018-08-24 17:04:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ffmpegthumbs (Old) and /work/SRC/openSUSE:Factory/.ffmpegthumbs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ffmpegthumbs" Fri Aug 24 17:04:46 2018 rev:39 rq:630108 version:18.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ffmpegthumbs/ffmpegthumbs.changes 2018-07-19 22:50:28.514860458 +0200 +++ /work/SRC/openSUSE:Factory/.ffmpegthumbs.new/ffmpegthumbs.changes 2018-08-24 17:04:47.586120457 +0200 @@ -1,0 +2,21 @@ +Thu Aug 16 22:01:02 UTC 2018 - christo...@krop.fr + +- Update to 18.08.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.08.0.php +- Changes since 18.07.80: + * None + +------------------------------------------------------------------- +Thu Jul 26 13:00:27 UTC 2018 - lbeltr...@kde.org + +- Update to 18.07.80 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.07.80.php +- Changes since 18.04.3: + * Add filmstrip embed configuration + * Add arcconfig + +------------------------------------------------------------------- Old: ---- ffmpegthumbs-18.04.3.tar.xz New: ---- ffmpegthumbs-18.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ffmpegthumbs.spec ++++++ --- /var/tmp/diff_new_pack.uoSzyB/_old 2018-08-24 17:04:47.986120932 +0200 +++ /var/tmp/diff_new_pack.uoSzyB/_new 2018-08-24 17:04:47.986120932 +0200 @@ -17,11 +17,11 @@ Name: ffmpegthumbs -Version: 18.04.3 +Version: 18.08.0 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) -%{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} +%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: FFmpeg-based thumbnail creator for video files License: LGPL-2.0-or-later Group: System/GUI/KDE @@ -29,6 +29,7 @@ Source0: %{name}-%{version}.tar.xz BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem +BuildRequires: ki18n-devel BuildRequires: kio-devel BuildRequires: pkgconfig BuildRequires: xz @@ -61,5 +62,7 @@ %doc COPYING %{_kf5_servicesdir}/ %{_kf5_plugindir}/ +%dir %{_kf5_configkcfgdir} +%{_kf5_configkcfgdir}/ffmpegthumbnailersettings5.kcfg %changelog ++++++ ffmpegthumbs-18.04.3.tar.xz -> ffmpegthumbs-18.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpegthumbs-18.04.3/.arcconfig new/ffmpegthumbs-18.08.0/.arcconfig --- old/ffmpegthumbs-18.04.3/.arcconfig 1970-01-01 01:00:00.000000000 +0100 +++ new/ffmpegthumbs-18.08.0/.arcconfig 2018-05-26 18:31:16.000000000 +0200 @@ -0,0 +1,3 @@ +{ + "phabricator.uri" : "https://phabricator.kde.org/"; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpegthumbs-18.04.3/CMakeLists.txt new/ffmpegthumbs-18.08.0/CMakeLists.txt --- old/ffmpegthumbs-18.04.3/CMakeLists.txt 2017-03-28 00:50:03.000000000 +0200 +++ new/ffmpegthumbs-18.08.0/CMakeLists.txt 2018-05-26 18:31:16.000000000 +0200 @@ -12,8 +12,8 @@ include(KDECMakeSettings) include(KDECompilerSettings NO_POLICY_SCOPE) -find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Gui) -find_package(KF5 REQUIRED COMPONENTS KIO) +find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Gui) +find_package(KF5 REQUIRED COMPONENTS KIO I18n Config) find_package(FFmpeg COMPONENTS AVCODEC AVFORMAT SWSCALE) include_directories( @@ -34,10 +34,12 @@ ffmpegthumbnailer/videothumbnailer.cpp ) +kconfig_add_kcfg_files(ffmpegthumbs_PART_SRCS ffmpegthumbnailersettings5.kcfgc) add_library(ffmpegthumbs MODULE ${ffmpegthumbs_PART_SRCS}) -target_link_libraries(ffmpegthumbs Qt5::Gui KF5::KIOWidgets ${AVUTIL_LIBRARIES} ${AVFILTER_LIBRARIES} ${AVFORMAT_LIBRARIES} ${AVCODEC_LIBRARIES} ${SWSCALE_LIBRARIES} ) +target_link_libraries(ffmpegthumbs Qt5::Core Qt5::Gui KF5::KIOWidgets KF5::KIOCore KF5::I18n KF5::ConfigCore KF5::ConfigGui ${AVUTIL_LIBRARIES} ${AVFILTER_LIBRARIES} ${AVFORMAT_LIBRARIES} ${AVCODEC_LIBRARIES} ${SWSCALE_LIBRARIES} ) +install(FILES ffmpegthumbnailersettings5.kcfg DESTINATION ${KCFG_INSTALL_DIR}) install(TARGETS ffmpegthumbs DESTINATION ${PLUGIN_INSTALL_DIR}) ########### install files ############### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpegthumbs-18.04.3/ffmpegthumbnailer.cpp new/ffmpegthumbs-18.08.0/ffmpegthumbnailer.cpp --- old/ffmpegthumbs-18.04.3/ffmpegthumbnailer.cpp 2017-03-28 00:50:03.000000000 +0200 +++ new/ffmpegthumbs-18.08.0/ffmpegthumbnailer.cpp 2018-05-26 18:31:16.000000000 +0200 @@ -15,7 +15,11 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "ffmpegthumbnailer.h" +#include "ffmpegthumbnailersettings5.h" + #include <QImage> +#include <QCheckBox> +#include <KLocalizedString> extern "C" { @@ -28,7 +32,10 @@ FFMpegThumbnailer::FFMpegThumbnailer() { - m_Thumbnailer.addFilter(&m_FilmStrip); + FFMpegThumbnailerSettings* settings = FFMpegThumbnailerSettings::self(); + if (settings->filmstrip()) { + m_Thumbnailer.addFilter(&m_FilmStrip); + } } FFMpegThumbnailer::~FFMpegThumbnailer() @@ -53,3 +60,19 @@ return (Flags)(None); } +QWidget *FFMpegThumbnailer::createConfigurationWidget() +{ + QCheckBox *filmstripCheckBox = new QCheckBox(i18nc("@option:check", "Embed filmstrip effect")); + filmstripCheckBox->setChecked(FFMpegThumbnailerSettings::filmstrip()); + return filmstripCheckBox; +} + +void FFMpegThumbnailer::writeConfiguration(const QWidget *configurationWidget) +{ + const QCheckBox *filmstripCheckBox = qobject_cast<const QCheckBox*>(configurationWidget); + if (filmstripCheckBox) { + FFMpegThumbnailerSettings* settings = FFMpegThumbnailerSettings::self(); + settings->setFilmstrip(filmstripCheckBox->isChecked()); + settings->save(); + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpegthumbs-18.04.3/ffmpegthumbnailer.h new/ffmpegthumbs-18.08.0/ffmpegthumbnailer.h --- old/ffmpegthumbs-18.04.3/ffmpegthumbnailer.h 2017-03-28 00:50:03.000000000 +0200 +++ new/ffmpegthumbs-18.08.0/ffmpegthumbnailer.h 2018-05-26 18:31:16.000000000 +0200 @@ -31,6 +31,8 @@ virtual ~FFMpegThumbnailer(); virtual bool create(const QString& path, int width, int height, QImage& img); virtual Flags flags() const; + virtual QWidget* createConfigurationWidget() override; + virtual void writeConfiguration(const QWidget* configurationWidget) override; private: ffmpegthumbnailer::VideoThumbnailer m_Thumbnailer; ffmpegthumbnailer::FilmStripFilter m_FilmStrip; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpegthumbs-18.04.3/ffmpegthumbnailersettings5.kcfg new/ffmpegthumbs-18.08.0/ffmpegthumbnailersettings5.kcfg --- old/ffmpegthumbs-18.04.3/ffmpegthumbnailersettings5.kcfg 1970-01-01 01:00:00.000000000 +0100 +++ new/ffmpegthumbs-18.08.0/ffmpegthumbnailersettings5.kcfg 2018-05-26 18:31:16.000000000 +0200 @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE kcfg SYSTEM "http://www.kde.org/standards/kcfg/1.0/kcfg.dtd";> +<kcfg> + <kcfgfile name="ffmpegthumbsrc"/> + <group name="General"> + <entry name="filmstrip" type="bool"> + <label>Embed filmstrip effect</label> + <default>true</default> + </entry> + </group> +</kcfg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpegthumbs-18.04.3/ffmpegthumbnailersettings5.kcfgc new/ffmpegthumbs-18.08.0/ffmpegthumbnailersettings5.kcfgc --- old/ffmpegthumbs-18.04.3/ffmpegthumbnailersettings5.kcfgc 1970-01-01 01:00:00.000000000 +0100 +++ new/ffmpegthumbs-18.08.0/ffmpegthumbnailersettings5.kcfgc 2018-05-26 18:31:16.000000000 +0200 @@ -0,0 +1,4 @@ +File=ffmpegthumbnailersettings5.kcfg +ClassName=FFMpegThumbnailerSettings +Singleton=true +Mutators=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpegthumbs-18.04.3/ffmpegthumbs.desktop new/ffmpegthumbs-18.08.0/ffmpegthumbs.desktop --- old/ffmpegthumbs-18.04.3/ffmpegthumbs.desktop 2017-03-28 00:50:03.000000000 +0200 +++ new/ffmpegthumbs-18.08.0/ffmpegthumbs.desktop 2018-05-26 18:31:16.000000000 +0200 @@ -57,3 +57,4 @@ CacheThumbnail=true ThumbnailerVersion=2 IgnoreMaximumSize=true +Configurable=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpegthumbs-18.04.3/tests/CMakeLists.txt new/ffmpegthumbs-18.08.0/tests/CMakeLists.txt --- old/ffmpegthumbs-18.04.3/tests/CMakeLists.txt 2017-03-28 00:50:03.000000000 +0200 +++ new/ffmpegthumbs-18.08.0/tests/CMakeLists.txt 2018-05-26 18:31:16.000000000 +0200 @@ -16,10 +16,11 @@ ${CMAKE_CURRENT_SOURCE_DIR}/../ffmpegthumbnailer/videothumbnailer.cpp ) +kconfig_add_kcfg_files(ffmpegthumbtest_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../ffmpegthumbnailersettings5.kcfgc) add_executable(ffmpegthumbtest ${ffmpegthumbtest_SRCS} ) -target_link_libraries(ffmpegthumbtest Qt5::Gui KF5::KIOWidgets ${AVUTIL_LIBRARIES} ${AVFILTER_LIBRARIES} ${AVFORMAT_LIBRARIES} ${AVCODEC_LIBRARIES} ${SWSCALE_LIBRARIES}) +target_link_libraries(ffmpegthumbtest Qt5::Core Qt5::Gui KF5::KIOWidgets KF5::KIOCore KF5::I18n KF5::ConfigCore KF5::ConfigGui ${AVUTIL_LIBRARIES} ${AVFILTER_LIBRARIES} ${AVFORMAT_LIBRARIES} ${AVCODEC_LIBRARIES} ${SWSCALE_LIBRARIES}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpegthumbs-18.04.3/tests/ffmpegthumbtest.cpp new/ffmpegthumbs-18.08.0/tests/ffmpegthumbtest.cpp --- old/ffmpegthumbs-18.04.3/tests/ffmpegthumbtest.cpp 2017-03-28 00:50:03.000000000 +0200 +++ new/ffmpegthumbs-18.08.0/tests/ffmpegthumbtest.cpp 2018-05-26 18:31:16.000000000 +0200 @@ -15,6 +15,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "ffmpegthumbnailer.h" +#include "ffmpegthumbnailersettings5.h" #include <QCoreApplication> #include <QFileInfo>
