3.24.1+1+geb394f19d-2

it now seems as if no additional patch content was really necessary
reverting to rebase of the previous patch

2 files changed, 12 insertions, 63 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 69af3f297d15..d72d9f5c5b79 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 _realname=mutter
 pkgname=$_realname-catalyst
 pkgver=3.24.1+1+geb394f19d
-pkgrel=1
+pkgrel=2
 pkgdesc="A window manager for GNOME with patches for catalyst compatibility"
 url="https://git.gnome.org/browse/mutter"
 arch=(i686 x86_64)
@@ -41,7 +41,7 @@ source=("git+https://git.gnome.org/browse/mutter#commit=$_commit"
   "catalyst mutter cogl.patch")
 sha256sums=('SKIP'
             '5a35ca4794fc361219658d9fae24a3ca21a365f2cb1901702961ac869c759366'
-            'b8b6aa7693cc847aaefc3ba4affe250827598b1914219920aaa68f038e60155e'
+            '754f21d4256128d3f49981fdf316f3345868969a87443e0795218043f1d1291b'
             '55079a9daddedc22d9fe4dcfe2e87607345dfafb370f8e7fb6a98c0acae3348a')
 
 pkgver() {
@@ -56,8 +56,8 @@ prepare() {
   patch -Np1 -i ../startup-notification.patch
 
   # https://bugzilla.gnome.org/show_bug.cgi?id=741581
-  echo "Commenting out call to function with XRRChangeOutputProperty to fix issue with catalyst"
-  patch -Np1 < "${srcdir}/catalyst-workaround.patch"
+  echo "Skipping call to output_set_presentation_xrandr to fix issue with catalyst"
+  patch -Np1 -i "${srcdir}/catalyst-workaround.patch"
   # https://bugzilla.gnome.org/show_bug.cgi?id=756306
   echo "workaround compatibility shaders used in fw compat ctx in cogl"
   patch -Np1 -i "${srcdir}/catalyst mutter cogl.patch"
diff --git a/catalyst-workaround.patch b/catalyst-workaround.patch
index 8c7b2d7bbc04..0d7272ff7478 100644
--- a/catalyst-workaround.patch
+++ b/catalyst-workaround.patch
@@ -1,6 +1,8 @@
---- mutter/src/backends/x11/meta-monitor-manager-xrandr.c.orig	2017-04-24 21:56:35.531470289 +0200
-+++ mutter/src/backends/x11/meta-monitor-manager-xrandr.c	2017-04-30 01:50:55.593135688 +0200
-@@ -1060,6 +1060,41 @@
+diff --git a/src/backends/x11/meta-monitor-manager-xrandr.c b/src/backends/x11/meta-monitor-manager-xrandr.c
+index cc7a4440a..3bc1f0496 100644
+--- a/src/backends/x11/meta-monitor-manager-xrandr.c
++++ b/src/backends/x11/meta-monitor-manager-xrandr.c
+@@ -1060,6 +1060,41 @@ output_set_underscanning_xrandr (MetaMonitorManagerXrandr *manager_xrandr,
      }
  }
  
@@ -42,7 +44,7 @@
  static void
  apply_crtc_assignments (MetaMonitorManager *manager,
                          MetaCrtcInfo      **crtcs,
-@@ -1235,6 +1270,8 @@
+@@ -1235,6 +1270,8 @@ apply_crtc_assignments (MetaMonitorManager *manager,
          }
      }
  
@@ -51,7 +53,7 @@
    for (i = 0; i < n_outputs; i++)
      {
        MetaOutputInfo *output_info = outputs[i];
-@@ -1247,14 +1284,21 @@
+@@ -1247,9 +1284,13 @@ apply_crtc_assignments (MetaMonitorManager *manager,
                                 (XID)output_info->output->winsys_id);
          }
  
@@ -67,57 +69,4 @@
 +        }
  
        if (output_get_supports_underscanning_xrandr (manager_xrandr, output_info->output))
--        output_set_underscanning_xrandr (manager_xrandr,
--                                         output_info->output,
--                                         output_info->is_underscanning);
-+        if (fglrx_kernel_module_loaded != 1)
-+          {
-+            output_set_underscanning_xrandr (manager_xrandr,
-+                                             output_info->output,
-+                                             output_info->is_underscanning);
-+          }
- 
-       output->is_primary = output_info->is_primary;
-       output->is_presentation = output_info->is_presentation;
-@@ -1335,22 +1379,26 @@
- 					      MetaOutput         *output,
- 					      gint                value)
- {
--  MetaMonitorManagerXrandr *manager_xrandr = META_MONITOR_MANAGER_XRANDR (manager);
--  Atom atom;
--  int hw_value;
--
--  hw_value = round ((double)value / 100.0 * output->backlight_max + output->backlight_min);
--
--  atom = XInternAtom (manager_xrandr->xdisplay, "Backlight", False);
--
--  xcb_randr_change_output_property (XGetXCBConnection (manager_xrandr->xdisplay),
--                                    (XID)output->winsys_id,
--                                    atom, XCB_ATOM_INTEGER, 32,
--                                    XCB_PROP_MODE_REPLACE,
--                                    1, &hw_value);
-+  int fglrx_kernel_module_loaded = output_get_fglrx_kernel_module_loaded();
-+  if (fglrx_kernel_module_loaded != 1)
-+    {
-+      MetaMonitorManagerXrandr *manager_xrandr = META_MONITOR_MANAGER_XRANDR (manager);
-+      Atom atom;
-+      int hw_value;
-+
-+      hw_value = round ((double)value / 100.0 * output->backlight_max + output->backlight_min);
-+
-+      atom = XInternAtom (manager_xrandr->xdisplay, "Backlight", False);
-+
-+      xcb_randr_change_output_property (XGetXCBConnection (manager_xrandr->xdisplay),
-+                                        (XID)output->winsys_id,
-+                                        atom, XCB_ATOM_INTEGER, 32,
-+                                        XCB_PROP_MODE_REPLACE,
-+                                        1, &hw_value);
- 
--  /* We're not selecting for property notifies, so update the value immediately */
--  output->backlight = normalize_backlight (output, hw_value);
-+      /* We're not selecting for property notifies, so update the value immediately */
-+      output->backlight = normalize_backlight (output, hw_value);
-+    }
- }
- 
- static void
+         output_set_underscanning_xrandr (manager_xrandr,