3.24.1+1+geb394f19d

3 files changed, 72 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 41c9cb488a1a..e8c7c6044016 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat Feb 18 19:11:38 UTC 2017
+# Mon Apr 24 21:19:29 UTC 2017
 pkgbase = mutter-catalyst
 	pkgdesc = A window manager for GNOME with patches for catalyst compatibility
-	pkgver = 3.22.3
+	pkgver = 3.24.1+1+geb394f19d
 	pkgrel = 1
 	url = https://git.gnome.org/browse/mutter
 	arch = i686
@@ -26,17 +26,17 @@ pkgbase = mutter-catalyst
 	depends = gnome-settings-daemon
 	depends = libgudev
 	depends = libinput
-	provides = mutter=3.22.3
+	provides = mutter=3.24.1+1+geb394f19d
 	conflicts = mutter
-	conflicts = gnome-shell>3.22.3+999
+	conflicts = gnome-shell>3.24.1+999
 	options = !emptydirs
-	source = git+https://git.gnome.org/browse/mutter#commit=afb4165262ac7b51229663fdf859aee2dcc4b4e8
+	source = git+https://git.gnome.org/browse/mutter#commit=eb394f19d343a119cc3a887e4b2c563ddda8c5f4
 	source = startup-notification.patch
 	source = catalyst-workaround.patch
 	source = catalyst mutter cogl.patch
 	sha256sums = SKIP
 	sha256sums = 5a35ca4794fc361219658d9fae24a3ca21a365f2cb1901702961ac869c759366
-	sha256sums = cf6c54cf23dc5898ab105d8bde2d60fd3f6671b319ffef12b0584544bfb23655
+	sha256sums = 3b725ddcaa5feea615b592be2f8f02bf690ac363f3b80cc17508a2a80af854e5
 	sha256sums = 55079a9daddedc22d9fe4dcfe2e87607345dfafb370f8e7fb6a98c0acae3348a
 
 pkgname = mutter-catalyst
diff --git a/PKGBUILD b/PKGBUILD
index 7af79f0ad3b8..69af3f297d15 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 _realname=mutter
 pkgname=$_realname-catalyst
-pkgver=3.22.3
+pkgver=3.24.1+1+geb394f19d
 pkgrel=1
 pkgdesc="A window manager for GNOME with patches for catalyst compatibility"
 url="https://git.gnome.org/browse/mutter"
@@ -34,14 +34,14 @@ conflicts=('mutter' "gnome-shell>${pkgver:0:6}+999")
 provides=("mutter=${pkgver}")
 groups=('gnome')
 options=('!emptydirs')
-_commit=afb4165262ac7b51229663fdf859aee2dcc4b4e8  # tags/3.22.3^0
+_commit=eb394f19d343a119cc3a887e4b2c563ddda8c5f4  # gnome-3-24
 source=("git+https://git.gnome.org/browse/mutter#commit=$_commit"
   "startup-notification.patch"
   "catalyst-workaround.patch"
   "catalyst mutter cogl.patch")
 sha256sums=('SKIP'
             '5a35ca4794fc361219658d9fae24a3ca21a365f2cb1901702961ac869c759366'
-            'cf6c54cf23dc5898ab105d8bde2d60fd3f6671b319ffef12b0584544bfb23655'
+            'b8b6aa7693cc847aaefc3ba4affe250827598b1914219920aaa68f038e60155e'
             '55079a9daddedc22d9fe4dcfe2e87607345dfafb370f8e7fb6a98c0acae3348a')
 
 pkgver() {
@@ -75,7 +75,8 @@ build() {
     --disable-static \
     --disable-schemas-compile \
     --enable-compile-warnings=minimum \
-    --enable-gtk-doc
+    --enable-gtk-doc \
+    --enable-egl-device
 
   #https://bugzilla.gnome.org/show_bug.cgi?id=655517
   sed -e 's/ -shared / -Wl,-O1,--as-needed\0/g' \
diff --git a/catalyst-workaround.patch b/catalyst-workaround.patch
index c63ac1bc53f3..8c7b2d7bbc04 100644
--- a/catalyst-workaround.patch
+++ b/catalyst-workaround.patch
@@ -1,9 +1,6 @@
-@@ -, +, @@ 
- src/backends/x11/meta-monitor-manager-xrandr.c | 47 ++++++++++++++++++++++++--
- 1 file changed, 44 insertions(+), 3 deletions(-)
---- a/src/backends/x11/meta-monitor-manager-xrandr.c	
-+++ a/src/backends/x11/meta-monitor-manager-xrandr.c	
-@@ -1017,6 +1017,41 @@ output_set_underscanning_xrandr (MetaMonitorManagerXrandr *manager_xrandr,
+--- 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 @@
      }
  }
  
@@ -43,9 +40,9 @@
 +}
 +
  static void
- meta_monitor_manager_xrandr_apply_configuration (MetaMonitorManager *manager,
- 						 MetaCRTCInfo       **crtcs,
-@@ -1193,6 +1228,8 @@ meta_monitor_manager_xrandr_apply_configuration (MetaMonitorManager *manager,
+ apply_crtc_assignments (MetaMonitorManager *manager,
+                         MetaCrtcInfo      **crtcs,
+@@ -1235,6 +1270,8 @@
          }
      }
  
@@ -54,7 +51,7 @@
    for (i = 0; i < n_outputs; i++)
      {
        MetaOutputInfo *output_info = outputs[i];
-@@ -1205,9 +1242,13 @@ meta_monitor_manager_xrandr_apply_configuration (MetaMonitorManager *manager,
+@@ -1247,14 +1284,21 @@
                                 (XID)output_info->output->winsys_id);
          }
  
@@ -70,4 +67,57 @@
 +        }
  
        if (output_get_supports_underscanning_xrandr (manager_xrandr, output_info->output))
-         output_set_underscanning_xrandr (manager_xrandr,
+-        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