commit 9592b33d6a7565ca733c77cfa0848a41287b540c Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Wed Jan 8 10:30:29 2020 +0000 Update ffmpegthumbnailer to 2.2.2 .gitignore | 1 + ffmpegthumbnailer.spec | 24 ++++++++++++++------- fix_object_target.patch | 57 +++++++++++++++++++++++++++++++++++++++++++++++++ sources | 2 +- 4 files changed, 75 insertions(+), 9 deletions(-) --- diff --git a/.gitignore b/.gitignore index 18f7113..cac50f3 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ ffmpegthumbnailer-2.0.9.tar.gz /ffmpegthumbnailer-2.1.1.tar.gz /ffmpegthumbnailer-2.1.2.tar.gz /ffmpegthumbnailer-2.2.0.tar.gz +/ffmpegthumbnailer-2.2.2.tar.gz diff --git a/ffmpegthumbnailer.spec b/ffmpegthumbnailer.spec index 3c2fe5a..5d068b2 100644 --- a/ffmpegthumbnailer.spec +++ b/ffmpegthumbnailer.spec @@ -1,14 +1,19 @@ Name: ffmpegthumbnailer -Version: 2.2.0 -Release: 9%{?dist} +Version: 2.2.2 +Release: 1%{?dist} Summary: Lightweight video thumbnailer that can be used by file managers License: GPLv2+ -URL: http://code.google.com/p/ffmpegthumbnailer/ -Source0: https://github.com/dirkvdb/%{name}/archive/%{version}/%{name}-%{version}.... - -BuildRequires: ffmpeg-devel, libpng-devel, libjpeg-devel -BuildRequires: chrpath, cmake3, gcc-c++ +URL: https://github.com/dirkvdb/%{name} +Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +Patch0: %{url}/commit/339ebc5aa634b4680585d7c36317ab6f162ca2a9.patch#/fix_object_target.patch + +BuildRequires: ffmpeg-devel +BuildRequires: libpng-devel +BuildRequires: libjpeg-devel +BuildRequires: chrpath +BuildRequires: cmake3 +BuildRequires: gcc-c++ %{?el7:BuildRequires: epel-rpm-macros} @@ -24,7 +29,7 @@ This video thumbnailer can be used to create thumbnails for your video files, development package. %prep -%setup -q +%autosetup -p1 chmod -x README INSTALL COPYING AUTHORS %build @@ -57,6 +62,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Wed Jan 08 2020 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 2.2.2-1 +- Update ffmpegthumbnailer to 2.2.2 + * Tue Aug 06 2019 Leigh Scott <leigh123linux(a)gmail.com&gt; - 2.2.0-9 - Rebuild for new ffmpeg version diff --git a/fix_object_target.patch b/fix_object_target.patch new file mode 100644 index 0000000..e332f7e --- /dev/null +++ b/fix_object_target.patch @@ -0,0 +1,57 @@ +From 339ebc5aa634b4680585d7c36317ab6f162ca2a9 Mon Sep 17 00:00:00 2001 +From: Dirk Vanden Boer <dirk.vdb(a)gmail.com&gt; +Date: Tue, 7 Jan 2020 13:00:59 +0100 +Subject: [PATCH] Fixed object target configuration + +--- + CMakeLists.txt | 23 +++++++++++------------ + 1 file changed, 11 insertions(+), 12 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 671b93a..8616c56 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -92,6 +92,15 @@ add_library(libffmpegthumbnailerobj OBJECT + libffmpegthumbnailer/filmstripfilter.cpp + ) + ++target_link_libraries(libffmpegthumbnailerobj ++ FFmpeg::avformat ++ FFmpeg::avcodec ++ FFmpeg::avutil ++ FFmpeg::avfilter ++ $<$<BOOL:${HAVE_JPEG}>:${JPEG_LIBRARIES}> ++ $<$<BOOL:${HAVE_PNG}>:PNG::PNG> ++) ++ + # we use our own deprecated struct menbers, so disable the warning about it + set_source_files_properties(libffmpegthumbnailer/videothumbnailerc.cpp PROPERTIES COMPILE_FLAGS -Wno-deprecated-declarations) + +@@ -118,12 +127,7 @@ set (FFMPEGTHUMBNAILER_SOVERSION_AGE 1) + if (ENABLE_STATIC) + add_library(libffmpegthumbnailerstatic STATIC $<TARGET_OBJECTS:libffmpegthumbnailerobj>) + target_link_libraries(libffmpegthumbnailerstatic +- FFmpeg::avformat +- FFmpeg::avcodec +- FFmpeg::avutil +- FFmpeg::avfilter +- $<$<BOOL:${HAVE_JPEG}>:${JPEG_LIBRARIES}> +- $<$<BOOL:${HAVE_PNG}>:PNG::PNG> ++ libffmpegthumbnailerobj + $<$<BOOL:${ENABLE_GIO}>:${CMAKE_DL_LIBS}> + ) + +@@ -140,12 +144,7 @@ endif () + if (ENABLE_SHARED) + add_library(libffmpegthumbnailer SHARED $<TARGET_OBJECTS:libffmpegthumbnailerobj>) + target_link_libraries(libffmpegthumbnailer +- FFmpeg::avformat +- FFmpeg::avcodec +- FFmpeg::avutil +- FFmpeg::avfilter +- $<$<BOOL:${HAVE_JPEG}>:${JPEG_LIBRARIES}> +- $<$<BOOL:${HAVE_PNG}>:PNG::PNG> ++ libffmpegthumbnailerobj + ) + + set_target_properties(libffmpegthumbnailer PROPERTIES diff --git a/sources b/sources index 43d0dfe..2b00b70 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2832537a6793593b464c3b8f8d252a62 ffmpegthumbnailer-2.2.0.tar.gz +SHA512 (ffmpegthumbnailer-2.2.2.tar.gz) = f18f7293074a818e7937f62eb9616fb1e2a7c3451147581894676e64f8dc4edb4de046e2e86f23cec0a5b938c5b2181a91331e9a1dec0851c3f36b08886e617e