[arch-commits] Commit in xorg-server/trunk (2 files)

[Laurent Carlier]

    Date: Friday, January 8, 2016 @ 19:11:50
  Author: lcarlier
Revision: 257644

upgpkg: xorg-server 1.18.0-4

remove glamor debugging messages from xorg log file (exposed with amdgpu driver)

Added:
  xorg-server/trunk/xserver-glamor-Disable-debugging-messages-other-than-GL-API-errors.patch
Modified:
  xorg-server/trunk/PKGBUILD

--------------------------------------------------------------------------+
 PKGBUILD                                                                 |   10 +++++--
 xserver-glamor-Disable-debugging-messages-other-than-GL-API-errors.patch |   14 ++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-01-08 18:10:00 UTC (rev 257643)
+++ PKGBUILD	2016-01-08 18:11:50 UTC (rev 257644)
@@ -5,7 +5,7 @@
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-xwayland' 'xorg-server-common' 'xorg-server-devel')
 pkgver=1.18.0
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 license=('custom')
 groups=('xorg')
@@ -21,7 +21,8 @@
         xvfb-run
         xvfb-run.1
         0001-systemd-logind-do-not-rely-on-directed-signals.patch
-        v2-Xorg.wrap-activate-libdrm-based-detection-for-KMS-drivers.patch)
+        v2-Xorg.wrap-activate-libdrm-based-detection-for-KMS-drivers.patch
+        xserver-glamor-Disable-debugging-messages-other-than-GL-API-errors.patch)
 validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
               'C383B778255613DFDB409D91DB221A6900000011'
               'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3')
@@ -30,7 +31,8 @@
             'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
             '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
             '3d7edab3a54d647e7d924b29d29f91b50212f308fcb1853a5aacd3181f58276c'
-            'c8addd0dc6d91797e82c51b539317efa271cd7997609e026c7c8e3884c5f601c')
+            'c8addd0dc6d91797e82c51b539317efa271cd7997609e026c7c8e3884c5f601c'
+            '1fe0c2c13bc3643a9a236bc45910e1e68d7b9cbe128204bcc1821752ed266e95')
 
 prepare() {
   cd "${pkgbase}-${pkgver}"
@@ -39,6 +41,8 @@
 
   # fix xorg only working with root FS#47061
   patch -Np1 -i ../v2-Xorg.wrap-activate-libdrm-based-detection-for-KMS-drivers.patch
+  # disable debugging glamor messages in xorg log file
+  patch -Np1 -i ../xserver-glamor-Disable-debugging-messages-other-than-GL-API-errors.patch
 
   autoreconf -fvi
 }

Added: xserver-glamor-Disable-debugging-messages-other-than-GL-API-errors.patch
===================================================================
--- xserver-glamor-Disable-debugging-messages-other-than-GL-API-errors.patch	                        (rev 0)
+++ xserver-glamor-Disable-debugging-messages-other-than-GL-API-errors.patch	2016-01-08 18:11:50 UTC (rev 257644)
@@ -0,0 +1,14 @@
+diff --git a/glamor/glamor.c b/glamor/glamor.c
+index 116d10c..81aba2d 100644
+--- a/glamor/glamor.c
++++ b/glamor/glamor.c
+@@ -393,6 +393,9 @@ glamor_setup_debug_output(ScreenPtr screen)
+         return;
+ 
+     glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS);
++    /* Disable debugging messages other than GL API errors */
++    glDebugMessageControl(GL_DONT_CARE, GL_DONT_CARE, GL_DONT_CARE, 0, NULL,
++                          GL_FALSE);
+     glDebugMessageControl(GL_DEBUG_SOURCE_API,
+                           GL_DEBUG_TYPE_ERROR,
+                           GL_DONT_CARE,