Accepting request 828076 from home:marxin:memory-constraint

Use memoryperjob constraint instead of %limit_build macro.

OBS-URL: https://build.opensuse.org/request/show/828076
OBS-URL: https://build.opensuse.org/package/show/science/opencv?expand=0&rev=17

_constraints

@@ -1,12 +1,14 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <constraints>
   <hardware>
     <disk>
-    <!-- build uses 20GB in maintenance projects currently 201502 -->
-	<size unit="G">13</size>
+      <size unit="G">13</size>
     </disk>
     <memory>
       <size unit="M">3000</size>
     </memory>
+    <memoryperjob>
+      <size unit="M">1000</size>
+    </memoryperjob>
   </hardware>
 </constraints>

opencv.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Aug 20 09:02:23 UTC 2020 - Martin Liška <mliska@suse.cz>
+
+- Use memoryperjob constraint instead of %limit_build macro.
+
 -------------------------------------------------------------------
 Sat Jun 13 22:03:12 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
 

opencv.spec

@@ -51,7 +51,6 @@ BuildRequires:  fdupes
 BuildRequires:  libeigen3-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  pkgconfig
-BuildRequires:  memory-constraints
 # OpenJPEGTargets.cmake erroneously requires the binaries
 BuildRequires:  openjpeg2
 BuildRequires:  tbb-devel
@@ -179,7 +178,6 @@ cp opencv_contrib-%{version}/LICENSE LICENSE.contrib
 rm -f doc/packaging.txt
 
 %build
-%limit_build -m 1000
 # Dynamic dispatch: https://github.com/opencv/opencv/wiki/CPU-optimizations-build-options
 # x86: disable SSE on 32bit, do not dispatch AVX and later - SSE3
 #      is the highest extension available on any non-64bit x86 CPU