From e74a5124a85fd0ae2489854511047673f9eb0e06bbb4efc451d63fbb115e8e75 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Wed, 24 Jan 2024 11:26:46 +0000
Subject: [PATCH] Accepting request 1141036 from
 home:epaolantonio:branches:GNOME:Factory

- Rebase mutter-disable-cvt-s390x.patch for mutter 45.x.

Fixes build on s390x.

OBS-URL: https://build.opensuse.org/request/show/1141036
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=489
---
 mutter-disable-cvt-s390x.patch | 54 ++++++++++++++++++----------------
 mutter.changes                 |  5 ++++
 2 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/mutter-disable-cvt-s390x.patch b/mutter-disable-cvt-s390x.patch
index 9237490..eb16e8b 100644
--- a/mutter-disable-cvt-s390x.patch
+++ b/mutter-disable-cvt-s390x.patch
@@ -1,29 +1,6 @@
-Index: mutter-44.rc/src/meson.build
-===================================================================
---- mutter-44.rc.orig/src/meson.build
-+++ mutter-44.rc/src/meson.build
-@@ -912,6 +912,7 @@ if have_profiler
- endif
- 
- if have_native_backend
-+  if host_machine.cpu_family() != 's390x'
-   cvt = find_program('cvt')
- 
-   gen_default_modes = find_program('backends/native/gen-default-modes.py')
-@@ -919,6 +920,9 @@ if have_native_backend
-     output: 'meta-default-modes.h',
-     command: [gen_default_modes, '@OUTPUT@']
-   )
-+  else
-+    default_modes_h = 'backends/native/meta-default-modes.h'
-+  endif
-   mutter_built_sources += default_modes_h
- 
-   dbus_interfaces += [
-Index: mutter-44.rc/src/backends/native/meta-default-modes.h
-===================================================================
---- /dev/null
-+++ mutter-44.rc/src/backends/native/meta-default-modes.h
+diff -druN mutter-45.1.orig/src/backends/native/meta-default-modes-s390x.h mutter-45.1/src/backends/native/meta-default-modes-s390x.h
+--- mutter-45.1.orig/src/backends/native/meta-default-modes-s390x.h	1970-01-01 01:00:00.000000000 +0100
++++ mutter-45.1/src/backends/native/meta-default-modes-s390x.h	2024-01-23 16:35:55.791416596 +0100
 @@ -0,0 +1,57 @@
 +/* Generated by gen-default-modes.py */
 +
@@ -82,3 +59,28 @@ Index: mutter-44.rc/src/backends/native/meta-default-modes.h
 +{ 813000, 2304, 2307, 2312, 2386, 0, 4096, 4440, 4888, 5680, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "2304x4096_60.00" },
 +{ 1276500, 2880, 2883, 2888, 2982, 0, 5120, 5560, 6128, 7136, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "2880x5120_60.00" },
 +};
+diff -druN mutter-45.1.orig/src/meson.build mutter-45.1/src/meson.build
+--- mutter-45.1.orig/src/meson.build	2023-10-31 19:35:00.000000000 +0100
++++ mutter-45.1/src/meson.build	2024-01-23 18:07:33.487280694 +0100
+@@ -958,6 +958,7 @@
+ endif
+ 
+ if have_native_backend
++  if host_machine.cpu_family() != 's390x'
+   cvt = find_program('cvt')
+ 
+   gen_default_modes = find_program('backends/native/gen-default-modes.py')
+@@ -965,6 +966,13 @@
+     output: 'meta-default-modes.h',
+     command: [gen_default_modes, '@OUTPUT@']
+   )
++  else
++    default_modes_h = custom_target('meta-default-modes',
++      input: 'backends/native/meta-default-modes-s390x.h',
++      output: 'meta-default-modes.h',
++      command: ['cp', '@INPUT@', '@OUTPUT@']
++    )
++  endif
+   mutter_built_sources += default_modes_h
+ 
+   dbus_interfaces += [
diff --git a/mutter.changes b/mutter.changes
index 99a6ed3..535b91c 100644
--- a/mutter.changes
+++ b/mutter.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jan 23 17:35:28 UTC 2024 - Eugenio Paolantonio <eugenio.paolantonio@suse.com>
+
+- Rebase mutter-disable-cvt-s390x.patch for mutter 45.x. 
+
 -------------------------------------------------------------------
 Wed Jan 10 08:53:06 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>