From ec7a0070df0f6caa098e6ba53cdb3b12bf632d39 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 25 May 2020 10:39:08 +0200 Subject: [PATCH] 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