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

[Laurent Carlier]

    Date: Tuesday, February 9, 2016 @ 13:05:12
  Author: lcarlier
Revision: 258999

upgpkg: xorg-server 1.18.1-1

upstream update 1.18.1

Modified:
  xorg-server/trunk/PKGBUILD
Deleted:
  xorg-server/trunk/v2-Xorg.wrap-activate-libdrm-based-detection-for-KMS-drivers.patch
  xorg-server/trunk/xserver-glamor-Disable-debugging-messages-other-than-GL-API-errors.patch

--------------------------------------------------------------------------+
 PKGBUILD                                                                 |   21 ++--------
 v2-Xorg.wrap-activate-libdrm-based-detection-for-KMS-drivers.patch       |   12 -----
 xserver-glamor-Disable-debugging-messages-other-than-GL-API-errors.patch |   14 ------
 3 files changed, 5 insertions(+), 42 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-02-09 03:14:33 UTC (rev 258998)
+++ PKGBUILD	2016-02-09 12:05:12 UTC (rev 258999)
@@ -4,8 +4,8 @@
 
 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=4
+pkgver=1.18.1
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom')
 groups=('xorg')
@@ -20,31 +20,20 @@
 source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig}
         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
-        xserver-glamor-Disable-debugging-messages-other-than-GL-API-errors.patch)
+        0001-systemd-logind-do-not-rely-on-directed-signals.patch)
 validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
               'C383B778255613DFDB409D91DB221A6900000011'
               'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3')
-sha256sums=('195670819695d9cedd8dde95fbe069be0d0f488a77797a2d409f9f702daf312e'
+sha256sums=('85ec56dbeb89a951295cdf4f39bf38e515f900d35e06d4a8081b114d1520789d'
             'SKIP'
             'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
             '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
-            '3d7edab3a54d647e7d924b29d29f91b50212f308fcb1853a5aacd3181f58276c'
-            'c8addd0dc6d91797e82c51b539317efa271cd7997609e026c7c8e3884c5f601c'
-            '1fe0c2c13bc3643a9a236bc45910e1e68d7b9cbe128204bcc1821752ed266e95')
+            '3d7edab3a54d647e7d924b29d29f91b50212f308fcb1853a5aacd3181f58276c')
 
 prepare() {
   cd "${pkgbase}-${pkgver}"
   # fix VT switching with kdbus; from upstream
   patch -Np1 -i ../0001-systemd-logind-do-not-rely-on-directed-signals.patch
-
-  # 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
 }
 
 build() {

Deleted: v2-Xorg.wrap-activate-libdrm-based-detection-for-KMS-drivers.patch
===================================================================
--- v2-Xorg.wrap-activate-libdrm-based-detection-for-KMS-drivers.patch	2016-02-09 03:14:33 UTC (rev 258998)
+++ v2-Xorg.wrap-activate-libdrm-based-detection-for-KMS-drivers.patch	2016-02-09 12:05:12 UTC (rev 258999)
@@ -1,12 +0,0 @@
-diff --git a/hw/xfree86/xorg-wrapper.c b/hw/xfree86/xorg-wrapper.c
-index 4c37cfc..d930962 100644
---- a/hw/xfree86/xorg-wrapper.c
-+++ b/hw/xfree86/xorg-wrapper.c
-@@ -24,6 +24,7 @@
-  */
- 
- #include "dix-config.h"
-+#include "xorg-config.h"
- 
- #include <errno.h>
- #include <fcntl.h>

Deleted: xserver-glamor-Disable-debugging-messages-other-than-GL-API-errors.patch
===================================================================
--- xserver-glamor-Disable-debugging-messages-other-than-GL-API-errors.patch	2016-02-09 03:14:33 UTC (rev 258998)
+++ xserver-glamor-Disable-debugging-messages-other-than-GL-API-errors.patch	2016-02-09 12:05:12 UTC (rev 258999)
@@ -1,14 +0,0 @@
-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,