From 618acead7ddb792baefb41abf4e11bc86d15441d838b6335a40dc97da010d51b Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Tue, 15 Nov 2022 15:03:00 +0000
Subject: [PATCH 1/4] - build with '-j1' on ppc64 due to running OOM
 (boo#1205441)

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1161
---
 Mesa.changes | 5 +++++
 Mesa.spec    | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/Mesa.changes b/Mesa.changes
index b357c71..d0009cb 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Nov 15 15:01:19 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
+
+- build with '-j1' on ppc64 due to running OOM (boo#1205441)
+
 -------------------------------------------------------------------
 Tue Nov  8 12:24:26 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/Mesa.spec b/Mesa.spec
index 060d7c9..b3e857f 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -884,7 +884,12 @@ egl_platforms=x11,wayland
             -Dcpp_args="%{optflags}"
 %endif
 
+# not enough memory on ppc64le (boo#1205441)
+%ifarch ppc64 ppc64le
+%meson_build -j1
+%else
 %meson_build
+%endif
 
 %install
 %meson_install

From 8ce905f6de47f875834bc44f649553b672fb238808fdc8b2c48af1883f68375f Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Tue, 15 Nov 2022 15:38:10 +0000
Subject: [PATCH 2/4] - let's request 4G of physical memory via _constraints
 file - better changelog entry

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1162
---
 Mesa.changes | 4 +++-
 _constraints | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Mesa.changes b/Mesa.changes
index d0009cb..e4d5efa 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,7 +1,9 @@
 -------------------------------------------------------------------
 Tue Nov 15 15:01:19 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
 
-- build with '-j1' on ppc64 due to running OOM (boo#1205441)
+- try to fix build on ppc64le due to running OOM (boo#1205441)
+  * build with '-j1' on ppc64
+  * let's request 4G of physical memory via _constraints file
 
 -------------------------------------------------------------------
 Tue Nov  8 12:24:26 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
diff --git a/_constraints b/_constraints
index fd47420..a30720c 100644
--- a/_constraints
+++ b/_constraints
@@ -12,6 +12,9 @@
       <disk>
         <size unit="G">9</size>
       </disk>
+      <memory>
+        <size unit="M">4096</size>
+      </memory>
     </hardware>
   </overwrite>
 </constraints>

From 2f6f5ba80032ee0b0184e652afe810610072f3199a28e41f77642c1e7c432dc4 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Tue, 15 Nov 2022 15:44:07 +0000
Subject: [PATCH 3/4] _constraints: only request 4G of physical memory on ppc64

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1163
---
 Mesa.changes |  2 +-
 _constraints | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Mesa.changes b/Mesa.changes
index e4d5efa..a75939b 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -2,7 +2,7 @@
 Tue Nov 15 15:01:19 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
 
 - try to fix build on ppc64le due to running OOM (boo#1205441)
-  * build with '-j1' on ppc64
+  * build with '-j1'
   * let's request 4G of physical memory via _constraints file
 
 -------------------------------------------------------------------
diff --git a/_constraints b/_constraints
index a30720c..8044594 100644
--- a/_constraints
+++ b/_constraints
@@ -3,8 +3,6 @@
     <conditions>
       <arch>aarch64</arch>
       <arch>ppc</arch>
-      <arch>ppc64</arch>
-      <arch>ppc64le</arch>
       <arch>x86_64</arch>
       <arch>i586</arch>
     </conditions>
@@ -12,9 +10,20 @@
       <disk>
         <size unit="G">9</size>
       </disk>
-      <memory>
-        <size unit="M">4096</size>
-      </memory>
+    </hardware>
+  </overwrite>
+  <overwrite>
+    <conditions>
+      <arch>ppc64</arch>
+      <arch>ppc64le</arch>
+    </conditions>
+    <hardware>
+      <disk>
+        <size unit="G">9</size>
+      </disk>
+      <physicalmemory>
+        <size unit="G">4</size>
+      </physicalmemory>
     </hardware>
   </overwrite>
 </constraints>

From 75995df2d5aabb354511073ad65983e90c6c6fc7920d99020408aa911b04d4ab Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Wed, 16 Nov 2022 15:28:26 +0000
Subject: [PATCH 4/4] let's request 20G of physical memory via _constraints
 file instead of building with '-j1'

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1164
---
 Mesa.changes | 3 +--
 Mesa.spec    | 5 -----
 _constraints | 2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/Mesa.changes b/Mesa.changes
index a75939b..4572cba 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -2,8 +2,7 @@
 Tue Nov 15 15:01:19 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
 
 - try to fix build on ppc64le due to running OOM (boo#1205441)
-  * build with '-j1'
-  * let's request 4G of physical memory via _constraints file
+  * let's request 20G of physical memory via _constraints file
 
 -------------------------------------------------------------------
 Tue Nov  8 12:24:26 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
diff --git a/Mesa.spec b/Mesa.spec
index b3e857f..060d7c9 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -884,12 +884,7 @@ egl_platforms=x11,wayland
             -Dcpp_args="%{optflags}"
 %endif
 
-# not enough memory on ppc64le (boo#1205441)
-%ifarch ppc64 ppc64le
-%meson_build -j1
-%else
 %meson_build
-%endif
 
 %install
 %meson_install
diff --git a/_constraints b/_constraints
index 8044594..03d0a0c 100644
--- a/_constraints
+++ b/_constraints
@@ -22,7 +22,7 @@
         <size unit="G">9</size>
       </disk>
       <physicalmemory>
-        <size unit="G">4</size>
+        <size unit="G">20</size>
       </physicalmemory>
     </hardware>
   </overwrite>