[comskip] Update to git snapshot
commit 87a8ab4ab75a596a8c1c06048e13b6efbb92b9cd
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Mar 6 07:55:00 2022 +0000
Update to git snapshot
.gitignore | 1 +
comskip.spec | 30 ++++++++++++++++++++----------
sources | 2 +-
3 files changed, 22 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6f05419..3411a66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/v0.82.003.tar.gz
/0.82.009.tar.gz
/Comskip-0.82.009.tar.gz
+/Comskip-9900227.tar.gz
diff --git a/comskip.spec b/comskip.spec
index 9c0e4ee..94c04ad 100644
--- a/comskip.spec
+++ b/comskip.spec
@@ -1,28 +1,34 @@
-%global _lto_cflags %{nil}
-# suppress gcc-10 FTBFS
-%define _legacy_common_support 1
+%global date 20220225
+%global commit 9900227ae759e631e29abbbce99df6742651cfc5
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
Name: comskip
-Version: 0.82.009
-Release: 7%{?dist}
+Version: 0.82.011
+Release: 0.1.%{date}git%{shortcommit}%{?dist}
Summary: A free commercial detector
License: GPLv2+
URL: https://github.com/erikkaashoek/Comskip
-Source0: %{url}/archive/%{version}/Comskip-%{version}.tar.gz
+Source0: %{url}/archive/%{commit}/Comskip-%{shortcommit}.tar.gz
BuildRequires: libtool
BuildRequires: argtable-devel
+%if 0%{?fedora} && 0%{?fedora} > 35
+BuildRequires: compat-ffmpeg4-devel
+%else
BuildRequires: ffmpeg-devel
+%endif
%description
Comskip is a free commercial detector written by erikkaashoek
%prep
-%autosetup -p1 -n Comskip-%{version}
+%autosetup -p1 -n Comskip-%{commit}
+NOCONFIGURE=1 ./autogen.sh
%build
-./autogen.sh
-# suppress deprecated-declarations
-export CFLAGS='%{optflags} -Wno-deprecated-declarations'
+%if 0%{?fedora} && 0%{?fedora} > 35
+export PKG_CONFIG_PATH="%{_libdir}/compat-ffmpeg4/pkgconfig"
+%endif
%configure --disable-gui
%make_build
@@ -34,6 +40,10 @@ export CFLAGS='%{optflags} -Wno-deprecated-declarations'
%{_bindir}/comskip
%changelog
+* Sun Mar 06 2022 Leigh Scott <leigh123linux(a)gmail.com> -
0.82.011-0.1.20220225git9900227
+- Update to git snapshot
+- Switch to compat-ffmpeg4
+
* Wed Feb 09 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> -
0.82.009-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
diff --git a/sources b/sources
index 17dd47a..25b5ad3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Comskip-0.82.009.tar.gz) =
996ae5447fc1e69b534ddf76cbcfeebc8bca0c4c40335a9348a24b5a9d19738c18d3ae970ca8f166d04c9a5ea6e89eba9e698d54c42c96a3133442fd8c3811d7
+SHA512 (Comskip-9900227.tar.gz) =
b73dbb364f545ced1bd614cb9585efca752343e71a7941c9d23e27c2e87e2d85f3e36be9e50e28005b2db03ae9aac6bb78e6189110208a328c6f8b20e633c31c