commit c3867b7c386b3008ab1672e418d746a27b727063
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Nov 13 07:41:39 2021 +0000
Update to git snapshot
.gitignore | 1 +
add_audio_cover.patch | 4 ++--
ffmpegthumbnailer.spec | 29 +++++++++++++++--------------
sources | 2 +-
4 files changed, 19 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cac50f3..a0e4ce9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ ffmpegthumbnailer-2.0.9.tar.gz
/ffmpegthumbnailer-2.1.2.tar.gz
/ffmpegthumbnailer-2.2.0.tar.gz
/ffmpegthumbnailer-2.2.2.tar.gz
+/ffmpegthumbnailer-d92e191dd793b12cee0a0f685f5a8d8252988399.tar.gz
diff --git a/add_audio_cover.patch b/add_audio_cover.patch
index e5c4aed..b8e38dd 100644
--- a/add_audio_cover.patch
+++ b/add_audio_cover.patch
@@ -4,6 +4,6 @@
[Thumbnailer Entry]
TryExec=ffmpegthumbnailer
Exec=ffmpegthumbnailer -i %i -o %o -s %s -f
--MimeType=video/jpeg;video/mp4;video/mpeg;video/quicktime;video/x-ms-asf;video/x-ms-wm;video/x-ms-wmv;video/x-ms-asx;video/x-ms-wmx;video/x-ms-wvx;video/x-msvideo;video/x-flv;video/x-matroska;application/mxf;video/3gp;video/3gpp;video/dv;video/divx;video/fli;video/flv;video/mp2t;video/mp4v-es;video/msvideo;video/ogg;video/vivo;video/vnd.divx;video/vnd.mpegurl;video/vnd.rn-realvideo;application/vnd.rn-realmedia;video/vnd.vivo;video/webm;video/x-anim;video/x-avi;video/x-flc;video/x-fli;video/x-flic;video/x-m4v;video/x-mpeg;video/x-mpeg2;video/x-nsv;video/x-ogm+ogg;video/x-theora+ogg
-+MimeType=video/jpeg;video/mp4;video/mpeg;video/quicktime;video/x-ms-asf;video/x-ms-wm;video/x-ms-wmv;video/x-ms-asx;video/x-ms-wmx;video/x-ms-wvx;video/x-msvideo;video/x-flv;video/x-matroska;application/mxf;video/3gp;video/3gpp;video/dv;video/divx;video/fli;video/flv;video/mp2t;video/mp4v-es;video/msvideo;video/ogg;video/vivo;video/vnd.divx;video/vnd.mpegurl;video/vnd.rn-realvideo;application/vnd.rn-realmedia;video/vnd.vivo;video/webm;video/x-anim;video/x-avi;video/x-flc;video/x-fli;video/x-flic;video/x-m4v;video/x-mpeg;video/x-mpeg2;video/x-nsv;video/x-ogm+ogg;video/x-theora+ogg;audio/flac;audio/mpeg
+-MimeType=video/jpeg;video/mp4;video/mpeg;video/quicktime;video/x-ms-asf;video/x-ms-wm;video/x-ms-wmv;video/x-ms-asx;video/x-ms-wmx;video/x-ms-wvx;video/x-msvideo;video/x-flv;video/x-matroska;application/x-matroska;application/mxf;video/3gp;video/3gpp;video/dv;video/divx;video/fli;video/flv;video/mp2t;video/mp4v-es;video/msvideo;video/ogg;video/vivo;video/vnd.divx;video/vnd.mpegurl;video/vnd.rn-realvideo;application/vnd.rn-realmedia;video/vnd.vivo;video/webm;video/x-anim;video/x-avi;video/x-flc;video/x-fli;video/x-flic;video/x-m4v;video/x-mpeg;video/x-mpeg2;video/x-nsv;video/x-ogm+ogg;video/x-theora+ogg
++MimeType=video/jpeg;video/mp4;video/mpeg;video/quicktime;video/x-ms-asf;video/x-ms-wm;video/x-ms-wmv;video/x-ms-asx;video/x-ms-wmx;video/x-ms-wvx;video/x-msvideo;video/x-flv;video/x-matroska;application/x-matroska;application/mxf;video/3gp;video/3gpp;video/dv;video/divx;video/fli;video/flv;video/mp2t;video/mp4v-es;video/msvideo;video/ogg;video/vivo;video/vnd.divx;video/vnd.mpegurl;video/vnd.rn-realvideo;application/vnd.rn-realmedia;video/vnd.vivo;video/webm;video/x-anim;video/x-avi;video/x-flc;video/x-fli;video/x-flic;video/x-m4v;video/x-mpeg;video/x-mpeg2;video/x-nsv;video/x-ogm+ogg;video/x-theora+ogg;audio/flac;audio/mpeg
diff --git a/ffmpegthumbnailer.spec b/ffmpegthumbnailer.spec
index 2ee6638..a89e882 100644
--- a/ffmpegthumbnailer.spec
+++ b/ffmpegthumbnailer.spec
@@ -1,24 +1,23 @@
-%undefine __cmake_in_source_build
+%global commit d92e191dd793b12cee0a0f685f5a8d8252988399
+%global date 20210902
+%global shortcommit0 %(c=%{commit}; echo ${c:0:7})
Name: ffmpegthumbnailer
-Version: 2.2.2
-Release: 10%{?dist}
+Version: 2.2.3
+Release: 0.1%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist}
Summary: Lightweight video thumbnailer that can be used by file managers
License: GPLv2+
URL:
https://github.com/dirkvdb/%{name}
-Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
-Patch0:
%{url}/commit/339ebc5aa634b4680585d7c36317ab6f162ca2a9.patch#/fix_object_target.patch
-Patch1: add_audio_cover.patch
+Source0: %{url}/archive/%{commit}/%{name}-%{commit}.tar.gz
+Patch0: add_audio_cover.patch
BuildRequires: ffmpeg-devel
BuildRequires: libpng-devel
BuildRequires: libjpeg-devel
-BuildRequires: chrpath
-BuildRequires: cmake3
+BuildRequires: cmake
BuildRequires: ninja-build
BuildRequires: gcc-c++
-%{?el7:BuildRequires: epel-rpm-macros}
%description
@@ -33,18 +32,17 @@ This video thumbnailer can be used to create thumbnails for your video
files,
development package.
%prep
-%autosetup -p1
+%autosetup -p1 -n %{name}-%{commit}
chmod -x README INSTALL COPYING AUTHORS
%build
-%cmake3 -DENABLE_GIO=ON -DENABLE_THUMBNAILER=ON -GNinja
+%cmake -DENABLE_GIO=ON -DENABLE_THUMBNAILER=ON -GNinja
-%cmake3_build
+%cmake_build
%install
-%cmake3_install
-#chrpath --delete $RPM_BUILD_ROOT%%{_bindir}/ffmpegthumbnailer
+%cmake_install
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%ldconfig_scriptlets
@@ -66,6 +64,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%changelog
+* Sat Nov 13 2021 Leigh Scott <leigh123linux(a)gmail.com> -
2.2.3-0.1.20210902gitd92e191
+- Update to git snapshot
+
* Thu Nov 11 2021 Leigh Scott <leigh123linux(a)gmail.com> - 2.2.2-10
- Rebuilt for new ffmpeg snapshot
diff --git a/sources b/sources
index 2b00b70..91354f3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ffmpegthumbnailer-2.2.2.tar.gz) =
f18f7293074a818e7937f62eb9616fb1e2a7c3451147581894676e64f8dc4edb4de046e2e86f23cec0a5b938c5b2181a91331e9a1dec0851c3f36b08886e617e
+SHA512 (ffmpegthumbnailer-d92e191dd793b12cee0a0f685f5a8d8252988399.tar.gz) =
5af558e73278fd1522fee87b228c3c3e9363772ea861472653064407f1120e71481c9eeadc85cb8a6bbd045c7fda649df68764145042e319fcefbd65e135cd67