From 36318933a4cc8201967dda508c68e9b6a4bbbecbea3a602a997363a6b667f646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= Date: Thu, 29 Aug 2019 10:59:56 +0000 Subject: [PATCH 1/3] Accepting request 726121 from home:jengelh:branches:science - Remove pointless empty scriptlets OBS-URL: https://build.opensuse.org/request/show/726121 OBS-URL: https://build.opensuse.org/package/show/science/ade?expand=0&rev=3 --- ade.changes | 5 +++++ ade.spec | 8 +++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ade.changes b/ade.changes index 8f63ada..ba0ae51 100644 --- a/ade.changes +++ b/ade.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 26 09:24:28 UTC 2019 - Jan Engelhardt + +- Remove pointless empty scriptlets + ------------------------------------------------------------------- Tue Jul 2 21:27:53 UTC 2019 - Stefan Brüns diff --git a/ade.spec b/ade.spec index 73629bd..faa90b9 100644 --- a/ade.spec +++ b/ade.spec @@ -12,9 +12,10 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %bcond_with tests %bcond_with docs %bcond_without tutorials @@ -29,8 +30,8 @@ Url: http://opencv.org/ Source0: https://github.com/opencv/ade/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz # PATCH-FIX-UPSTREAM https://github.com/opencv/ade/pull/15.patch Patch0: Silence_redundant-move_warning.patch -BuildRequires: cmake > 3.2 BuildRequires: c++_compiler +BuildRequires: cmake > 3.2 %if %{with tests} BuildRequires: gtest %endif @@ -66,9 +67,6 @@ sed -i -e 's@ DESTINATION lib@ DESTINATION ${CMAKE_INSTALL_LIBDIR}@' sources/ade %install %cmake_install -%post -%postun - %files devel %license LICENSE %doc README.md From 4dd498f6c14ce95d1daac82e25508ca7effcf153e37035ef41a3e5d9aad9317e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= Date: Tue, 10 Sep 2019 19:32:57 +0000 Subject: [PATCH 2/3] Accepting request 729948 from home:StefanBruens:branches:science Fix build with LTO, update OBS-URL: https://build.opensuse.org/request/show/729948 OBS-URL: https://build.opensuse.org/package/show/science/ade?expand=0&rev=4 --- ade-0.1.1d.tar.gz | 3 --- ade-0.1.1f.tar.gz | 3 +++ ade.changes | 8 ++++++++ ade.spec | 25 +++++++++++++++++-------- 4 files changed, 28 insertions(+), 11 deletions(-) delete mode 100644 ade-0.1.1d.tar.gz create mode 100644 ade-0.1.1f.tar.gz diff --git a/ade-0.1.1d.tar.gz b/ade-0.1.1d.tar.gz deleted file mode 100644 index a5054ab..0000000 --- a/ade-0.1.1d.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a6d84dae252f8244d4eebb5241715e3339edd86dbbc80a2fc5953c94e6d3eb00 -size 115694 diff --git a/ade-0.1.1f.tar.gz b/ade-0.1.1f.tar.gz new file mode 100644 index 0000000..ce699d0 --- /dev/null +++ b/ade-0.1.1f.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c316680efbb5dd3ac4e10bb8cea345cf26a6a25ebc22418f8f0b8ca931a550e9 +size 116074 diff --git a/ade.changes b/ade.changes index ba0ae51..9652eb4 100644 --- a/ade.changes +++ b/ade.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Sep 10 18:55:12 UTC 2019 - Stefan Brüns + +- Update to version 0.1.1f +- Drop upstream Silence_redundant-move_warning.patch +- Use -ffat-lto-objects to provide a proper static library. +- Run tests by default + ------------------------------------------------------------------- Mon Aug 26 09:24:28 UTC 2019 - Jan Engelhardt diff --git a/ade.spec b/ade.spec index faa90b9..493bb7a 100644 --- a/ade.spec +++ b/ade.spec @@ -16,20 +16,20 @@ # -%bcond_with tests +%global _lto_cflags %{_lto_cflags} -ffat-lto-objects + +%bcond_without tests %bcond_with docs -%bcond_without tutorials +%bcond_with tutorials Name: ade -Version: 0.1.1d +Version: 0.1.1f Release: 0 Summary: Graph construction, manipulation, and processing framework License: Apache-2.0 Group: Development/Libraries/C and C++ Url: http://opencv.org/ Source0: https://github.com/opencv/ade/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM https://github.com/opencv/ade/pull/15.patch -Patch0: Silence_redundant-move_warning.patch BuildRequires: c++_compiler BuildRequires: cmake > 3.2 %if %{with tests} @@ -53,19 +53,28 @@ for organizing data flow processing and execution. %prep %setup -q -%patch0 -p1 # fixup library install directory (i.e. use CMake default) sed -i -e 's@ DESTINATION lib@ DESTINATION ${CMAKE_INSTALL_LIBDIR}@' sources/ade/CMakeLists.txt %build %cmake \ - %{?with tutorials:-DBUILD_ADE_TUTORIAL=ON} \ - %{?with docs:-DBUILD_ADE_DOCUMENTATION=ON} \ + %{?with_tutorials:-DBUILD_ADE_TUTORIAL=ON} \ + %{?with_docs:-DBUILD_ADE_DOCUMENTATION=ON} \ + %{?with_tests:-DGTEST_ROOT:PATH=%{_prefix} -DENABLE_ADE_TESTING=ON} \ + %cmake_build %install %cmake_install +%if %{with tests} +rm %{buildroot}%{_bindir}/ade-tests +%endif + +%check +%if %{with tests} +%ctest +%endif %files devel %license LICENSE From d49096cc02f84fca9bfdd6ec0f94761c1ffdb24b737d1fda5bc3c6583ac7a6b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= Date: Tue, 10 Sep 2019 19:46:33 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/science/ade?expand=0&rev=5 --- Silence_redundant-move_warning.patch | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 Silence_redundant-move_warning.patch diff --git a/Silence_redundant-move_warning.patch b/Silence_redundant-move_warning.patch deleted file mode 100644 index 7ae588a..0000000 --- a/Silence_redundant-move_warning.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 08238a4e62e88ad976352c983f8212439a8f901e Mon Sep 17 00:00:00 2001 -From: Pavel Grunt -Date: Thu, 13 Jun 2019 10:40:14 +0200 -Subject: [PATCH] Silence redundant-move warning - -Happens with gcc-9.1 ---- - sources/ade/source/execution_engine.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sources/ade/source/execution_engine.cpp b/sources/ade/source/execution_engine.cpp -index fbc4b1d..3bc10a1 100644 ---- a/sources/ade/source/execution_engine.cpp -+++ b/sources/ade/source/execution_engine.cpp -@@ -138,7 +138,7 @@ std::unique_ptr ExecutionEngine::createExecutable(const Graph& graph - } - } - -- return std::move(ret); -+ return ret; - } - - void ExecutionEngine::addExecutableDependency(const std::string& lazyPassName)