From 9a1df1270af065c00e993279ad77c31ff1324916 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 12 Apr 2009 18:18:51 +0000 Subject: [PATCH 01/73] Setup of module frei0r-plugins --- .cvsignore | 0 Makefile | 21 +++++++++++++++++++++ sources | 0 3 files changed, 21 insertions(+) create mode 100644 .cvsignore create mode 100644 Makefile create mode 100644 sources diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..e69de29 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..60f002c --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# Makefile for source rpm: frei0r-plugins +# $Id$ +NAME := frei0r-plugins +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From 51af6219b273d4afb4e7e4865d512acb34dbfbaf Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 14 Apr 2009 09:02:17 +0000 Subject: [PATCH 02/73] Initial import for Rawhide --- .cvsignore | 1 + frei0r-plugins-1.1.21-libdir.patch | 24 ++++++++++ frei0r-plugins.spec | 70 ++++++++++++++++++++++++++++++ import.log | 1 + sources | 1 + 5 files changed, 97 insertions(+) create mode 100644 frei0r-plugins-1.1.21-libdir.patch create mode 100644 frei0r-plugins.spec create mode 100644 import.log diff --git a/.cvsignore b/.cvsignore index e69de29..3d7a6fa 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +frei0r-plugins-1.1.22.tar.gz diff --git a/frei0r-plugins-1.1.21-libdir.patch b/frei0r-plugins-1.1.21-libdir.patch new file mode 100644 index 0000000..70d2032 --- /dev/null +++ b/frei0r-plugins-1.1.21-libdir.patch @@ -0,0 +1,24 @@ +diff -up frei0r-plugins-1.1.21/src/Makefile.am.libdir frei0r-plugins-1.1.21/src/Makefile.am +--- frei0r-plugins-1.1.21/src/Makefile.am.libdir 2008-06-07 15:21:48.000000000 +0200 ++++ frei0r-plugins-1.1.21/src/Makefile.am 2008-06-07 15:23:30.000000000 +0200 +@@ -112,7 +112,7 @@ AM_CPPFLAGS = -I@top_srcdir@/include + AM_CFLAGS = -I@top_srcdir@/include + AM_LDFLAGS = -module -avoid-version -Wc,-nostartfiles + +-plugindir = @prefix@/lib/frei0r-1 ++plugindir = @libdir@/frei0r-1 + + + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) +diff -up frei0r-plugins-1.1.21/src/Makefile.in.libdir frei0r-plugins-1.1.21/src/Makefile.in +--- frei0r-plugins-1.1.21/src/Makefile.in.libdir 2008-06-07 15:21:44.000000000 +0200 ++++ frei0r-plugins-1.1.21/src/Makefile.in 2008-06-07 15:23:08.000000000 +0200 +@@ -583,7 +583,7 @@ RGB_la_SOURCES = mixer3/RGB/RGB.c + AM_CPPFLAGS = -I@top_srcdir@/include + AM_CFLAGS = -I@top_srcdir@/include + AM_LDFLAGS = -module -avoid-version -Wc,-nostartfiles +-plugindir = @prefix@/lib/frei0r-1 ++plugindir = @libdir@/frei0r-1 + all: all-am + + .SUFFIXES: diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec new file mode 100644 index 0000000..52fb2b1 --- /dev/null +++ b/frei0r-plugins.spec @@ -0,0 +1,70 @@ +Name: frei0r-plugins +Version: 1.1.22 +Release: 1%{?dist} +Summary: Frei0r - a minimalistic plugin API for video effects + +Group: System Environment/Libraries +License: GPLv2+ +URL: http://www.piksel.org/frei0r +Source0: http://propirate.net/frei0r/frei0r-plugins-%{version}.tar.gz +Patch0: frei0r-plugins-1.1.21-libdir.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: gavl-devel >= 0.2.3 +BuildRequires: opencv-devel >= 1.0.0 + + +%description +It is a minimalistic plugin API for video sources and filters. The behaviour of +the effects can be controlled from the host by simple parameters. The intent is +to solve the recurring reimplementation or adaptation issue of standard effect + +%package -n frei0r-devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description -n frei0r-devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + +%prep +%setup -q +%if %{_lib} == lib64 +%patch0 -p1 -b .libdir +%endif + +%build +%configure --disable-static +make %{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING README +%{_libdir}/frei0r-1/*.so + +%files -n frei0r-devel +%defattr(-,root,root,-) +%{_includedir}/frei0r.h + +%changelog +* Tue Mar 24 2009 kwizart < kwizart at gmail.com > - 1.1.22-1 +- Update to 1.1.22 +- Prevent timestamp change when installing + +* Tue Jul 22 2008 kwizart < kwizart at gmail.com > - 1.1.21-2 +- Add gcc43 patches + +* Sat Jun 7 2008 kwizart < kwizart at gmail.com > - 1.1.21-1 +- Initial spec file for Fedora. + diff --git a/import.log b/import.log new file mode 100644 index 0000000..0623225 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +frei0r-plugins-1_1_22-1_fc10:HEAD:frei0r-plugins-1.1.22-1.fc10.src.rpm:1239699754 diff --git a/sources b/sources index e69de29..a3523e5 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +8123893c67fc5ce01ddcb09853d47ed4 frei0r-plugins-1.1.22.tar.gz From 4e095a328b56939ddcfe93b2de35f5f8f9039c6f Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 23 May 2009 00:14:26 +0000 Subject: [PATCH 03/73] Rebuild for opencv --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index 52fb2b1..29f1939 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.1.22 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Frei0r - a minimalistic plugin API for video effects Group: System Environment/Libraries @@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/frei0r.h %changelog +* Fri May 22 2009 kwizart < kwizart at gmail.com > - 1.1.22-2 +- Rebuild for opencv + * Tue Mar 24 2009 kwizart < kwizart at gmail.com > - 1.1.22-1 - Update to 1.1.22 - Prevent timestamp change when installing From 589c7620025b06a91fcd20642ecb8d81ca5c653b Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 24 Jul 2009 23:12:29 +0000 Subject: [PATCH 04/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index 29f1939..389c8ee 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.1.22 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Frei0r - a minimalistic plugin API for video effects Group: System Environment/Libraries @@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/frei0r.h %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 1.1.22-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Fri May 22 2009 kwizart < kwizart at gmail.com > - 1.1.22-2 - Rebuild for opencv From 6176f6eae9c38de816ee2b023ae616a2aafcd01a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:16:29 +0000 Subject: [PATCH 05/73] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 60f002c..f5cac77 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: frei0r-plugins -# $Id$ +# $Id: Makefile,v 1.1 2009/04/12 18:18:51 kevin Exp $ NAME := frei0r-plugins SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From bd2d8311f47bb2a238f1306d994f67a54813f1dd Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 27 Feb 2010 18:40:32 +0000 Subject: [PATCH 06/73] Rebuild for opencv --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index 389c8ee..b87bca2 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.1.22 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Frei0r - a minimalistic plugin API for video effects Group: System Environment/Libraries @@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/frei0r.h %changelog +* Sat Feb 27 2010 Nicolas Chauvet - 1.1.22-4 +- Rebuild for opencv SO version change + * Fri Jul 24 2009 Fedora Release Engineering - 1.1.22-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 706bb07c0fc9d3f93316ebb59b8080aa0331a25b Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 26 Jun 2010 11:50:49 +0000 Subject: [PATCH 07/73] Rebuilt --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index b87bca2..66f9918 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.1.22 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Frei0r - a minimalistic plugin API for video effects Group: System Environment/Libraries @@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/frei0r.h %changelog +* Sat Jun 26 2010 Nicolas Chauvet - 1.1.22-5 +- Rebuilt for opencv + * Sat Feb 27 2010 Nicolas Chauvet - 1.1.22-4 - Rebuild for opencv SO version change From 91c4e26d89b312182c1a340cb094490f4fd9d431 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 14:49:03 +0000 Subject: [PATCH 08/73] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index f5cac77..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: frei0r-plugins -# $Id: Makefile,v 1.1 2009/04/12 18:18:51 kevin Exp $ -NAME := frei0r-plugins -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index 0623225..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -frei0r-plugins-1_1_22-1_fc10:HEAD:frei0r-plugins-1.1.22-1.fc10.src.rpm:1239699754 From 6b27e204bd9d5c24df384d6b8ffedcededb6a5ba Mon Sep 17 00:00:00 2001 From: kwizart Date: Fri, 26 Nov 2010 15:16:26 +0100 Subject: [PATCH 09/73] Update to 1.2.1 --- .gitignore | 1 + frei0r-plugins-1.1.21-libdir.patch | 24 ------------------------ frei0r-plugins.spec | 19 ++++++++++++------- sources | 2 +- 4 files changed, 14 insertions(+), 32 deletions(-) delete mode 100644 frei0r-plugins-1.1.21-libdir.patch diff --git a/.gitignore b/.gitignore index 3d7a6fa..46229fe 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ frei0r-plugins-1.1.22.tar.gz +/frei0r-plugins-1.2.1.tar.gz diff --git a/frei0r-plugins-1.1.21-libdir.patch b/frei0r-plugins-1.1.21-libdir.patch deleted file mode 100644 index 70d2032..0000000 --- a/frei0r-plugins-1.1.21-libdir.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up frei0r-plugins-1.1.21/src/Makefile.am.libdir frei0r-plugins-1.1.21/src/Makefile.am ---- frei0r-plugins-1.1.21/src/Makefile.am.libdir 2008-06-07 15:21:48.000000000 +0200 -+++ frei0r-plugins-1.1.21/src/Makefile.am 2008-06-07 15:23:30.000000000 +0200 -@@ -112,7 +112,7 @@ AM_CPPFLAGS = -I@top_srcdir@/include - AM_CFLAGS = -I@top_srcdir@/include - AM_LDFLAGS = -module -avoid-version -Wc,-nostartfiles - --plugindir = @prefix@/lib/frei0r-1 -+plugindir = @libdir@/frei0r-1 - - - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) -diff -up frei0r-plugins-1.1.21/src/Makefile.in.libdir frei0r-plugins-1.1.21/src/Makefile.in ---- frei0r-plugins-1.1.21/src/Makefile.in.libdir 2008-06-07 15:21:44.000000000 +0200 -+++ frei0r-plugins-1.1.21/src/Makefile.in 2008-06-07 15:23:08.000000000 +0200 -@@ -583,7 +583,7 @@ RGB_la_SOURCES = mixer3/RGB/RGB.c - AM_CPPFLAGS = -I@top_srcdir@/include - AM_CFLAGS = -I@top_srcdir@/include - AM_LDFLAGS = -module -avoid-version -Wc,-nostartfiles --plugindir = @prefix@/lib/frei0r-1 -+plugindir = @libdir@/frei0r-1 - all: all-am - - .SUFFIXES: diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index 66f9918..2f6f597 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,13 +1,12 @@ Name: frei0r-plugins -Version: 1.1.22 -Release: 5%{?dist} +Version: 1.2.1 +Release: 1%{?dist} Summary: Frei0r - a minimalistic plugin API for video effects Group: System Environment/Libraries License: GPLv2+ URL: http://www.piksel.org/frei0r Source0: http://propirate.net/frei0r/frei0r-plugins-%{version}.tar.gz -Patch0: frei0r-plugins-1.1.21-libdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gavl-devel >= 0.2.3 @@ -30,9 +29,7 @@ developing applications that use %{name}. %prep %setup -q -%if %{_lib} == lib64 -%patch0 -p1 -b .libdir -%endif + %build %configure --disable-static @@ -43,6 +40,10 @@ make %{?_smp_mflags} rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +#Remove installed doc +rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name} + + %clean rm -rf $RPM_BUILD_ROOT @@ -50,14 +51,18 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc AUTHORS COPYING README +%doc AUTHORS COPYING README TODO %{_libdir}/frei0r-1/*.so %files -n frei0r-devel %defattr(-,root,root,-) %{_includedir}/frei0r.h +%{_libdir}/pkgconfig/frei0r.pc %changelog +* Fri Nov 26 2010 Nicolas Chauvet - 1.2.1-1 +- Update to 1.2.1 + * Sat Jun 26 2010 Nicolas Chauvet - 1.1.22-5 - Rebuilt for opencv diff --git a/sources b/sources index a3523e5..d5b2dc4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8123893c67fc5ce01ddcb09853d47ed4 frei0r-plugins-1.1.22.tar.gz +e46089c27cdf1deb5e27e24520791ddb frei0r-plugins-1.2.1.tar.gz From c275deb0950546fdc0edc96b76d4ad8afe25ff56 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 6 Jan 2011 21:33:33 +0100 Subject: [PATCH 10/73] Rebuild for OpenCV 2.2 --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index 2f6f597..7cf7824 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Frei0r - a minimalistic plugin API for video effects Group: System Environment/Libraries @@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/frei0r.pc %changelog +* Thu Jan 06 2011 Nicolas Chauvet - 1.2.1-2 +- Rebuild for OpenCV 2.2 + * Fri Nov 26 2010 Nicolas Chauvet - 1.2.1-1 - Update to 1.2.1 From a42e80450a645de8a5917fc5b71c372a65486511 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 15:45:15 -0600 Subject: [PATCH 11/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index 7cf7824..61dd85b 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Frei0r - a minimalistic plugin API for video effects Group: System Environment/Libraries @@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/frei0r.pc %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 1.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Thu Jan 06 2011 Nicolas Chauvet - 1.2.1-2 - Rebuild for OpenCV 2.2 From 917754e825f19b7d9b63d1593c73ae0f0ffadbd4 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 27 May 2011 16:10:37 +0200 Subject: [PATCH 12/73] Update to 1.3 --- .gitignore | 1 + frei0r-plugins.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 46229fe..b22c31c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ frei0r-plugins-1.1.22.tar.gz /frei0r-plugins-1.2.1.tar.gz +/frei0r-plugins-1.3.tar.gz diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index 61dd85b..aba0115 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins -Version: 1.2.1 -Release: 3%{?dist} +Version: 1.3 +Release: 1%{?dist} Summary: Frei0r - a minimalistic plugin API for video effects Group: System Environment/Libraries @@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/frei0r.pc %changelog +* Fri May 27 2011 Nicolas Chauvet - 1.3-1 +- Update to 1.3 + * Tue Feb 08 2011 Fedora Release Engineering - 1.2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index d5b2dc4..1c5b208 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e46089c27cdf1deb5e27e24520791ddb frei0r-plugins-1.2.1.tar.gz +a2eb63feeeb0c5cf439ccca276cbf70c frei0r-plugins-1.3.tar.gz From 18ac20f8d19b11586a58f0bacce841fa041c2794 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 27 May 2011 16:29:08 +0200 Subject: [PATCH 13/73] Fix %%setup --- frei0r-plugins.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index aba0115..fea553c 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -28,7 +28,7 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep -%setup -q +%setup -q -n frei0r-%{version} %build From e0b31e236f637ebf0655cf9fad812e7ae5d32a9f Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 21 Aug 2011 12:48:28 +0200 Subject: [PATCH 14/73] Rebuild for OpenCV 2.3.1 --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index fea553c..ee1104b 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Frei0r - a minimalistic plugin API for video effects Group: System Environment/Libraries @@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/frei0r.pc %changelog +* Sun Aug 21 2011 Nicolas Chauvet - 1.3-2 +- Rebuild for OpenCV 2.3.1 + * Fri May 27 2011 Nicolas Chauvet - 1.3-1 - Update to 1.3 From a99790d1eb921e64c4f9314516ddef3c4788c6b3 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 21 Aug 2011 13:12:23 +0200 Subject: [PATCH 15/73] Rebuild again --- frei0r-plugins.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index ee1104b..f291b2d 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Frei0r - a minimalistic plugin API for video effects Group: System Environment/Libraries @@ -60,7 +60,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/frei0r.pc %changelog -* Sun Aug 21 2011 Nicolas Chauvet - 1.3-2 +* Sun Aug 21 2011 Nicolas Chauvet - 1.3-3 - Rebuild for OpenCV 2.3.1 * Fri May 27 2011 Nicolas Chauvet - 1.3-1 From 5eb0511251ffc38f10f0ff9ae5ad63ba6d8ae37f Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 10 Oct 2011 21:17:54 +0200 Subject: [PATCH 16/73] - Fix unowned directory - rhbz#744889 --- frei0r-plugins.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index f291b2d..4037f53 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Frei0r - a minimalistic plugin API for video effects Group: System Environment/Libraries @@ -52,6 +52,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS COPYING README TODO +%dir %{_libdir}/frei0r-1 %{_libdir}/frei0r-1/*.so %files -n frei0r-devel @@ -60,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/frei0r.pc %changelog +* Mon Oct 10 2011 Nicolas Chauvet - 1.3-4 +- Fix unowned directory - rhbz#744889 + * Sun Aug 21 2011 Nicolas Chauvet - 1.3-3 - Rebuild for OpenCV 2.3.1 From 3b6b2505bd0973a164373ec13e38e4865f6ae0f9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 20:45:17 -0600 Subject: [PATCH 17/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index 4037f53..9173de0 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Frei0r - a minimalistic plugin API for video effects Group: System Environment/Libraries @@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/frei0r.pc %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 1.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Oct 10 2011 Nicolas Chauvet - 1.3-4 - Fix unowned directory - rhbz#744889 From eb6e842871df771b16f883bb659ebdec3f87d930 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 10 Jul 2012 11:38:56 +0200 Subject: [PATCH 18/73] Rebuilt for OpenCV 2.4.2 --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index 9173de0..06328f9 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Frei0r - a minimalistic plugin API for video effects Group: System Environment/Libraries @@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/frei0r.pc %changelog +* Tue Jul 10 2012 Nicolas Chauvet - 1.3-6 +- Rebuilt for OpenCV 2.4.2 + * Fri Jan 13 2012 Fedora Release Engineering - 1.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 858a7ab5a25539739ca1673e6abe630bd0e32b82 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 22:18:58 -0500 Subject: [PATCH 19/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index 06328f9..5ac51ca 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Frei0r - a minimalistic plugin API for video effects Group: System Environment/Libraries @@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/frei0r.pc %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 1.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Tue Jul 10 2012 Nicolas Chauvet - 1.3-6 - Rebuilt for OpenCV 2.4.2 From 6a62bbd246fa132764a212b920e5e9ef430ae029 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 10 Nov 2012 17:40:13 +0100 Subject: [PATCH 20/73] Fix description Rebuilt for opencv --- frei0r-plugins.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index 5ac51ca..db43dc5 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,7 +1,7 @@ Name: frei0r-plugins Version: 1.3 -Release: 7%{?dist} -Summary: Frei0r - a minimalistic plugin API for video effects +Release: 8%{?dist} +Summary: Frei0r - a minimalist plugin API for video effects Group: System Environment/Libraries License: GPLv2+ @@ -14,9 +14,9 @@ BuildRequires: opencv-devel >= 1.0.0 %description -It is a minimalistic plugin API for video sources and filters. The behaviour of +It is a minimalist plugin API for video sources and filters. The behavior of the effects can be controlled from the host by simple parameters. The intent is -to solve the recurring reimplementation or adaptation issue of standard effect +to solve the recurring re-implementation or adaptation issue of standard effect %package -n frei0r-devel Summary: Development files for %{name} @@ -61,6 +61,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/frei0r.pc %changelog +* Sat Nov 10 2012 Nicolas Chauvet - 1.3-8 +- Rebuilt for opencv built without nonfree/gpu modules +- Improve description + * Thu Jul 19 2012 Fedora Release Engineering - 1.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 80c1fb03de7f0d4a60b15c005f50fa22f0230658 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 16:02:13 -0600 Subject: [PATCH 21/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index db43dc5..9e37205 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Frei0r - a minimalist plugin API for video effects Group: System Environment/Libraries @@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/frei0r.pc %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 1.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sat Nov 10 2012 Nicolas Chauvet - 1.3-8 - Rebuilt for opencv built without nonfree/gpu modules - Improve description From 3a3f606ba2d88d1e27c07c13b59ff39af96e51b7 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 6 May 2013 10:48:16 -0400 Subject: [PATCH 22/73] frei0r-plugins: Move OpenCV plugins to a subpackage For the F19 live DVD we have cheese -> gnome-video-effects ->frei0r-plugins -> opencv, the last being 31M on disk (20 of which, appallingly, is XML). opencv is only used for the face-detection plugins in frei0r. The only other consumer of frei0r-plugins in the OS is pitivi, and neither it nor g-v-e uses the face-detection plugins. Move them to a subpackage to break the dep chain. Signed-off-by: Adam Jackson --- frei0r-plugins.spec | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index 9e37205..908bdcf 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,13 +1,12 @@ Name: frei0r-plugins Version: 1.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Frei0r - a minimalist plugin API for video effects Group: System Environment/Libraries License: GPLv2+ URL: http://www.piksel.org/frei0r Source0: http://propirate.net/frei0r/frei0r-plugins-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gavl-devel >= 0.2.3 BuildRequires: opencv-devel >= 1.0.0 @@ -18,6 +17,14 @@ It is a minimalist plugin API for video sources and filters. The behavior of the effects can be controlled from the host by simple parameters. The intent is to solve the recurring re-implementation or adaptation issue of standard effect +%package opencv +Summary: Frei0r plugins using OpenCV +Group: System Environment/License +Requires: %{name} = %{version}-%{release} + +%description opencv +Frei0r plugins that use the OpenCV computer vision framework. + %package -n frei0r-devel Summary: Development files for %{name} Group: Development/Libraries @@ -53,14 +60,24 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc AUTHORS COPYING README TODO %dir %{_libdir}/frei0r-1 +%exclude %{_libdir}/frei0r-1/facebl0r.so +%exclude %{_libdir}/frei0r-1/facedetect.so %{_libdir}/frei0r-1/*.so +%files opencv +%defattr(-,root,root,-) +%{_libdir}/frei0r-1/facebl0r.so +%{_libdir}/frei0r-1/facedetect.so + %files -n frei0r-devel %defattr(-,root,root,-) %{_includedir}/frei0r.h %{_libdir}/pkgconfig/frei0r.pc %changelog +* Mon May 06 2013 Adam Jackson 1.3-10 +- Move OpenCV plugins to a subpackage + * Wed Feb 13 2013 Fedora Release Engineering - 1.3-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From ea1a2c3c0b3f26034876adef80013a04faaa5d69 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 17 Jul 2013 09:54:01 -0400 Subject: [PATCH 23/73] fix source url --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index 908bdcf..0799eed 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -6,7 +6,7 @@ Summary: Frei0r - a minimalist plugin API for video effects Group: System Environment/Libraries License: GPLv2+ URL: http://www.piksel.org/frei0r -Source0: http://propirate.net/frei0r/frei0r-plugins-%{version}.tar.gz +Source0: http://www.piksel.no/frei0r/releases/frei0r-plugins-%{version}.tar.gz BuildRequires: gavl-devel >= 0.2.3 BuildRequires: opencv-devel >= 1.0.0 @@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/frei0r.pc %changelog +* Wed Jul 17 2013 Matthias Clasen 1.3-11 +- Fix source url + * Mon May 06 2013 Adam Jackson 1.3-10 - Move OpenCV plugins to a subpackage From 7c2090130e0a313d57a1e5075a280b79b9ac9207 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 06:58:56 -0500 Subject: [PATCH 24/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index 0799eed..3af30e4 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.3 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Frei0r - a minimalist plugin API for video effects Group: System Environment/Libraries @@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/frei0r.pc %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 1.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Jul 17 2013 Matthias Clasen 1.3-11 - Fix source url From 384ef86ee3721a5a16c1109d89aed09cec9cf186 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 14 Nov 2013 23:19:18 +0100 Subject: [PATCH 25/73] Update to 1.4 --- .gitignore | 1 + frei0r-plugins.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index b22c31c..80aa355 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ frei0r-plugins-1.1.22.tar.gz /frei0r-plugins-1.2.1.tar.gz /frei0r-plugins-1.3.tar.gz +/frei0r-plugins-1.4.tar.gz diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index 3af30e4..a3718f3 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins -Version: 1.3 -Release: 11%{?dist} +Version: 1.4 +Release: 1%{?dist} Summary: Frei0r - a minimalist plugin API for video effects Group: System Environment/Libraries @@ -35,7 +35,7 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep -%setup -q -n frei0r-%{version} +%setup -q %build @@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/frei0r.pc %changelog +* Wed Nov 13 2013 Nicolas Chauvet - 1.4-1 +- Update to 1.4 + * Sat Aug 03 2013 Fedora Release Engineering - 1.3-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 1c5b208..d5b547e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a2eb63feeeb0c5cf439ccca276cbf70c frei0r-plugins-1.3.tar.gz +202375d1bcb545c1b6eb8f34e0260ec5 frei0r-plugins-1.4.tar.gz From 9a330ede44d80135e171935879c0f28318eeda13 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 14 Nov 2013 23:28:12 +0100 Subject: [PATCH 26/73] Add missing BR --- frei0r-plugins.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index a3718f3..38354c3 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -8,8 +8,11 @@ License: GPLv2+ URL: http://www.piksel.org/frei0r Source0: http://www.piksel.no/frei0r/releases/frei0r-plugins-%{version}.tar.gz +Buildrequires: libtool + BuildRequires: gavl-devel >= 0.2.3 BuildRequires: opencv-devel >= 1.0.0 +BuildRequires: cairo-devel >= 1.0.0 %description From c2b99bb033aa8a98619a3cfea40053bb1cfd784b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 07:54:08 -0500 Subject: [PATCH 27/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index 38354c3..ec99ec2 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Frei0r - a minimalist plugin API for video effects Group: System Environment/Libraries @@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/frei0r.pc %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Wed Nov 13 2013 Nicolas Chauvet - 1.4-1 - Update to 1.4 From 9b1c9cfadf3ea7dfb552f1e3a30603b386961adb Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 16 Aug 2014 13:15:52 +0000 Subject: [PATCH 28/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index ec99ec2..ea44e15 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Frei0r - a minimalist plugin API for video effects Group: System Environment/Libraries @@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/frei0r.pc %changelog +* Sat Aug 16 2014 Fedora Release Engineering - 1.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 1.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 6991f426badaf96db65b38636aa9afb787c9f522 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 13:46:03 +0200 Subject: [PATCH 29/73] Rebuilt for GCC 5 C++11 ABI change --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index ea44e15..fab119c 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Frei0r - a minimalist plugin API for video effects Group: System Environment/Libraries @@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/frei0r.pc %changelog +* Sat May 02 2015 Kalev Lember - 1.4-4 +- Rebuilt for GCC 5 C++11 ABI change + * Sat Aug 16 2014 Fedora Release Engineering - 1.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From b98b52f6870b358a5182315a94a406dfae753dff Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 06:44:28 +0000 Subject: [PATCH 30/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index fab119c..cc471cc 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Frei0r - a minimalist plugin API for video effects Group: System Environment/Libraries @@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/frei0r.pc %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 1.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat May 02 2015 Kalev Lember - 1.4-4 - Rebuilt for GCC 5 C++11 ABI change From eeac3acedf3ed2dc21d9eae93c713a73d96370be Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 20:49:17 +0000 Subject: [PATCH 31/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index cc471cc..095ca55 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Frei0r - a minimalist plugin API for video effects Group: System Environment/Libraries @@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/frei0r.pc %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 1.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 1.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 2037dbe0206a043dcab88d9184219101b3347ca9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Fri, 6 May 2016 00:05:06 +0100 Subject: [PATCH 32/73] New upstream release - Spec modernization --- .gitignore | 1 + frei0r-plugins.spec | 28 +++++++++++++--------------- sources | 2 +- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 80aa355..32799b5 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ frei0r-plugins-1.1.22.tar.gz /frei0r-plugins-1.2.1.tar.gz /frei0r-plugins-1.3.tar.gz /frei0r-plugins-1.4.tar.gz +/frei0r-plugins-1.5.tar.gz diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index 095ca55..c8af7a3 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,12 +1,12 @@ Name: frei0r-plugins -Version: 1.4 -Release: 6%{?dist} +Version: 1.5 +Release: 1%{?dist} Summary: Frei0r - a minimalist plugin API for video effects Group: System Environment/Libraries License: GPLv2+ -URL: http://www.piksel.org/frei0r -Source0: http://www.piksel.no/frei0r/releases/frei0r-plugins-%{version}.tar.gz +URL: https://frei0r.dyne.org/ +Source0: https://github.com/ddennedy/frei0r/archive/v%{version}/frei0r-plugins-%{version}.tar.gz Buildrequires: libtool @@ -38,46 +38,44 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep -%setup -q +%setup -q -n frei0r-%{version} %build +mkdir -p m4 +autoreconf -i %configure --disable-static make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" #Remove installed doc rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name} - -%clean -rm -rf $RPM_BUILD_ROOT - - %files -%defattr(-,root,root,-) -%doc AUTHORS COPYING README TODO +%doc AUTHORS README TODO +%license COPYING %dir %{_libdir}/frei0r-1 %exclude %{_libdir}/frei0r-1/facebl0r.so %exclude %{_libdir}/frei0r-1/facedetect.so %{_libdir}/frei0r-1/*.so %files opencv -%defattr(-,root,root,-) %{_libdir}/frei0r-1/facebl0r.so %{_libdir}/frei0r-1/facedetect.so %files -n frei0r-devel -%defattr(-,root,root,-) %{_includedir}/frei0r.h %{_libdir}/pkgconfig/frei0r.pc %changelog +* Wed May 04 2016 Sérgio Basto - 1.5-1 +- New upstream release +- Spec modernization + * Wed Feb 03 2016 Fedora Release Engineering - 1.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index d5b547e..fa72b4b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -202375d1bcb545c1b6eb8f34e0260ec5 frei0r-plugins-1.4.tar.gz +db2d9bdea311a94c1bb8dae56f16a053 frei0r-plugins-1.5.tar.gz From 49763d574248ee2807186e028825a31b4afb5180 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 10 May 2016 02:28:49 +0100 Subject: [PATCH 33/73] Rebuild (opencv) --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index c8af7a3..ffcb846 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Frei0r - a minimalist plugin API for video effects Group: System Environment/Libraries @@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name} %{_libdir}/pkgconfig/frei0r.pc %changelog +* Tue May 10 2016 Sérgio Basto - 1.5-2 +- Rebuild (opencv) + * Wed May 04 2016 Sérgio Basto - 1.5-1 - New upstream release - Spec modernization From 0b37e2e5869fdda6ef34f18881e2f50b520c99a2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 10:01:57 +0000 Subject: [PATCH 34/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index ffcb846..85b0784 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Frei0r - a minimalist plugin API for video effects Group: System Environment/Libraries @@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name} %{_libdir}/pkgconfig/frei0r.pc %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Tue May 10 2016 Sérgio Basto - 1.5-2 - Rebuild (opencv) From 01bae6238ce227a51c1d6c6118c4cf72de6f40d1 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 28 Feb 2017 18:11:59 +0100 Subject: [PATCH 35/73] Rebuilt for OpenCV 3.2.0 --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index 85b0784..5efcd92 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Frei0r - a minimalist plugin API for video effects Group: System Environment/Libraries @@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name} %{_libdir}/pkgconfig/frei0r.pc %changelog +* Tue Feb 28 2017 Nicolas Chauvet - 1.5-4 +- Rebuilt for OpenCV 3.2.0 + * Fri Feb 10 2017 Fedora Release Engineering - 1.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 1fe6509156f6ed292fa7d12e2ca741b897abf38d Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 28 Feb 2017 20:44:04 +0100 Subject: [PATCH 36/73] Modernize spec file --- frei0r-plugins.spec | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index 5efcd92..f81ad84 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,9 +1,8 @@ Name: frei0r-plugins Version: 1.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Frei0r - a minimalist plugin API for video effects -Group: System Environment/Libraries License: GPLv2+ URL: https://frei0r.dyne.org/ Source0: https://github.com/ddennedy/frei0r/archive/v%{version}/frei0r-plugins-%{version}.tar.gz @@ -22,16 +21,14 @@ to solve the recurring re-implementation or adaptation issue of standard effect %package opencv Summary: Frei0r plugins using OpenCV -Group: System Environment/License -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description opencv Frei0r plugins that use the OpenCV computer vision framework. %package -n frei0r-devel Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description -n frei0r-devel The %{name}-devel package contains libraries and header files for @@ -72,8 +69,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name} %{_libdir}/pkgconfig/frei0r.pc %changelog -* Tue Feb 28 2017 Nicolas Chauvet - 1.5-4 +* Tue Feb 28 2017 Nicolas Chauvet - 1.5-5 - Rebuilt for OpenCV 3.2.0 +- Modenize spec file * Fri Feb 10 2017 Fedora Release Engineering - 1.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 70d21d62c810fddb85cd77ff0d45797a6446cd88 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 28 Feb 2017 20:51:23 +0100 Subject: [PATCH 37/73] Autosetup --- frei0r-plugins.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index f81ad84..c22cd1c 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Frei0r - a minimalist plugin API for video effects License: GPLv2+ @@ -35,21 +35,21 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep -%setup -q -n frei0r-%{version} +%autosetup %build mkdir -p m4 autoreconf -i %configure --disable-static -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +%make_install INSTALL="install -p" #Remove installed doc -rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name} +rm -rf %{buildroot}%{_docdir}/%{name} %files @@ -69,9 +69,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name} %{_libdir}/pkgconfig/frei0r.pc %changelog -* Tue Feb 28 2017 Nicolas Chauvet - 1.5-5 +* Tue Feb 28 2017 Nicolas Chauvet - 1.5-6 - Rebuilt for OpenCV 3.2.0 -- Modenize spec file +- Modernize spec file * Fri Feb 10 2017 Fedora Release Engineering - 1.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From db076a6b83ab46ff2f5a3e5c6f9c7d43d692d902 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 28 Feb 2017 20:57:20 +0100 Subject: [PATCH 38/73] Fixup --- frei0r-plugins.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index c22cd1c..eff662e 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -35,7 +35,7 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep -%autosetup +%autosetup -n frei0r-%{version} %build From b6faf18723e70c7faf4d85994af19d4aaa5d2e3f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 08:47:20 +0000 Subject: [PATCH 39/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index eff662e..4d73a01 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.5 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Frei0r - a minimalist plugin API for video effects License: GPLv2+ @@ -69,6 +69,9 @@ rm -rf %{buildroot}%{_docdir}/%{name} %{_libdir}/pkgconfig/frei0r.pc %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.5-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Tue Feb 28 2017 Nicolas Chauvet - 1.5-6 - Rebuilt for OpenCV 3.2.0 - Modernize spec file From 695635e66041c18ae31fb5a4a0100c84adbc4227 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 26 Jul 2017 17:46:00 +0200 Subject: [PATCH 40/73] Update to 1.6.1 --- .gitignore | 6 +----- frei0r-plugins.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 32799b5..db21868 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1 @@ -frei0r-plugins-1.1.22.tar.gz -/frei0r-plugins-1.2.1.tar.gz -/frei0r-plugins-1.3.tar.gz -/frei0r-plugins-1.4.tar.gz -/frei0r-plugins-1.5.tar.gz +frei0r-plugins-*.tar.gz diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index 4d73a01..b8b34e8 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,11 +1,11 @@ Name: frei0r-plugins -Version: 1.5 -Release: 7%{?dist} +Version: 1.6.1 +Release: 1%{?dist} Summary: Frei0r - a minimalist plugin API for video effects License: GPLv2+ URL: https://frei0r.dyne.org/ -Source0: https://github.com/ddennedy/frei0r/archive/v%{version}/frei0r-plugins-%{version}.tar.gz +Source0: https://github.com/dyne/frei0r/archive/v%{version}/frei0r-plugins-%{version}.tar.gz Buildrequires: libtool @@ -69,6 +69,9 @@ rm -rf %{buildroot}%{_docdir}/%{name} %{_libdir}/pkgconfig/frei0r.pc %changelog +* Wed Jul 26 2017 Nicolas Chauvet - 1.6.1-1 +- Update to 1.6.1 + * Wed Jul 26 2017 Fedora Release Engineering - 1.5-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index fa72b4b..f835e9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -db2d9bdea311a94c1bb8dae56f16a053 frei0r-plugins-1.5.tar.gz +SHA512 (frei0r-plugins-1.6.1.tar.gz) = 013ccc9a58049b5a07049965db50255e488bab469df2d395017a5bcde4bede1a157f642d331fd0322046b12851fca650c447ee9ffb7cd7f307b2be2e1a62f29c From 1020d2f2195a0964794472668007ebace8b88438 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 26 Jul 2017 19:28:23 +0200 Subject: [PATCH 41/73] Update %%doc --- frei0r-plugins.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index b8b34e8..6cfb5f8 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -53,7 +53,7 @@ rm -rf %{buildroot}%{_docdir}/%{name} %files -%doc AUTHORS README TODO +%doc AUTHORS ChangeLog README.md TODO %license COPYING %dir %{_libdir}/frei0r-1 %exclude %{_libdir}/frei0r-1/facebl0r.so From 7394d6c2085e9a5189f9d2fb2257dcdac394af99 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 20:48:44 +0000 Subject: [PATCH 42/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index 6cfb5f8..6084f07 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Frei0r - a minimalist plugin API for video effects License: GPLv2+ @@ -69,6 +69,9 @@ rm -rf %{buildroot}%{_docdir}/%{name} %{_libdir}/pkgconfig/frei0r.pc %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 1.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Nicolas Chauvet - 1.6.1-1 - Update to 1.6.1 From 53b9628bfc1221b1c2e062dff063f99e8acb4157 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 24 Dec 2017 17:04:12 +0000 Subject: [PATCH 43/73] Rebuild (opencv-3.3.1) --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index 6084f07..35412f3 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.6.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Frei0r - a minimalist plugin API for video effects License: GPLv2+ @@ -69,6 +69,9 @@ rm -rf %{buildroot}%{_docdir}/%{name} %{_libdir}/pkgconfig/frei0r.pc %changelog +* Sun Dec 24 2017 Sérgio Basto - 1.6.1-3 +- Rebuild (opencv-3.3.1) + * Wed Aug 02 2017 Fedora Release Engineering - 1.6.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 460b0961bfd8c1b1ca8629a4dfee80793e42f49d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 10:12:01 +0000 Subject: [PATCH 44/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index 35412f3..fa3ceac 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.6.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Frei0r - a minimalist plugin API for video effects License: GPLv2+ @@ -69,6 +69,9 @@ rm -rf %{buildroot}%{_docdir}/%{name} %{_libdir}/pkgconfig/frei0r.pc %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.6.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sun Dec 24 2017 Sérgio Basto - 1.6.1-3 - Rebuild (opencv-3.3.1) From e051979da1eba3727421692f82998cb044f9d6c3 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 5 Mar 2018 15:22:19 -0800 Subject: [PATCH 45/73] Rebuild for opencv soname bump --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index fa3ceac..3fa032f 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.6.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Frei0r - a minimalist plugin API for video effects License: GPLv2+ @@ -69,6 +69,9 @@ rm -rf %{buildroot}%{_docdir}/%{name} %{_libdir}/pkgconfig/frei0r.pc %changelog +* Mon Mar 05 2018 Adam Williamson - 1.6.1-5 +- Rebuild for opencv soname bump + * Wed Feb 07 2018 Fedora Release Engineering - 1.6.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From c1915f70236b29ea7d69fd98fe480942b23edcf1 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 10 Jul 2018 16:18:10 +0200 Subject: [PATCH 46/73] add BuildRequires: gcc-c++ Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- frei0r-plugins.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index 3fa032f..928eef1 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -9,6 +9,7 @@ Source0: https://github.com/dyne/frei0r/archive/v%{version}/frei0r-plugin Buildrequires: libtool +BuildRequires: gcc-c++ BuildRequires: gavl-devel >= 0.2.3 BuildRequires: opencv-devel >= 1.0.0 BuildRequires: cairo-devel >= 1.0.0 From 2d96e246043aa1cd0c351f8b5b8ed394d36ff06f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 00:52:06 +0000 Subject: [PATCH 47/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index 928eef1..763d964 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.6.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Frei0r - a minimalist plugin API for video effects License: GPLv2+ @@ -70,6 +70,9 @@ rm -rf %{buildroot}%{_docdir}/%{name} %{_libdir}/pkgconfig/frei0r.pc %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1.6.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Mar 05 2018 Adam Williamson - 1.6.1-5 - Rebuild for opencv soname bump From 44d04e88449cae5e5bb234a35790ba6daa64d4f5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 20:11:44 +0000 Subject: [PATCH 48/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index 763d964..b89656c 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.6.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Frei0r - a minimalist plugin API for video effects License: GPLv2+ @@ -70,6 +70,9 @@ rm -rf %{buildroot}%{_docdir}/%{name} %{_libdir}/pkgconfig/frei0r.pc %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 1.6.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 1.6.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From a58907d6ce7d5f2cb6d6fd4bfb4fae3e6f87400f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sat, 2 Feb 2019 16:52:32 +0000 Subject: [PATCH 49/73] Fix fails to build with opencv 3.4.2 (https://github.com/dyne/frei0r/issues/26) --- 27.diff | 22 ++++++++++++++++++++++ frei0r-plugins.spec | 6 ++++-- 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 27.diff diff --git a/27.diff b/27.diff new file mode 100644 index 0000000..82d8d6c --- /dev/null +++ b/27.diff @@ -0,0 +1,22 @@ +diff --git a/src/filter/facebl0r/facebl0r.cpp b/src/filter/facebl0r/facebl0r.cpp +index 6d6e8f2..10fcdb7 100644 +--- a/src/filter/facebl0r/facebl0r.cpp ++++ b/src/filter/facebl0r/facebl0r.cpp +@@ -15,10 +15,17 @@ + */ + + ++#include ++#define CV_VERSION_NUM (CV_VERSION_MAJOR * 10000 \ ++ + CV_VERSION_MINOR * 100 \ ++ + CV_VERSION_REVISION) + #include + #include + #include + #include ++#if CV_VERSION_NUM > 30401 ++#include ++#endif + + #include + #include diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index b89656c..02eb0ba 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -6,6 +6,7 @@ Summary: Frei0r - a minimalist plugin API for video effects License: GPLv2+ URL: https://frei0r.dyne.org/ Source0: https://github.com/dyne/frei0r/archive/v%{version}/frei0r-plugins-%{version}.tar.gz +Patch1: 27.diff Buildrequires: libtool @@ -36,7 +37,7 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep -%autosetup -n frei0r-%{version} +%autosetup -n frei0r-%{version} -p1 %build @@ -47,7 +48,7 @@ autoreconf -i %install -%make_install INSTALL="install -p" +%make_install #Remove installed doc rm -rf %{buildroot}%{_docdir}/%{name} @@ -72,6 +73,7 @@ rm -rf %{buildroot}%{_docdir}/%{name} %changelog * Thu Jan 31 2019 Fedora Release Engineering - 1.6.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild +- Fix fails to build with opencv 3.4.2 (https://github.com/dyne/frei0r/issues/26) * Fri Jul 13 2018 Fedora Release Engineering - 1.6.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From c5bca8a9377f8c41ad49a4992b962865a573d392 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 01:03:57 +0000 Subject: [PATCH 50/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index 02eb0ba..b344d05 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.6.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Frei0r - a minimalist plugin API for video effects License: GPLv2+ @@ -71,6 +71,9 @@ rm -rf %{buildroot}%{_docdir}/%{name} %{_libdir}/pkgconfig/frei0r.pc %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 1.6.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 1.6.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - Fix fails to build with opencv 3.4.2 (https://github.com/dyne/frei0r/issues/26) From 6e7aeb7de70f6b2cc31f240a24b27a54c210d8a5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 12 Sep 2019 07:43:00 +0900 Subject: [PATCH 51/73] Rebuild for opencv (with vtk disabled) --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index b344d05..d82b718 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.6.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Frei0r - a minimalist plugin API for video effects License: GPLv2+ @@ -71,6 +71,9 @@ rm -rf %{buildroot}%{_docdir}/%{name} %{_libdir}/pkgconfig/frei0r.pc %changelog +* Wed Sep 11 2019 Mamoru TASAKA - 1.6.1-9 +- Rebuild for opencv (with vtk disabled) + * Thu Jul 25 2019 Fedora Release Engineering - 1.6.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 70ccc4e973fbaa0f6bafa474700e7e2cc35bd845 Mon Sep 17 00:00:00 2001 From: kwizart Date: Sun, 15 Dec 2019 09:28:48 +0100 Subject: [PATCH 52/73] Update to 1.7.0 --- 27.diff | 22 ---------------------- frei0r-plugins.spec | 8 +++++--- sources | 2 +- 3 files changed, 6 insertions(+), 26 deletions(-) delete mode 100644 27.diff diff --git a/27.diff b/27.diff deleted file mode 100644 index 82d8d6c..0000000 --- a/27.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/filter/facebl0r/facebl0r.cpp b/src/filter/facebl0r/facebl0r.cpp -index 6d6e8f2..10fcdb7 100644 ---- a/src/filter/facebl0r/facebl0r.cpp -+++ b/src/filter/facebl0r/facebl0r.cpp -@@ -15,10 +15,17 @@ - */ - - -+#include -+#define CV_VERSION_NUM (CV_VERSION_MAJOR * 10000 \ -+ + CV_VERSION_MINOR * 100 \ -+ + CV_VERSION_REVISION) - #include - #include - #include - #include -+#if CV_VERSION_NUM > 30401 -+#include -+#endif - - #include - #include diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index d82b718..d292233 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,12 +1,11 @@ Name: frei0r-plugins -Version: 1.6.1 -Release: 9%{?dist} +Version: 1.7.0 +Release: 1%{?dist} Summary: Frei0r - a minimalist plugin API for video effects License: GPLv2+ URL: https://frei0r.dyne.org/ Source0: https://github.com/dyne/frei0r/archive/v%{version}/frei0r-plugins-%{version}.tar.gz -Patch1: 27.diff Buildrequires: libtool @@ -71,6 +70,9 @@ rm -rf %{buildroot}%{_docdir}/%{name} %{_libdir}/pkgconfig/frei0r.pc %changelog +* Sun Dec 15 2019 Nicolas Chauvet - 1.7.0-1 +- Update to 1.7.0 + * Wed Sep 11 2019 Mamoru TASAKA - 1.6.1-9 - Rebuild for opencv (with vtk disabled) diff --git a/sources b/sources index f835e9a..ae1208e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (frei0r-plugins-1.6.1.tar.gz) = 013ccc9a58049b5a07049965db50255e488bab469df2d395017a5bcde4bede1a157f642d331fd0322046b12851fca650c447ee9ffb7cd7f307b2be2e1a62f29c +SHA512 (frei0r-plugins-1.7.0.tar.gz) = 5b8a4f7be0518b4d448c50abaa686d1b48e65cc0a909c18bd97ef85193c21b7c6677bb703b3861b817cd48b859cb1c8b9eae5236caf81d385bbe06f24a019717 From c04013552ac97ad9b3078ddf220f08d45a3d325f Mon Sep 17 00:00:00 2001 From: kwizart Date: Mon, 30 Dec 2019 15:12:16 +0100 Subject: [PATCH 53/73] Apply opencv patches --- ...870a3b4e7977119272d3232aaa947bea22ac.patch | 167 ++++++++++++++++++ ...03c8d51c34cd5f79e0399bb0024ca94ea813.patch | 27 +++ frei0r-plugins.spec | 2 + 3 files changed, 196 insertions(+) create mode 100644 35ed870a3b4e7977119272d3232aaa947bea22ac.patch create mode 100644 b27f03c8d51c34cd5f79e0399bb0024ca94ea813.patch diff --git a/35ed870a3b4e7977119272d3232aaa947bea22ac.patch b/35ed870a3b4e7977119272d3232aaa947bea22ac.patch new file mode 100644 index 0000000..d2f9c62 --- /dev/null +++ b/35ed870a3b4e7977119272d3232aaa947bea22ac.patch @@ -0,0 +1,167 @@ +From 35ed870a3b4e7977119272d3232aaa947bea22ac Mon Sep 17 00:00:00 2001 +From: kwizart +Date: Mon, 30 Dec 2019 14:44:51 +0100 +Subject: [PATCH] Update facebl0r to c++ api + +Signed-off-by: kwizart +--- + src/filter/facebl0r/facebl0r.cpp | 56 ++++++++++++++++++-------------- + 1 file changed, 32 insertions(+), 24 deletions(-) + +diff --git a/src/filter/facebl0r/facebl0r.cpp b/src/filter/facebl0r/facebl0r.cpp +index 17446cc..ba146d0 100644 +--- a/src/filter/facebl0r/facebl0r.cpp ++++ b/src/filter/facebl0r/facebl0r.cpp +@@ -18,7 +18,11 @@ + #include + #include + #include +-#include ++#include ++#include ++#include ++#include ++#include + #include "frei0r.hpp" + #include "frei0r_math.h" + +@@ -30,7 +34,7 @@ typedef struct { + + CvHistogram* hist; //histogram of hue in original face image + +- CvRect prev_rect; //location of face in previous frame ++ cv::Rect prev_rect; //location of face in previous frame + CvBox2D curr_box; //current face location estimate + } TrackedObj; + +@@ -53,7 +57,7 @@ class FaceBl0r: public frei0r::filter { + void update_hue_image (const IplImage* image, TrackedObj* imgs); + + //trackface +- CvRect* detect_face (IplImage*, CvHaarClassifierCascade*, CvMemStorage*); ++ CvRect* detect_face (IplImage*, cv::CascadeClassifier&, CvMemStorage*); + + + TrackedObj* tracked_obj; +@@ -63,7 +67,7 @@ class FaceBl0r: public frei0r::filter { + //used by capture_video_frame, so we don't have to keep creating. + IplImage* image; + +- CvHaarClassifierCascade* cascade; ++ cv::CascadeClassifier cascade; + CvMemStorage* storage; + + // plugin parameters +@@ -96,7 +100,7 @@ FaceBl0r::FaceBl0r(int wdt, int hgt) { + tracked_obj = 0; + face_found = 0; + +- cascade = 0; ++ //cascade = 0; + storage = 0; + + classifier = "/usr/share/opencv/haarcascades/haarcascade_frontalface_default.xml"; +@@ -124,7 +128,7 @@ FaceBl0r::~FaceBl0r() { + if(tracked_obj) + destroy_tracked_object(tracked_obj); + +- if(cascade) cvReleaseHaarClassifierCascade(&cascade); ++ //if(cascade) cvReleaseHaarClassifierCascade(&cascade); + if(storage) cvReleaseMemStorage(&storage); + + } +@@ -133,7 +137,7 @@ void FaceBl0r::update(double time, + uint32_t* out, + const uint32_t* in) { + +- if (!cascade) { ++ if (cascade.empty()) { + cvSetNumThreads(cvRound(threads * 100)); + if (classifier.length() > 0) { + if (classifier == old_classifier) { +@@ -142,8 +146,7 @@ void FaceBl0r::update(double time, + return; + } else old_classifier = classifier; + +- cascade = (CvHaarClassifierCascade*) cvLoad(classifier.c_str(), 0, 0, 0 ); +- if (!cascade) { ++ if (!cascade.load(classifier.c_str())) { + fprintf(stderr, "ERROR in filter facebl0r, classifier cascade not found:\n"); + fprintf(stderr, " %s\n", classifier.c_str()); + memcpy(out, in, size * 4); +@@ -234,30 +237,33 @@ void FaceBl0r::update(double time, + + /* Given an image and a classider, detect and return region. */ + CvRect* FaceBl0r::detect_face (IplImage* image, +- CvHaarClassifierCascade* cascade, ++ cv::CascadeClassifier &cascade, + CvMemStorage* storage) { + + CvRect* rect = 0; ++ std::vector faces; ++ cv::Mat gray_mat; + +- if (cascade && storage) { ++ if (!cascade.empty() && storage) { + //use an equalized gray image for better recognition + IplImage* gray = cvCreateImage(cvSize(image->width, image->height), 8, 1); + cvCvtColor(image, gray, CV_BGR2GRAY); + cvEqualizeHist(gray, gray); + cvClearMemStorage(storage); ++ gray_mat = cv::cvarrToMat(&gray); + + //get a sequence of faces in image + int min = cvRound(smallest * 1000); +- CvSeq *faces = cvHaarDetectObjects(gray, cascade, storage, ++ cascade.detectMultiScale(gray_mat, faces, + search_scale * 10.0, + cvRound(neighbors * 100), +- CV_HAAR_FIND_BIGGEST_OBJECT|//since we track only the first, get the biggest +- CV_HAAR_DO_CANNY_PRUNING, //skip regions unlikely to contain a face +- cvSize(min, min)); ++ cv::CASCADE_FIND_BIGGEST_OBJECT|//since we track only the first, get the biggest ++ cv::CASCADE_DO_CANNY_PRUNING, //skip regions unlikely to contain a face ++ cvSize(min,min)); + + //if one or more faces are detected, return the first one +- if(faces && faces->total) +- rect = (CvRect*) cvGetSeqElem(faces, 0); ++ if(faces.size() > 0) ++ rect = (CvRect*) &faces.front(); + + cvReleaseImage(&gray); + } +@@ -321,7 +327,7 @@ void FaceBl0r::destroy_tracked_object (TrackedObj* obj) { + + /* Given an image and tracked object, return box position. */ + CvBox2D FaceBl0r::camshift_track_face (IplImage* image, TrackedObj* obj) { +- CvConnectedComp components; ++ //CvConnectedComp components; + + //create a new hue image + update_hue_image(image, obj); +@@ -330,16 +336,18 @@ CvBox2D FaceBl0r::camshift_track_face (IplImage* image, TrackedObj* obj) { + cvCalcBackProject(&obj->hue, obj->prob, obj->hist); + cvAnd(obj->prob, obj->mask, obj->prob, 0); + ++ cv::Mat obj_prob_mat = cv::cvarrToMat(&obj->prob); ++ + //use CamShift to find the center of the new face probability +- cvCamShift(obj->prob, obj->prev_rect, +- cvTermCriteria(CV_TERMCRIT_EPS | CV_TERMCRIT_ITER, 10, 1), +- &components, &obj->curr_box); ++ cv::RotatedRect rot_rect = cv::CamShift(obj_prob_mat, obj->prev_rect, ++ cvTermCriteria(CV_TERMCRIT_EPS | CV_TERMCRIT_ITER, 10, 1)); ++ // &components, &obj->curr_box); + + //update face location and angle +- obj->prev_rect = components.rect; +- obj->curr_box.angle = -obj->curr_box.angle; ++ //obj->prev_rect = components.rect; ++ //obj->curr_box.angle = -obj->curr_box.angle; + +- return obj->curr_box; ++ return rot_rect; + } + + void FaceBl0r::update_hue_image (const IplImage* image, TrackedObj* obj) { diff --git a/b27f03c8d51c34cd5f79e0399bb0024ca94ea813.patch b/b27f03c8d51c34cd5f79e0399bb0024ca94ea813.patch new file mode 100644 index 0000000..49b8e01 --- /dev/null +++ b/b27f03c8d51c34cd5f79e0399bb0024ca94ea813.patch @@ -0,0 +1,27 @@ +From b27f03c8d51c34cd5f79e0399bb0024ca94ea813 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?IOhannes=20m=20zm=C3=B6lnig?= +Date: Tue, 10 Dec 2019 15:01:52 +0100 +Subject: [PATCH] facedetect: include imgproc/imgproc_c.h when using OpenCV-4+ + +imgproc_c.h defines the constants CV_BGR2GRAY, CV_FILLED & CV_AA. + +it also includes "core/core_c.h", which then provides + `cvGetTickCount()` and `cvGetTickFrequency()` +--- + src/filter/facedetect/facedetect.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/filter/facedetect/facedetect.cpp b/src/filter/facedetect/facedetect.cpp +index 1906962..4e7d476 100644 +--- a/src/filter/facedetect/facedetect.cpp ++++ b/src/filter/facedetect/facedetect.cpp +@@ -21,6 +21,9 @@ + #include + #include + #include ++#if CV_MAJOR_VERSION >= 4 ++# include ++#endif + #include "frei0r.hpp" + #include "frei0r_math.h" + diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index d292233..20f294f 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -6,6 +6,8 @@ Summary: Frei0r - a minimalist plugin API for video effects License: GPLv2+ URL: https://frei0r.dyne.org/ Source0: https://github.com/dyne/frei0r/archive/v%{version}/frei0r-plugins-%{version}.tar.gz +Patch0: https://github.com/dyne/frei0r/pull/94/commits/b27f03c8d51c34cd5f79e0399bb0024ca94ea813.patch +Patch1: https://github.com/dyne/frei0r/commit/35ed870a3b4e7977119272d3232aaa947bea22ac.patch Buildrequires: libtool From e54bc29ad9d1200425202267da8c1a964904f402 Mon Sep 17 00:00:00 2001 From: kwizart Date: Mon, 30 Dec 2019 15:12:36 +0100 Subject: [PATCH 54/73] Rebuilt for opencv --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index 20f294f..6c9aba3 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Frei0r - a minimalist plugin API for video effects License: GPLv2+ @@ -72,6 +72,9 @@ rm -rf %{buildroot}%{_docdir}/%{name} %{_libdir}/pkgconfig/frei0r.pc %changelog +* Mon Dec 30 2019 Nicolas Chauvet - 1.7.0-2 +- Rebuilt for opencv4 + * Sun Dec 15 2019 Nicolas Chauvet - 1.7.0-1 - Update to 1.7.0 From b5b3e20dbe018dfb208dfb4cfab2b4bab5760906 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 20 Jan 2020 15:23:21 +0100 Subject: [PATCH 55/73] Disable OpenCV for f32 until fixed --- frei0r-plugins.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index 6c9aba3..210607a 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.7.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Frei0r - a minimalist plugin API for video effects License: GPLv2+ @@ -13,7 +13,9 @@ Buildrequires: libtool BuildRequires: gcc-c++ BuildRequires: gavl-devel >= 0.2.3 +%if 0%{?fedora} && 0%{?fedora} < 32 BuildRequires: opencv-devel >= 1.0.0 +%endif BuildRequires: cairo-devel >= 1.0.0 @@ -72,6 +74,9 @@ rm -rf %{buildroot}%{_docdir}/%{name} %{_libdir}/pkgconfig/frei0r.pc %changelog +* Mon Jan 20 2020 Nicolas Chauvet +- Rebuilt without OpenCV + * Mon Dec 30 2019 Nicolas Chauvet - 1.7.0-2 - Rebuilt for opencv4 From 4ecb05d105f656e1adfd1fb15b5439560cf71bd6 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 20 Jan 2020 15:33:46 +0100 Subject: [PATCH 56/73] Obsoletes opencv until fixed --- frei0r-plugins.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index 210607a..2c2c90c 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,3 +1,7 @@ +%if 0%{?fedora} && 0%{?fedora} < 32 +%global _with_opencv 1 +%endif + Name: frei0r-plugins Version: 1.7.0 Release: 3%{?dist} @@ -13,8 +17,11 @@ Buildrequires: libtool BuildRequires: gcc-c++ BuildRequires: gavl-devel >= 0.2.3 -%if 0%{?fedora} && 0%{?fedora} < 32 +%if 0%{?_with_opencv} BuildRequires: opencv-devel >= 1.0.0 +%else +# Obsoletes introduced in f32 +Obsoletes: frei0r-plugins-opencv < 1.7.0-3 %endif BuildRequires: cairo-devel >= 1.0.0 @@ -65,9 +72,11 @@ rm -rf %{buildroot}%{_docdir}/%{name} %exclude %{_libdir}/frei0r-1/facedetect.so %{_libdir}/frei0r-1/*.so +%if 0%{?_with_opencv} %files opencv %{_libdir}/frei0r-1/facebl0r.so %{_libdir}/frei0r-1/facedetect.so +%endif %files -n frei0r-devel %{_includedir}/frei0r.h From 577cd9fe718281547ce7fbd84124a2dbc9bccd08 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 28 Jan 2020 11:13:16 +0100 Subject: [PATCH 57/73] Rebuilt --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index 2c2c90c..d1bcea8 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -4,7 +4,7 @@ Name: frei0r-plugins Version: 1.7.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Frei0r - a minimalist plugin API for video effects License: GPLv2+ @@ -83,6 +83,9 @@ rm -rf %{buildroot}%{_docdir}/%{name} %{_libdir}/pkgconfig/frei0r.pc %changelog +* Tue Jan 28 2020 Nicolas Chauvet - 1.7.0-4 +- Rebuild for OpenCV 4.2 + * Mon Jan 20 2020 Nicolas Chauvet - Rebuilt without OpenCV From 8d180e43cfd1a5ef60b9f911e9debf3f6a707bdf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 19:01:57 +0000 Subject: [PATCH 58/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index d1bcea8..e4b77f1 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -4,7 +4,7 @@ Name: frei0r-plugins Version: 1.7.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Frei0r - a minimalist plugin API for video effects License: GPLv2+ @@ -83,6 +83,9 @@ rm -rf %{buildroot}%{_docdir}/%{name} %{_libdir}/pkgconfig/frei0r.pc %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 1.7.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Jan 28 2020 Nicolas Chauvet - 1.7.0-4 - Rebuild for OpenCV 4.2 From 9a287c25aa9fd26daf8f6ee4009494be64679214 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 6 Mar 2020 17:32:36 +0100 Subject: [PATCH 59/73] Update to latest wip patch --- ...c320b52956713d0b511771b23020fabd07a2.patch | 441 ++++++++++++++++++ frei0r-plugins.spec | 25 +- 2 files changed, 453 insertions(+), 13 deletions(-) create mode 100644 7482c320b52956713d0b511771b23020fabd07a2.patch diff --git a/7482c320b52956713d0b511771b23020fabd07a2.patch b/7482c320b52956713d0b511771b23020fabd07a2.patch new file mode 100644 index 0000000..30d531c --- /dev/null +++ b/7482c320b52956713d0b511771b23020fabd07a2.patch @@ -0,0 +1,441 @@ +From 7482c320b52956713d0b511771b23020fabd07a2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Stefan=20Br=C3=BCns?= +Date: Wed, 1 Jan 2020 22:59:24 +0100 +Subject: [PATCH] Port facebl0r to OpenCV C++ API + +TrackedObj has been converted to a class, and the update_hue_image and +camshift_track_face methods are now members of it, instead of passing +the object as a parameter. + +Also, the various cv::Mat instances are kept, instead of destroying and +recreating these on various occasions. + +The plugin now only accepts BGRA8888 as image format, as this is the +expected layout throughout the code (default openCV channel order). + +The plugin has been tested using the following gstreamer pipeline: +gst-launch-1.0 v4l2src ! image/jpeg,width=640,rate=1/15 \ + ! jpegdec ! videoconvert \ + ! frei0r-filter-facebl0r ellipse=1 \ + classifier=/usr/share/OpenCV/haarcascades/haarcascade_frontalface_default.xml \ + ! videoconvert ! autovideosink +--- + src/filter/facebl0r/facebl0r.cpp | 292 +++++++++++-------------------- + 1 file changed, 102 insertions(+), 190 deletions(-) + +diff --git a/src/filter/facebl0r/facebl0r.cpp b/src/filter/facebl0r/facebl0r.cpp +index 17446cc..96222d8 100644 +--- a/src/filter/facebl0r/facebl0r.cpp ++++ b/src/filter/facebl0r/facebl0r.cpp +@@ -22,49 +22,49 @@ + #include "frei0r.hpp" + #include "frei0r_math.h" + +-typedef struct { +- IplImage* hsv; //input image converted to HSV +- IplImage* hue; //hue channel of HSV image +- IplImage* mask; //image for masking pixels +- IplImage* prob; //face probability estimates for each pixel ++class TrackedObj { ++public: ++ void update_hist(); ++ void update_hue_image (const cv::Mat& image); ++ cv::RotatedRect camshift_track_face(); ++ ++ cv::Mat hsv; //input image converted to HSV ++ cv::Mat hue; //hue channel of HSV image ++ cv::Mat mask; //image for masking pixels ++ cv::Mat prob; //face probability estimates for each pixel + +- CvHistogram* hist; //histogram of hue in original face image ++ cv::Mat hist; //histogram of hue in original face image ++ static const int hist_bins; //number of histogram bins ++ static const float hist_range[2]; //histogram range ++ ++ cv::Rect prev_rect; //location of face in previous frame ++ cv::RotatedRect curr_box; //current face location estimate ++}; + +- CvRect prev_rect; //location of face in previous frame +- CvBox2D curr_box; //current face location estimate +-} TrackedObj; ++const float TrackedObj::hist_range[2] = { 0, 180 }; ++const int TrackedObj::hist_bins = 30; + + class FaceBl0r: public frei0r::filter { + + public: + FaceBl0r(int wdt, int hgt); +- ~FaceBl0r(); ++ ~FaceBl0r() = default; + + void update(double time, + uint32_t* out, + const uint32_t* in); + + private: +- +-// camshift +- TrackedObj* create_tracked_object (IplImage* image, CvRect* face_rect); +- void destroy_tracked_object (TrackedObj* tracked_obj); +- CvBox2D camshift_track_face (IplImage* image, TrackedObj* imgs); +- void update_hue_image (const IplImage* image, TrackedObj* imgs); +- ++ + //trackface +- CvRect* detect_face (IplImage*, CvHaarClassifierCascade*, CvMemStorage*); +- ++ std::vector detect_face(); ++ ++ TrackedObj tracked_obj; + +- TrackedObj* tracked_obj; +- CvBox2D face_box; //area to draw +- CvRect* face_rect; +- + //used by capture_video_frame, so we don't have to keep creating. +- IplImage* image; ++ cv::Mat image; + +- CvHaarClassifierCascade* cascade; +- CvMemStorage* storage; ++ cv::CascadeClassifier cascade; + + // plugin parameters + std::string classifier; +@@ -77,7 +77,6 @@ class FaceBl0r: public frei0r::filter { + double largest; + + std::string old_classifier; +- + + unsigned int face_found; + unsigned int face_notfound; +@@ -87,18 +86,12 @@ class FaceBl0r: public frei0r::filter { + frei0r::construct plugin("FaceBl0r", + "automatic face blur", + "ZioKernel, Biilly, Jilt, Jaromil, ddennedy", +- 1,1, F0R_COLOR_MODEL_PACKED32); ++ 1,1, F0R_COLOR_MODEL_BGRA8888); + + FaceBl0r::FaceBl0r(int wdt, int hgt) { + +- face_rect = 0; +- image = 0; +- tracked_obj = 0; + face_found = 0; +- +- cascade = 0; +- storage = 0; +- ++ + classifier = "/usr/share/opencv/haarcascades/haarcascade_frontalface_default.xml"; + register_param(classifier, + "Classifier", +@@ -120,52 +113,35 @@ FaceBl0r::FaceBl0r(int wdt, int hgt) { + register_param(largest, "Largest", "Maximum object size in pixels, divided by 10000"); + } + +-FaceBl0r::~FaceBl0r() { +- if(tracked_obj) +- destroy_tracked_object(tracked_obj); +- +- if(cascade) cvReleaseHaarClassifierCascade(&cascade); +- if(storage) cvReleaseMemStorage(&storage); +- +-} +- + void FaceBl0r::update(double time, + uint32_t* out, +- const uint32_t* in) { +- +- if (!cascade) { +- cvSetNumThreads(cvRound(threads * 100)); +- if (classifier.length() > 0) { +- if (classifier == old_classifier) { +- // same as before, avoid repeating error messages +- memcpy(out, in, size * 4); // of course assuming we are RGBA only +- return; +- } else old_classifier = classifier; +- +- cascade = (CvHaarClassifierCascade*) cvLoad(classifier.c_str(), 0, 0, 0 ); +- if (!cascade) { +- fprintf(stderr, "ERROR in filter facebl0r, classifier cascade not found:\n"); +- fprintf(stderr, " %s\n", classifier.c_str()); +- memcpy(out, in, size * 4); +- return; +- } +- storage = cvCreateMemStorage(0); +- } +- else { +- memcpy(out, in, size * 4); +- return; +- } +- } ++ const uint32_t* in) ++{ ++ if (cascade.empty()) { ++ cv::setNumThreads(cvRound(threads * 100)); ++ if (classifier.length() == 0 || classifier == old_classifier) { ++ // same as before, avoid repeating error messages ++ memcpy(out, in, size * 4); // of course assuming we are RGBA only ++ return; ++ } ++ old_classifier = classifier; ++ } ++ ++ if (!cascade.load(classifier.c_str())) { ++ fprintf(stderr, "ERROR in filter facebl0r, classifier cascade not found:\n"); ++ fprintf(stderr, " %s\n", classifier.c_str()); ++ memcpy(out, in, size * 4); ++ return; ++ } + + // sanitize parameters + recheck = CLAMP(recheck, 0.001, 1.0); + search_scale = CLAMP(search_scale, 0.11, 1.0); + neighbors = CLAMP(neighbors, 0.01, 1.0); + +- if( !image ) +- image = cvCreateImage( cvSize(width,height), IPL_DEPTH_8U, 4 ); +- +- memcpy(image->imageData, in, size * 4); ++ // copy input image to OpenCV ++ image = cv::Mat(height, width, CV_8UC4, (void*)in); ++ tracked_obj.update_hue_image(image); + + /* + no face* +@@ -176,27 +152,24 @@ void FaceBl0r::update(double time, + no face* + */ + if(face_notfound>0) { +- ++ std::vector faces; + if(face_notfound % cvRound(recheck * 1000) == 0) +- face_rect = detect_face(image, cascade, storage); ++ faces = detect_face(); + + // if no face detected +- if (!face_rect) { ++ if (faces.empty()) { + face_notfound++; + } else { +- //track detected face with camshift +- if(tracked_obj) +- destroy_tracked_object(tracked_obj); +- tracked_obj = create_tracked_object(image, face_rect); ++ tracked_obj.prev_rect = faces[0]; ++ tracked_obj.update_hist(); + face_notfound = 0; + face_found++; + } +- + } + +- if(face_found>0) { ++ if (face_found > 0) { + //track the face in the new frame +- face_box = camshift_track_face(image, tracked_obj); ++ cv::RotatedRect face_box = tracked_obj.camshift_track_face(); + + int min = cvRound(smallest * 1000); + min = min? min : 10; +@@ -210,17 +183,13 @@ void FaceBl0r::update(double time, + face_notfound++; + } + else { +-//////////////////////////////////////////////////////////////////////// +- cvSetImageROI (image, tracked_obj->prev_rect); +-// cvSmooth (image, image, CV_BLUR, 22, 22, 0, 0); +- cvSmooth (image, image, CV_BLUR, 23, 23, 0, 0); +-// cvSmooth (image, image, CV_GAUSSIAN, 11, 11, 0, 0); +- cvResetImageROI (image); +-//////////////////////////////////////////////////////////////////////// +- ++ cv::Rect blur_region = tracked_obj.prev_rect & cv::Rect({0, 0}, image.size()); ++ cv::Mat blur(image, blur_region); ++ cv::blur(blur, blur, {23, 23}, cv::Point(-1, -1)); ++ + //outline face ellipse + if (ellipse) +- cvEllipseBox(image, face_box, CV_RGB(255,0,0), 2, CV_AA, 0); ++ cv::ellipse(image, face_box, CV_RGB(255,0,0), 2, cv::LINE_AA); + + face_found++; + if(face_found % cvRound(recheck * 1000) == 0) +@@ -228,133 +197,76 @@ void FaceBl0r::update(double time, + } + } + +- memcpy(out, image->imageData, size * 4); +- cvReleaseImage(&image); ++ memcpy(out, image.data, size * 4); + } + + /* Given an image and a classider, detect and return region. */ +-CvRect* FaceBl0r::detect_face (IplImage* image, +- CvHaarClassifierCascade* cascade, +- CvMemStorage* storage) { +- +- CvRect* rect = 0; +- +- if (cascade && storage) { ++std::vector FaceBl0r::detect_face() ++{ ++ if (cascade.empty()) { ++ return std::vector(); ++ } ++ + //use an equalized gray image for better recognition +- IplImage* gray = cvCreateImage(cvSize(image->width, image->height), 8, 1); +- cvCvtColor(image, gray, CV_BGR2GRAY); +- cvEqualizeHist(gray, gray); +- cvClearMemStorage(storage); ++ cv::Mat gray; ++ cv::cvtColor(image, gray, CV_BGR2GRAY); ++ cv::equalizeHist(gray, gray); + + //get a sequence of faces in image + int min = cvRound(smallest * 1000); +- CvSeq *faces = cvHaarDetectObjects(gray, cascade, storage, ++ std::vector faces; ++ cascade.detectMultiScale(gray, faces, + search_scale * 10.0, + cvRound(neighbors * 100), + CV_HAAR_FIND_BIGGEST_OBJECT|//since we track only the first, get the biggest + CV_HAAR_DO_CANNY_PRUNING, //skip regions unlikely to contain a face +- cvSize(min, min)); +- +- //if one or more faces are detected, return the first one +- if(faces && faces->total) +- rect = (CvRect*) cvGetSeqElem(faces, 0); ++ cv::Size(min, min)); + +- cvReleaseImage(&gray); +- } +- +- return rect; ++ return faces; + } + +-/* Create a camshift tracked object from a region in image. */ +-TrackedObj* FaceBl0r::create_tracked_object (IplImage* image, CvRect* region) { +- TrackedObj* obj; +- +- //allocate memory for tracked object struct +- if((obj = (TrackedObj *) malloc(sizeof *obj)) != NULL) { +- //create-image: size(w,h), bit depth, channels +- obj->hsv = cvCreateImage(cvGetSize(image), 8, 3); +- obj->mask = cvCreateImage(cvGetSize(image), 8, 1); +- obj->hue = cvCreateImage(cvGetSize(image), 8, 1); +- obj->prob = cvCreateImage(cvGetSize(image), 8, 1); +- +- int hist_bins = 30; //number of histogram bins +- float hist_range[] = {0,180}; //histogram range +- float* range = hist_range; +- obj->hist = cvCreateHist(1, //number of hist dimensions +- &hist_bins, //array of dimension sizes +- CV_HIST_ARRAY, //representation format +- &range, //array of ranges for bins +- 1); //uniformity flag +- } +- +- //create a new hue image +- update_hue_image(image, obj); +- +- float max_val = 0.f; +- ++void TrackedObj::update_hist() ++{ + //create a histogram representation for the face +- cvSetImageROI(obj->hue, *region); +- cvSetImageROI(obj->mask, *region); +- cvCalcHist(&obj->hue, obj->hist, 0, obj->mask); +- cvGetMinMaxHistValue(obj->hist, 0, &max_val, 0, 0 ); +- cvConvertScale(obj->hist->bins, obj->hist->bins, +- max_val ? 255.0/max_val : 0, 0); +- cvResetImageROI(obj->hue); +- cvResetImageROI(obj->mask); +- +- //store the previous face location +- obj->prev_rect = *region; +- +- return obj; +-} +- +-/* Release resources from tracked object. */ +-void FaceBl0r::destroy_tracked_object (TrackedObj* obj) { +- cvReleaseImage(&obj->hsv); +- cvReleaseImage(&obj->hue); +- cvReleaseImage(&obj->mask); +- cvReleaseImage(&obj->prob); +- cvReleaseHist(&obj->hist); ++ cv::Mat hue_roi(hue, prev_rect); ++ cv::Mat mask_roi(mask, prev_rect); + +- free(obj); ++ const float* range = hist_range; ++ cv::calcHist(&hue_roi, 1, nullptr, mask_roi, hist, 1, &hist_bins, &range); ++ normalize(hist, hist, 0, 255, cv::NORM_MINMAX); + } + + /* Given an image and tracked object, return box position. */ +-CvBox2D FaceBl0r::camshift_track_face (IplImage* image, TrackedObj* obj) { +- CvConnectedComp components; +- +- //create a new hue image +- update_hue_image(image, obj); +- ++cv::RotatedRect TrackedObj::camshift_track_face() ++{ + //create a probability image based on the face histogram +- cvCalcBackProject(&obj->hue, obj->prob, obj->hist); +- cvAnd(obj->prob, obj->mask, obj->prob, 0); ++ const float* range = hist_range; ++ cv::calcBackProject(&hue, 1, nullptr, hist, prob, &range); ++ prob &= mask; + + //use CamShift to find the center of the new face probability +- cvCamShift(obj->prob, obj->prev_rect, +- cvTermCriteria(CV_TERMCRIT_EPS | CV_TERMCRIT_ITER, 10, 1), +- &components, &obj->curr_box); ++ cv::RotatedRect curr_box = CamShift(prob, prev_rect, ++ cv::TermCriteria(cv::TermCriteria::EPS | cv::TermCriteria::MAX_ITER, 10, 1 )); + +- //update face location and angle +- obj->prev_rect = components.rect; +- obj->curr_box.angle = -obj->curr_box.angle; ++ //update face location ++ prev_rect = curr_box.boundingRect(); + +- return obj->curr_box; ++ return curr_box; + } + +-void FaceBl0r::update_hue_image (const IplImage* image, TrackedObj* obj) { ++void TrackedObj::update_hue_image (const cv::Mat& image) { + //limits for calculating hue + int vmin = 65, vmax = 256, smin = 55; +- ++ + //convert to HSV color model +- cvCvtColor(image, obj->hsv, CV_BGR2HSV); +- ++ cv::cvtColor(image, hsv, CV_BGR2HSV); ++ + //mask out-of-range values +- cvInRangeS(obj->hsv, //source +- cvScalar(0, smin, MIN(vmin, vmax), 0), //lower bound +- cvScalar(180, 256, MAX(vmin, vmax) ,0), //upper bound +- obj->mask); //destination +- ++ cv::inRange(hsv, //source ++ cv::Scalar(0, smin, MIN(vmin, vmax)), //lower bound ++ cv::Scalar(180, 256, MAX(vmin, vmax)), //upper bound ++ mask); //destination ++ + //extract the hue channel, split: src, dest channels +- cvSplit(obj->hsv, obj->hue, 0, 0, 0 ); ++ cv::extractChannel(hsv, hue, 0); + } diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index e4b77f1..56e8eda 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,28 +1,19 @@ -%if 0%{?fedora} && 0%{?fedora} < 32 -%global _with_opencv 1 -%endif - Name: frei0r-plugins Version: 1.7.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Frei0r - a minimalist plugin API for video effects License: GPLv2+ URL: https://frei0r.dyne.org/ Source0: https://github.com/dyne/frei0r/archive/v%{version}/frei0r-plugins-%{version}.tar.gz Patch0: https://github.com/dyne/frei0r/pull/94/commits/b27f03c8d51c34cd5f79e0399bb0024ca94ea813.patch -Patch1: https://github.com/dyne/frei0r/commit/35ed870a3b4e7977119272d3232aaa947bea22ac.patch +Patch1: https://github.com/dyne/frei0r/commit/7482c320b52956713d0b511771b23020fabd07a2.patch Buildrequires: libtool BuildRequires: gcc-c++ BuildRequires: gavl-devel >= 0.2.3 -%if 0%{?_with_opencv} BuildRequires: opencv-devel >= 1.0.0 -%else -# Obsoletes introduced in f32 -Obsoletes: frei0r-plugins-opencv < 1.7.0-3 -%endif BuildRequires: cairo-devel >= 1.0.0 @@ -49,6 +40,13 @@ developing applications that use %{name}. %prep %autosetup -n frei0r-%{version} -p1 +# few more hacks +sed -i -e 's/CV_HAAR_FIND_BIGGEST_OBJECT/cv::CASCADE_FIND_BIGGEST_OBJECT/' \ + -e 's/CV_HAAR_DO_CANNY_PRUNING/cv::CASCADE_DO_CANNY_PRUNING/' \ + -e 's/CV_BGR2GRAY/cv::COLOR_BGR2GRAY/' \ + -e 's/CV_BGR2HSV/cv::COLOR_BGR2HSV/' \ + src/filter/facebl0r/facebl0r.cpp + %build mkdir -p m4 @@ -72,17 +70,18 @@ rm -rf %{buildroot}%{_docdir}/%{name} %exclude %{_libdir}/frei0r-1/facedetect.so %{_libdir}/frei0r-1/*.so -%if 0%{?_with_opencv} %files opencv %{_libdir}/frei0r-1/facebl0r.so %{_libdir}/frei0r-1/facedetect.so -%endif %files -n frei0r-devel %{_includedir}/frei0r.h %{_libdir}/pkgconfig/frei0r.pc %changelog +* Fri Mar 06 2020 Nicolas Chauvet - 1.7.0-6 +- Update wip opencv patch + * Tue Jan 28 2020 Fedora Release Engineering - 1.7.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 8bc64ac6f34a93b221217c90ab788b513fa25754 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 25 May 2020 09:59:53 +0200 Subject: [PATCH 60/73] Update patches --- Bump-opencv-to-2.3-c-API.patch | 44 ++++++++++++++++ Switch-to-OpenCV4-enums.patch | 46 +++++++++++++++++ ...2db4ca20fefcce62dbe7b255c2b75951853e.patch | 50 +++++++++++++++++++ ...e0595c8134b2b3c7e82ecb8da36c9354f68a.patch | 46 +++++++++++++++++ frei0r-plugins.spec | 15 +++--- 5 files changed, 193 insertions(+), 8 deletions(-) create mode 100644 Bump-opencv-to-2.3-c-API.patch create mode 100644 Switch-to-OpenCV4-enums.patch create mode 100644 b4562db4ca20fefcce62dbe7b255c2b75951853e.patch create mode 100644 b8d4e0595c8134b2b3c7e82ecb8da36c9354f68a.patch diff --git a/Bump-opencv-to-2.3-c-API.patch b/Bump-opencv-to-2.3-c-API.patch new file mode 100644 index 0000000..5a3e51d --- /dev/null +++ b/Bump-opencv-to-2.3-c-API.patch @@ -0,0 +1,44 @@ +From fa445192a9e3091b837ad93fccca86075dab80b2 Mon Sep 17 00:00:00 2001 +From: Nicolas Chauvet +Date: Mon, 25 May 2020 09:56:59 +0200 +Subject: [PATCH 4/4] Bump opencv to 2.3 (c++ API) + +--- + configure.ac | 2 +- + src/Makefile.am | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 42dd629..bd8b1cf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -94,7 +94,7 @@ AC_FUNC_MALLOC + AC_CHECK_FUNCS([floor memset pow sqrt]) + + HAVE_OPENCV=false +-PKG_CHECK_MODULES(OPENCV, opencv >= 1.0.0, [HAVE_OPENCV=true], [true]) ++PKG_CHECK_MODULES(OPENCV, opencv >= 2.3, [HAVE_OPENCV=true], [true]) + AM_CONDITIONAL([HAVE_OPENCV], [test x$HAVE_OPENCV = xtrue]) + if test x$HAVE_OPENCV = xtrue; then + # OPENCV_CFLAGS="$OPENCV_CFLAGS -DOPENCV_PREFIX=`pkg-config opencv --variable=prefix`" +diff --git a/src/Makefile.am b/src/Makefile.am +index 9e8a9c4..c778312 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -156,11 +156,11 @@ endif + if HAVE_OPENCV + plugin_LTLIBRARIES += facebl0r.la + facebl0r_la_SOURCES = filter/facebl0r/facebl0r.cpp +-facebl0r_la_CFLAGS = @OPENCV_CFLAGS@ @CFLAGS@ ++facebl0r_la_CFLAGS = @OPENCV_CXXFLAGS@ @CFLAGS@ + facebl0r_la_LIBADD = @OPENCV_LIBS@ + plugin_LTLIBRARIES += facedetect.la + facedetect_la_SOURCES = filter/facedetect/facedetect.cpp +-facedetect_la_CFLAGS = @OPENCV_CFLAGS@ @CFLAGS@ ++facedetect_la_CFLAGS = @OPENCV_CXXFLAGS@ @CFLAGS@ + facedetect_la_LIBADD = @OPENCV_LIBS@ + endif + +-- +2.25.4 + diff --git a/Switch-to-OpenCV4-enums.patch b/Switch-to-OpenCV4-enums.patch new file mode 100644 index 0000000..2c7b6b7 --- /dev/null +++ b/Switch-to-OpenCV4-enums.patch @@ -0,0 +1,46 @@ +From 796d122587207afbf0c35c75edf6e9588edc0b99 Mon Sep 17 00:00:00 2001 +From: Nicolas Chauvet +Date: Mon, 25 May 2020 09:51:16 +0200 +Subject: [PATCH 3/4] Switch to OpenCV4 enums + +Signed-off-by: Nicolas Chauvet +--- + src/filter/facebl0r/facebl0r.cpp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/filter/facebl0r/facebl0r.cpp b/src/filter/facebl0r/facebl0r.cpp +index 96222d8..fa21a35 100644 +--- a/src/filter/facebl0r/facebl0r.cpp ++++ b/src/filter/facebl0r/facebl0r.cpp +@@ -209,7 +209,7 @@ std::vector FaceBl0r::detect_face() + + //use an equalized gray image for better recognition + cv::Mat gray; +- cv::cvtColor(image, gray, CV_BGR2GRAY); ++ cv::cvtColor(image, gray, cv::COLOR_BGR2GRAY); + cv::equalizeHist(gray, gray); + + //get a sequence of faces in image +@@ -218,8 +218,8 @@ std::vector FaceBl0r::detect_face() + cascade.detectMultiScale(gray, faces, + search_scale * 10.0, + cvRound(neighbors * 100), +- CV_HAAR_FIND_BIGGEST_OBJECT|//since we track only the first, get the biggest +- CV_HAAR_DO_CANNY_PRUNING, //skip regions unlikely to contain a face ++ cv::CASCADE_FIND_BIGGEST_OBJECT|//since we track only the first, get the biggest ++ cv::CASCADE_DO_CANNY_PRUNING, //skip regions unlikely to contain a face + cv::Size(min, min)); + + return faces; +@@ -259,7 +259,7 @@ void TrackedObj::update_hue_image (const cv::Mat& image) { + int vmin = 65, vmax = 256, smin = 55; + + //convert to HSV color model +- cv::cvtColor(image, hsv, CV_BGR2HSV); ++ cv::cvtColor(image, hsv, cv::COLOR_BGR2HSV); + + //mask out-of-range values + cv::inRange(hsv, //source +-- +2.25.4 + diff --git a/b4562db4ca20fefcce62dbe7b255c2b75951853e.patch b/b4562db4ca20fefcce62dbe7b255c2b75951853e.patch new file mode 100644 index 0000000..ac739dd --- /dev/null +++ b/b4562db4ca20fefcce62dbe7b255c2b75951853e.patch @@ -0,0 +1,50 @@ +From b4562db4ca20fefcce62dbe7b255c2b75951853e Mon Sep 17 00:00:00 2001 +From: Raphael Graf +Date: Thu, 5 Mar 2020 15:39:37 +0100 +Subject: [PATCH] facedetect: Support opencv4 + +--- + src/filter/facedetect/facedetect.cpp | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/filter/facedetect/facedetect.cpp b/src/filter/facedetect/facedetect.cpp +index 1906962..580b53b 100644 +--- a/src/filter/facedetect/facedetect.cpp ++++ b/src/filter/facedetect/facedetect.cpp +@@ -148,13 +148,13 @@ class FaceDetect: public frei0r::filter + count = 1; // reset the recheck counter + if (objects.size() > 0) // reset the list of objects + objects.clear(); +- double elapsed = (double) cvGetTickCount(); ++ double elapsed = (double) cv::getTickCount(); + + objects = detect(); + + // use detection time to throttle frequency of re-detect vs. redraw (automatic recheck) +- elapsed = cvGetTickCount() - elapsed; +- elapsed = elapsed / ((double) cvGetTickFrequency() * 1000.0); ++ elapsed = cv::getTickCount() - elapsed; ++ elapsed = elapsed / ((double) cv::getTickFrequency() * 1000.0); + + // Automatic recheck uses an undocumented negative parameter value, + // which is not compliant, but technically feasible. +@@ -188,7 +188,7 @@ class FaceDetect: public frei0r::filter + } + + // use an equalized grayscale to improve detection +- cv::cvtColor(image_roi, gray, CV_BGR2GRAY); ++ cv::cvtColor(image_roi, gray, cv::COLOR_BGR2GRAY); + + // use a smaller image to improve performance + cv::resize(gray, small, cv::Size(cvRound(gray.cols * scale), cvRound(gray.rows * scale))); +@@ -249,8 +249,8 @@ class FaceDetect: public frei0r::filter + { + cv::Rect* r = (cv::Rect*) &objects[i]; + cv::Point center; +- int thickness = stroke <= 0? CV_FILLED : cvRound(stroke * 100); +- int linetype = antialias? CV_AA : 8; ++ int thickness = stroke <= 0? cv::FILLED : cvRound(stroke * 100); ++ int linetype = antialias? cv::LINE_AA : 8; + + center.x = cvRound((r->x + r->width * 0.5) / scale); + center.y = cvRound((r->y + r->height * 0.5) / scale); diff --git a/b8d4e0595c8134b2b3c7e82ecb8da36c9354f68a.patch b/b8d4e0595c8134b2b3c7e82ecb8da36c9354f68a.patch new file mode 100644 index 0000000..d3e3616 --- /dev/null +++ b/b8d4e0595c8134b2b3c7e82ecb8da36c9354f68a.patch @@ -0,0 +1,46 @@ +From b8d4e0595c8134b2b3c7e82ecb8da36c9354f68a Mon Sep 17 00:00:00 2001 +From: Dan Dennedy +Date: Sat, 11 Apr 2020 11:54:37 -0700 +Subject: [PATCH] fix c0rners filter top and left edge artifacts at default + full size + +--- + src/filter/c0rners/c0rners.c | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +diff --git a/src/filter/c0rners/c0rners.c b/src/filter/c0rners/c0rners.c +index e270253..f510926 100644 +--- a/src/filter/c0rners/c0rners.c ++++ b/src/filter/c0rners/c0rners.c +@@ -974,6 +974,8 @@ void f0r_get_param_value(f0r_instance_t instance, f0r_param_t param, int param_i + } + } + ++#define EPSILON 1e-5f ++#define EQUIVALENT_FLOATS(x, y) (fabsf((x) - (y)) < EPSILON) + + //------------------------------------------------- + void f0r_update(f0r_instance_t instance, double time, const uint32_t* inframe, uint32_t* outframe) +@@ -983,6 +985,22 @@ void f0r_update(f0r_instance_t instance, double time, const uint32_t* inframe, u + + p=(inst*)instance; + ++ if (EQUIVALENT_FLOATS(p->x1, 0.333333f) && ++ EQUIVALENT_FLOATS(p->y1, 0.333333f) && ++ EQUIVALENT_FLOATS(p->x2, 0.666666f) && ++ EQUIVALENT_FLOATS(p->y2, 0.333333f) && ++ EQUIVALENT_FLOATS(p->x3, 0.666666f) && ++ EQUIVALENT_FLOATS(p->y3, 0.666666f) && ++ EQUIVALENT_FLOATS(p->x4, 0.333333f) && ++ EQUIVALENT_FLOATS(p->y4, 0.666666f) && ++ (!p->stretchON || ( ++ EQUIVALENT_FLOATS(p->stretchx, 0.5f) && ++ EQUIVALENT_FLOATS(p->stretchy, 0.5f)))) ++ { ++ memcpy(outframe, inframe, p->w * p->h * 4); ++ return; ++ } ++ + if (p->mapIsDirty) { + tocka2 vog[4]; + int nots[4]; diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index 56e8eda..ef566cf 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.7.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Frei0r - a minimalist plugin API for video effects License: GPLv2+ @@ -8,6 +8,9 @@ URL: https://frei0r.dyne.org/ Source0: https://github.com/dyne/frei0r/archive/v%{version}/frei0r-plugins-%{version}.tar.gz Patch0: https://github.com/dyne/frei0r/pull/94/commits/b27f03c8d51c34cd5f79e0399bb0024ca94ea813.patch Patch1: https://github.com/dyne/frei0r/commit/7482c320b52956713d0b511771b23020fabd07a2.patch +Patch2: https://github.com/dyne/frei0r/commit/b4562db4ca20fefcce62dbe7b255c2b75951853e.patch +Patch3: https://github.com/dyne/frei0r/commit/b8d4e0595c8134b2b3c7e82ecb8da36c9354f68a.patch + Buildrequires: libtool @@ -40,13 +43,6 @@ developing applications that use %{name}. %prep %autosetup -n frei0r-%{version} -p1 -# few more hacks -sed -i -e 's/CV_HAAR_FIND_BIGGEST_OBJECT/cv::CASCADE_FIND_BIGGEST_OBJECT/' \ - -e 's/CV_HAAR_DO_CANNY_PRUNING/cv::CASCADE_DO_CANNY_PRUNING/' \ - -e 's/CV_BGR2GRAY/cv::COLOR_BGR2GRAY/' \ - -e 's/CV_BGR2HSV/cv::COLOR_BGR2HSV/' \ - src/filter/facebl0r/facebl0r.cpp - %build mkdir -p m4 @@ -79,6 +75,9 @@ rm -rf %{buildroot}%{_docdir}/%{name} %{_libdir}/pkgconfig/frei0r.pc %changelog +* Mon May 25 2020 Nicolas Chauvet - 1.7.0-7 +- Apply patches from PR toward opencv4 support + * Fri Mar 06 2020 Nicolas Chauvet - 1.7.0-6 - Update wip opencv patch From ec7a0070df0f6caa098e6ba53cdb3b12bf632d39 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 25 May 2020 10:39:08 +0200 Subject: [PATCH 61/73] Switch to cmake --- frei0r-plugins.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index ef566cf..337bb3f 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -10,9 +10,10 @@ Patch0: https://github.com/dyne/frei0r/pull/94/commits/b27f03c8d51c34cd5 Patch1: https://github.com/dyne/frei0r/commit/7482c320b52956713d0b511771b23020fabd07a2.patch Patch2: https://github.com/dyne/frei0r/commit/b4562db4ca20fefcce62dbe7b255c2b75951853e.patch Patch3: https://github.com/dyne/frei0r/commit/b8d4e0595c8134b2b3c7e82ecb8da36c9354f68a.patch +Patch4: Switch-to-OpenCV4-enums.patch -Buildrequires: libtool +Buildrequires: cmake BuildRequires: gcc-c++ BuildRequires: gavl-devel >= 0.2.3 @@ -45,13 +46,16 @@ developing applications that use %{name}. %build -mkdir -p m4 -autoreconf -i -%configure --disable-static +mkdir -p build +cd build +%cmake -DCMAKE_INSTALL_LIBDIR=%{_lib} \ + .. + %make_build %install +cd build %make_install #Remove installed doc @@ -77,6 +81,7 @@ rm -rf %{buildroot}%{_docdir}/%{name} %changelog * Mon May 25 2020 Nicolas Chauvet - 1.7.0-7 - Apply patches from PR toward opencv4 support +- Switch to cmake * Fri Mar 06 2020 Nicolas Chauvet - 1.7.0-6 - Update wip opencv patch From 2ffa9add78f56da877c1d636b26086b324a86326 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 4 Jun 2020 17:47:28 +0200 Subject: [PATCH 62/73] Rebuilt --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index 337bb3f..6e78f11 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.7.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Frei0r - a minimalist plugin API for video effects License: GPLv2+ @@ -79,6 +79,9 @@ rm -rf %{buildroot}%{_docdir}/%{name} %{_libdir}/pkgconfig/frei0r.pc %changelog +* Thu Jun 04 2020 Nicolas Chauvet - 1.7.0-8 +- Rebuilt for OpenCV 4.3 + * Mon May 25 2020 Nicolas Chauvet - 1.7.0-7 - Apply patches from PR toward opencv4 support - Switch to cmake From a90472d2f78b1311c4729843ceb5df4932848b5c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 17:51:26 +0000 Subject: [PATCH 63/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index 6e78f11..3a9a1db 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.7.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Frei0r - a minimalist plugin API for video effects License: GPLv2+ @@ -79,6 +79,9 @@ rm -rf %{buildroot}%{_docdir}/%{name} %{_libdir}/pkgconfig/frei0r.pc %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1.7.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Jun 04 2020 Nicolas Chauvet - 1.7.0-8 - Rebuilt for OpenCV 4.3 From 97a022f22db1a806a8bef6a1b448c1b7de772b6c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 01:04:49 +0000 Subject: [PATCH 64/73] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- frei0r-plugins.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index 3a9a1db..e72b9e7 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.7.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Frei0r - a minimalist plugin API for video effects License: GPLv2+ @@ -79,6 +79,10 @@ rm -rf %{buildroot}%{_docdir}/%{name} %{_libdir}/pkgconfig/frei0r.pc %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 1.7.0-10 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 1.7.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 2e0e1c9deccd78cf847dda026fc21d6256c2f397 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 2 Aug 2020 03:41:37 +0100 Subject: [PATCH 65/73] Fix cmake build --- frei0r-plugins.spec | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index e72b9e7..4967172 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -46,17 +46,13 @@ developing applications that use %{name}. %build -mkdir -p build -cd build %cmake -DCMAKE_INSTALL_LIBDIR=%{_lib} \ - .. -%make_build +%cmake_build %install -cd build -%make_install +%cmake_install #Remove installed doc rm -rf %{buildroot}%{_docdir}/%{name} @@ -82,6 +78,7 @@ rm -rf %{buildroot}%{_docdir}/%{name} * Sat Aug 01 2020 Fedora Release Engineering - 1.7.0-10 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild +- Fix cmake build * Mon Jul 27 2020 Fedora Release Engineering - 1.7.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 3e36665b4bd55272a050f39625db8f8c3330dcbb Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 22 Oct 2020 13:28:52 +0200 Subject: [PATCH 66/73] Rebuilt for OpenCV --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index 4967172..88ffb4d 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.7.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Frei0r - a minimalist plugin API for video effects License: GPLv2+ @@ -75,6 +75,9 @@ rm -rf %{buildroot}%{_docdir}/%{name} %{_libdir}/pkgconfig/frei0r.pc %changelog +* Thu Oct 22 2020 Nicolas Chauvet - 1.7.0-11 +- Rebuilt for OpenCV + * Sat Aug 01 2020 Fedora Release Engineering - 1.7.0-10 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From eb1d6ea7bea9d5cff2f1f8ab754616d076af4fe8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 05:57:09 +0000 Subject: [PATCH 67/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index 88ffb4d..ae47153 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.7.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Frei0r - a minimalist plugin API for video effects License: GPLv2+ @@ -75,6 +75,9 @@ rm -rf %{buildroot}%{_docdir}/%{name} %{_libdir}/pkgconfig/frei0r.pc %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.7.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Thu Oct 22 2020 Nicolas Chauvet - 1.7.0-11 - Rebuilt for OpenCV From 0d9be1940d5e1664b83a81523f25cd7937750f99 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 23:23:34 +0000 Subject: [PATCH 68/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index ae47153..ac7fd09 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.7.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Frei0r - a minimalist plugin API for video effects License: GPLv2+ @@ -75,6 +75,9 @@ rm -rf %{buildroot}%{_docdir}/%{name} %{_libdir}/pkgconfig/frei0r.pc %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 1.7.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 1.7.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 595636d2ee176b09668c70d34df507346896b7a4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 03:27:21 +0000 Subject: [PATCH 69/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index ac7fd09..837e22f 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.7.0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Frei0r - a minimalist plugin API for video effects License: GPLv2+ @@ -75,6 +75,9 @@ rm -rf %{buildroot}%{_docdir}/%{name} %{_libdir}/pkgconfig/frei0r.pc %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.7.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 1.7.0-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From a9df38b497b2a73a9f16c9b82cadf87ad72032e4 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 30 Mar 2022 14:20:22 +0200 Subject: [PATCH 70/73] Update to 1.8.0 --- frei0r-plugins.spec | 14 ++++++-------- sources | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index 837e22f..c5f986a 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,16 +1,11 @@ Name: frei0r-plugins -Version: 1.7.0 -Release: 14%{?dist} +Version: 1.8.0 +Release: 1%{?dist} Summary: Frei0r - a minimalist plugin API for video effects License: GPLv2+ URL: https://frei0r.dyne.org/ Source0: https://github.com/dyne/frei0r/archive/v%{version}/frei0r-plugins-%{version}.tar.gz -Patch0: https://github.com/dyne/frei0r/pull/94/commits/b27f03c8d51c34cd5f79e0399bb0024ca94ea813.patch -Patch1: https://github.com/dyne/frei0r/commit/7482c320b52956713d0b511771b23020fabd07a2.patch -Patch2: https://github.com/dyne/frei0r/commit/b4562db4ca20fefcce62dbe7b255c2b75951853e.patch -Patch3: https://github.com/dyne/frei0r/commit/b8d4e0595c8134b2b3c7e82ecb8da36c9354f68a.patch -Patch4: Switch-to-OpenCV4-enums.patch Buildrequires: cmake @@ -59,7 +54,7 @@ rm -rf %{buildroot}%{_docdir}/%{name} %files -%doc AUTHORS ChangeLog README.md TODO +%doc AUTHORS ChangeLog README.md %license COPYING %dir %{_libdir}/frei0r-1 %exclude %{_libdir}/frei0r-1/facebl0r.so @@ -75,6 +70,9 @@ rm -rf %{buildroot}%{_docdir}/%{name} %{_libdir}/pkgconfig/frei0r.pc %changelog +* Wed Mar 30 2022 Nicolas Chauvet - 1.8.0-1 +- Update to 1.8.0 + * Thu Jan 20 2022 Fedora Release Engineering - 1.7.0-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index ae1208e..464dfda 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (frei0r-plugins-1.7.0.tar.gz) = 5b8a4f7be0518b4d448c50abaa686d1b48e65cc0a909c18bd97ef85193c21b7c6677bb703b3861b817cd48b859cb1c8b9eae5236caf81d385bbe06f24a019717 +SHA512 (frei0r-plugins-1.8.0.tar.gz) = b23d0c0806ebc210d56d67bfe6e84b768d2f51e94189038e8d271893daf25433f875fadb4191678b9b0137b6793d1a553e7190d844afb05378bc02426dc9a462 From 27bde152f69ba194042dce6630d57aca7c30921e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 21 Jun 2022 02:14:05 +0100 Subject: [PATCH 71/73] Rebuilt for opencv 4.6.0 --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index c5f986a..af3f958 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Frei0r - a minimalist plugin API for video effects License: GPLv2+ @@ -70,6 +70,9 @@ rm -rf %{buildroot}%{_docdir}/%{name} %{_libdir}/pkgconfig/frei0r.pc %changelog +* Tue Jun 21 2022 Sérgio Basto - 1.8.0-2 +- Rebuilt for opencv 4.6.0 + * Wed Mar 30 2022 Nicolas Chauvet - 1.8.0-1 - Update to 1.8.0 From 24e5a36db445a77a92be14f261a7d657f52b74a2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 03:39:34 +0000 Subject: [PATCH 72/73] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- frei0r-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frei0r-plugins.spec b/frei0r-plugins.spec index af3f958..4a9b93b 100644 --- a/frei0r-plugins.spec +++ b/frei0r-plugins.spec @@ -1,6 +1,6 @@ Name: frei0r-plugins Version: 1.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Frei0r - a minimalist plugin API for video effects License: GPLv2+ @@ -70,6 +70,9 @@ rm -rf %{buildroot}%{_docdir}/%{name} %{_libdir}/pkgconfig/frei0r.pc %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 1.8.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Tue Jun 21 2022 Sérgio Basto - 1.8.0-2 - Rebuilt for opencv 4.6.0 From aa2dc50063b58f875c2202ebc92c7a5aef3ab519 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 20:17:23 +0300 Subject: [PATCH 73/73] Remove unnecessary files --- sources | 1 - 1 file changed, 1 deletion(-) delete mode 100644 sources diff --git a/sources b/sources deleted file mode 100644 index 464dfda..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (frei0r-plugins-1.8.0.tar.gz) = b23d0c0806ebc210d56d67bfe6e84b768d2f51e94189038e8d271893daf25433f875fadb4191678b9b0137b6793d1a553e7190d844afb05378bc02426dc9a462