Hello community, here is the log from the commit of package ffmpegthumbs for openSUSE:Factory checked in at 2016-01-05 21:54:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ffmpegthumbs (Old) and /work/SRC/openSUSE:Factory/.ffmpegthumbs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ffmpegthumbs" Changes: -------- --- /work/SRC/openSUSE:Factory/ffmpegthumbs/ffmpegthumbs.changes 2015-11-15 12:29:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ffmpegthumbs.new/ffmpegthumbs.changes 2016-01-05 21:55:03.000000000 +0100 @@ -1,0 +2,11 @@ +Sun Dec 13 12:56:57 UTC 2015 - tittiatc...@gmail.com + +- Update to KDE Applications 15.12.0 + * KDE Applications 15.12.0 + * https://www.kde.org/announcements/announce-applications-15.12.0.php + * boo#958887 + +- Drop patch Port-to-Frameworks.patch as that now the official + tarball is Frameworks based + +------------------------------------------------------------------- Old: ---- Port-to-Frameworks.patch ffmpegthumbs-15.08.3.tar.xz New: ---- ffmpegthumbs-15.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ffmpegthumbs.spec ++++++ --- /var/tmp/diff_new_pack.01aKQB/_old 2016-01-05 21:55:05.000000000 +0100 +++ /var/tmp/diff_new_pack.01aKQB/_new 2016-01-05 21:55:05.000000000 +0100 @@ -27,11 +27,9 @@ Summary: FFmpeg-based thumbnail creator for video files License: LGPL-2.0+ Group: System/GUI/KDE -Version: 15.08.3 +Version: 15.12.0 Release: 0 Source0: %{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM Port-to-Frameworks.patch -- from frameworks branch -Patch0: Port-to-Frameworks.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -39,7 +37,6 @@ %prep %setup -%patch0 -p1 %build %cmake_kf5 -d build ++++++ ffmpegthumbs-15.08.3.tar.xz -> ffmpegthumbs-15.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpegthumbs-15.08.3/CMakeLists.txt new/ffmpegthumbs-15.12.0/CMakeLists.txt --- old/ffmpegthumbs-15.08.3/CMakeLists.txt 2015-04-03 06:45:28.000000000 +0200 +++ new/ffmpegthumbs-15.12.0/CMakeLists.txt 2015-11-07 19:53:05.000000000 +0100 @@ -1,13 +1,22 @@ -find_package(KDE4 REQUIRED) -include(KDE4Defaults) -include(MacroLibrary) +project(ffmpegthumbs) -set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) +cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) +set(QT_MIN_VERSION "5.2.0") +find_package(ECM 1.0.0 REQUIRED NO_MODULE) +set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) + +include(FeatureSummary) +include(WriteBasicConfigVersionFile) +include(KDEInstallDirs) +include(KDECMakeSettings) +include(KDECompilerSettings) + +find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Gui) +find_package(KF5 REQUIRED COMPONENTS KIO) find_package(FFmpeg COMPONENTS AVCODEC AVFORMAT SWSCALE) include_directories( - ${KDE4_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} ${PC_AVCODEC_INCLUDEDIR} ${PC_AVFORMAT_INCLUDEDIR} @@ -25,9 +34,9 @@ ffmpegthumbnailer/videothumbnailer.cpp ) -kde4_add_plugin(ffmpegthumbs ${ffmpegthumbs_PART_SRCS}) +add_library(ffmpegthumbs MODULE ${ffmpegthumbs_PART_SRCS}) -target_link_libraries(ffmpegthumbs ${KDE4_KIO_LIBS} ${AVUTIL_LIBRARIES} ${AVFORMAT_LIBRARIES} ${AVCODEC_LIBRARIES} ${SWSCALE_LIBRARIES} ) +target_link_libraries(ffmpegthumbs Qt5::Gui KF5::KIOWidgets ${AVUTIL_LIBRARIES} ${AVFORMAT_LIBRARIES} ${AVCODEC_LIBRARIES} ${SWSCALE_LIBRARIES} ) install(TARGETS ffmpegthumbs DESTINATION ${PLUGIN_INSTALL_DIR}) @@ -35,6 +44,6 @@ install(FILES ffmpegthumbs.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -if (KDE4_BUILD_TESTS) - add_subdirectory(tests) -endif (KDE4_BUILD_TESTS) +if(BUILD_TESTING) + add_subdirectory(tests) +endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpegthumbs-15.08.3/ffmpegthumbnailer/imagewriter.cpp new/ffmpegthumbs-15.12.0/ffmpegthumbnailer/imagewriter.cpp --- old/ffmpegthumbs-15.08.3/ffmpegthumbnailer/imagewriter.cpp 2015-04-03 06:45:28.000000000 +0200 +++ new/ffmpegthumbs-15.12.0/ffmpegthumbnailer/imagewriter.cpp 2015-11-07 19:53:05.000000000 +0100 @@ -15,7 +15,6 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "imagewriter.h" -#include <kdebug.h> #include <iostream> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpegthumbs-15.08.3/ffmpegthumbnailer/moviedecoder.cpp new/ffmpegthumbs-15.12.0/ffmpegthumbnailer/moviedecoder.cpp --- old/ffmpegthumbs-15.08.3/ffmpegthumbnailer/moviedecoder.cpp 2015-04-03 06:45:28.000000000 +0200 +++ new/ffmpegthumbs-15.12.0/ffmpegthumbnailer/moviedecoder.cpp 2015-11-07 19:53:05.000000000 +0100 @@ -16,7 +16,7 @@ #include "moviedecoder.h" -#include <kdebug.h> +#include <QDebug> #include <QFileInfo> extern "C" { @@ -57,12 +57,12 @@ QFileInfo fileInfo(filename); if ((!m_FormatContextWasGiven) && avformat_open_input(&m_pFormatContext, fileInfo.absoluteFilePath().toLocal8Bit().data(), NULL, NULL) != 0) { - kDebug() << "Could not open input file: " << fileInfo.absoluteFilePath(); + qDebug() << "Could not open input file: " << fileInfo.absoluteFilePath(); return; } if (avformat_find_stream_info(m_pFormatContext, 0) < 0) { - kDebug() << "Could not find stream information"; + qDebug() << "Could not find stream information"; return; } @@ -129,7 +129,7 @@ } if (m_VideoStream == -1) { - kDebug() << "Could not find video stream"; + qDebug() << "Could not find video stream"; return; } @@ -139,14 +139,14 @@ if (m_pVideoCodec == NULL) { // set to NULL, otherwise avcodec_close(m_pVideoCodecContext) crashes m_pVideoCodecContext = NULL; - kDebug() << "Video Codec not found"; + qDebug() << "Video Codec not found"; return; } m_pVideoCodecContext->workaround_bugs = 1; if (avcodec_open2(m_pVideoCodecContext, m_pVideoCodec, 0) < 0) { - kDebug() << "Could not open video codec"; + qDebug() << "Could not open video codec"; } } @@ -193,7 +193,7 @@ if (ret >= 0) { avcodec_flush_buffers(m_pFormatContext->streams[m_VideoStream]->codec); } else { - kDebug() << "Seeking in video failed"; + qDebug() << "Seeking in video failed"; return; } @@ -214,7 +214,7 @@ } while ((!gotFrame || !m_pFrame->key_frame) && keyFrameAttempts < 200); if (gotFrame == 0) { - kDebug() << "Seeking in video failed"; + qDebug() << "Seeking in video failed"; } } @@ -228,7 +228,7 @@ } if (!frameFinished) { - kDebug() << "decodeVideoFrame() failed: frame not finished"; + qDebug() << "decodeVideoFrame() failed: frame not finished"; return; } } @@ -250,7 +250,7 @@ #endif if (bytesDecoded < 0) { - kDebug() << "Failed to decode video frame: bytesDecoded < 0"; + qDebug() << "Failed to decode video frame: bytesDecoded < 0"; } return (frameFinished > 0); @@ -310,7 +310,7 @@ format, SWS_BICUBIC, NULL, NULL, NULL); if (NULL == scaleContext) { - kDebug() << "Failed to create resize context"; + qDebug() << "Failed to create resize context"; return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpegthumbs-15.08.3/ffmpegthumbnailer.cpp new/ffmpegthumbs-15.12.0/ffmpegthumbnailer.cpp --- old/ffmpegthumbs-15.08.3/ffmpegthumbnailer.cpp 2015-04-03 06:45:28.000000000 +0200 +++ new/ffmpegthumbs-15.12.0/ffmpegthumbnailer.cpp 2015-11-07 19:53:05.000000000 +0100 @@ -15,12 +15,11 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "ffmpegthumbnailer.h" -#include <kdebug.h> #include <QImage> extern "C" { - KDE_EXPORT ThumbCreator* new_creator() + Q_DECL_EXPORT ThumbCreator *new_creator() { return new FFMpegThumbnailer(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpegthumbs-15.08.3/tests/CMakeLists.txt new/ffmpegthumbs-15.12.0/tests/CMakeLists.txt --- old/ffmpegthumbs-15.08.3/tests/CMakeLists.txt 2015-04-03 06:45:28.000000000 +0200 +++ new/ffmpegthumbs-15.12.0/tests/CMakeLists.txt 2015-11-07 19:53:05.000000000 +0100 @@ -17,9 +17,9 @@ ) -kde4_add_executable(ffmpegthumbtest ${ffmpegthumbtest_SRCS} ) +add_executable(ffmpegthumbtest ${ffmpegthumbtest_SRCS} ) -target_link_libraries(ffmpegthumbtest ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${AVUTIL_LIBRARIES} ${AVFORMAT_LIBRARIES} ${AVCODEC_LIBRARIES} ${SWSCALE_LIBRARIES}) +target_link_libraries(ffmpegthumbtest Qt5::Gui KF5::KIOWidgets ${AVUTIL_LIBRARIES} ${AVFORMAT_LIBRARIES} ${AVCODEC_LIBRARIES} ${SWSCALE_LIBRARIES})
