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

2020-09-02 Thread Laurent Carlier via arch-commits 
Date: Wednesday, September 2, 2020 @ 06:19:48
  Author: lcarlier
Revision: 395120

upgpkg: xorg-server 1.20.9-2: fix FS#67774

Added:
  
xorg-server/trunk/0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch
Modified:
  xorg-server/trunk/PKGBUILD
Deleted:
  xorg-server/trunk/0001-fix-for-ZDI-11426.patch

-+
 0001-fix-for-ZDI-11426.patch|   34 
--
 0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch |   34 
++
 PKGBUILD|7 +-
 3 files changed, 40 insertions(+), 35 deletions(-)

Deleted: 0001-fix-for-ZDI-11426.patch
===
--- 0001-fix-for-ZDI-11426.patch2020-09-02 06:07:37 UTC (rev 395119)
+++ 0001-fix-for-ZDI-11426.patch2020-09-02 06:19:48 UTC (rev 395120)
@@ -1,34 +0,0 @@
-From aac28e162e5108510065ad4c323affd6deffd816 Mon Sep 17 00:00:00 2001
-From: Matthieu Herrb 
-Date: Sat, 25 Jul 2020 19:33:50 +0200
-Subject: [PATCH] fix for ZDI-11426
-
-Avoid leaking un-initalized memory to clients by zeroing the
-whole pixmap on initial allocation.
-
-This vulnerability was discovered by:
-Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
-
-Signed-off-by: Matthieu Herrb 
-Reviewed-by: Alan Coopersmith 
-Signed-off-by: Laurent Carlier 

- dix/pixmap.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dix/pixmap.c b/dix/pixmap.c
-index 1186d7dbb..5a0146bbb 100644
 a/dix/pixmap.c
-+++ b/dix/pixmap.c
-@@ -116,7 +116,7 @@ AllocatePixmap(ScreenPtr pScreen, int pixDataSize)
- if (pScreen->totalPixmapSize > ((size_t) - 1) - pixDataSize)
- return NullPixmap;
- 
--pPixmap = malloc(pScreen->totalPixmapSize + pixDataSize);
-+pPixmap = calloc(1, pScreen->totalPixmapSize + pixDataSize);
- if (!pPixmap)
- return NullPixmap;
- 
--- 
-2.28.0
-

Added: 0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch
===
--- 0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch 
(rev 0)
+++ 0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch 
2020-09-02 06:19:48 UTC (rev 395120)
@@ -0,0 +1,34 @@
+From 919f1f46fc67dae93b2b3f278fcbfc77af34ec58 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michel=20D=C3=A4nzer?= 
+Date: Mon, 31 Aug 2020 12:10:43 +0200
+Subject: [PATCH] xfree86: Take second reference for SavedCursor in
+ xf86CursorSetCursor
+
+The same pointer is kept in CurrentCursor as well, therefore two
+RefCursor calls are needed.
+
+Fixes use-after-free after switching VTs.
+
+Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1067
+Signed-off-by: Laurent Carlier 
+---
+ hw/xfree86/ramdac/xf86CursorRD.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/hw/xfree86/ramdac/xf86CursorRD.c 
b/hw/xfree86/ramdac/xf86CursorRD.c
+index 9aa3de97b..c8362d169 100644
+--- a/hw/xfree86/ramdac/xf86CursorRD.c
 b/hw/xfree86/ramdac/xf86CursorRD.c
+@@ -334,6 +334,9 @@ xf86CursorSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, 
CursorPtr pCurs,
+ ScreenPriv->HotY = cursor->bits->yhot;
+ 
+ if (!infoPtr->pScrn->vtSema) {
++cursor = RefCursor(cursor);
++if (ScreenPriv->SavedCursor)
++FreeCursor(ScreenPriv->SavedCursor, None);
+ ScreenPriv->SavedCursor = cursor;
+ return;
+ }
+-- 
+2.28.0
+

Modified: PKGBUILD
===
--- PKGBUILD2020-09-02 06:07:37 UTC (rev 395119)
+++ PKGBUILD2020-09-02 06:19:48 UTC (rev 395120)
@@ -5,7 +5,7 @@
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xvfb' 
'xorg-server-xnest'
  'xorg-server-xwayland' 'xorg-server-common' 'xorg-server-devel')
 pkgver=1.20.9
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 license=('custom')
 groups=('xorg')
@@ -20,6 +20,7 @@
 xserver-autobind-hotplug.patch
 0001-v2-FS-58644.patch
 0002-fix-libshadow-2.patch
+0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch
 xvfb-run # with updates from FC master
 xvfb-run.1)
 validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
@@ -32,6 +33,7 @@
 
'd84f4d63a502b7af76ea49944d1b21e2030dfd250ac1e82878935cf631973310ac9ba1f0dfedf10980ec6c7431d61b7daa4b7bbaae9ee477b2c19812c1661a22'
 
'74e1aa0c101e42f0f25349d305641873b3a79ab3b9bb2d4ed68ba8e392b4db2701fcbc35826531ee2667d3ee55673e4b4fecc2a9f088141af29ceb400f72f363'
 
'3d3be34ad9fa976daec53573d3a30a9f1953341ba5ee27099af0141f0ef7994fa5cf84dc08aae848380e6abfc10879f9a67f07601c7a437abf8aef13a3ec9fe1'
+
'7511af2aa99e2f6398987350ad0ff089c22c10017d40981ab610201b953ca4b29cd24aa1ff201ba792f03bdcca7d59d34c2809f4691f84bd86e8ec8016dd279d'

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

2018-06-16 Thread Laurent Carlier via arch-commits 
Date: Sunday, June 17, 2018 @ 05:33:33
  Author: lcarlier
Revision: 327086

upgpkg: xorg-server 1.20.0-8

fix FS#59025 and FS#58637

Added:
  
xorg-server/trunk/meson-Add-configuration-of-listening-on-tcp-unix-and-local.patch
  
xorg-server/trunk/xserver-modesetting-use-drmmode_bo_import-for-rotate_fb.patch
Modified:
  xorg-server/trunk/PKGBUILD

--+
 PKGBUILD |   14 +++
 meson-Add-configuration-of-listening-on-tcp-unix-and-local.patch |   36 
++
 xserver-modesetting-use-drmmode_bo_import-for-rotate_fb.patch|   18 +
 3 files changed, 66 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-06-17 00:05:03 UTC (rev 327085)
+++ PKGBUILD2018-06-17 05:33:33 UTC (rev 327086)
@@ -6,7 +6,7 @@
 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.20.0
-pkgrel=7
+pkgrel=8
 arch=('x86_64')
 license=('custom')
 groups=('xorg')
@@ -25,6 +25,8 @@
 0003_Use_PictureMatchFormat_for_source-only_picture_format.diff
 
xserver-1-2-glamor-Always-return-0-from-glamor_fds_from_pixmap-on-error.patch
 
xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_pixmap.patch
+meson-Add-configuration-of-listening-on-tcp-unix-and-local.patch
+xserver-modesetting-use-drmmode_bo_import-for-rotate_fb.patch
 xvfb-run # with updates from FC master
 xvfb-run.1)
 validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
@@ -40,6 +42,8 @@
 
'afe5c58d86089f02d4f3b7d0e6912cd3d75a17522b40e9cd7d4c69611740174884de3455940c6a565ffaad0f4e7e4f7ebeab72b79e8c6ef15da57418fbedcf0d'
 
'a8f65ca23ae52865147bdc1bc059b1265ba4bc61527992cf054fe76a0396ef5dfd2386782be371e926184a63def3be7333bb37fc429627d4e6fa159d263f40f7'
 
'fc259a0a4acb7b70209fc599b0f4bc94942316bbc8c6995f783026b7cd455900bcb7527615d76c99bd2e0155e0035cbd619939a1f7ddf3af32ed854afe45b631'
+
'1990daa38f2eba161ecc2f310711af85e3d76c78ca45e002dff3697da2f8a2dc53d9371b1e7e55be80a002ef9cb095c6675e19021f270d06cf2b4ea728407aea'
+
'e6339cb1c41e26a43caae7f3e991e9f528000676c29f5bc5a29c99bab2a5f5529efba2b9226a63d138700e6228b234eccd2982d40052b4ee41cfdff96dcc1521'
 
'55bbf520333f6e818b0125b37179a7039b69a0d3d2242b80a08da003d94cbf6c1fb912d880abcce318a85d7947e3eff8fbc4cdf57d7118572e8ebc56c4569af6'
 
'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22')
 
@@ -65,8 +69,14 @@
   # https://bugs.freedesktop.org/show_bug.cgi?id=106656
   patch -Np1 -i ../0002-fix-libshadow-2.patch
 
-  # FS#i58662
+  # FS#58662
   patch -Np1 -i 
../0003_Use_PictureMatchFormat_for_source-only_picture_format.diff
+
+  # Display incorrect when rotated 90 degree - FS#58637
+  patch -Np1 -i 
../xserver-modesetting-use-drmmode_bo_import-for-rotate_fb.patch
+
+  # xserver by default listens on tcp sockets - FS##59025
+  patch -Np1 -i 
../meson-Add-configuration-of-listening-on-tcp-unix-and-local.patch
 }
 
 build() {

Added: meson-Add-configuration-of-listening-on-tcp-unix-and-local.patch
===
--- meson-Add-configuration-of-listening-on-tcp-unix-and-local.patch
(rev 0)
+++ meson-Add-configuration-of-listening-on-tcp-unix-and-local.patch
2018-06-17 05:33:33 UTC (rev 327086)
@@ -0,0 +1,36 @@
+diff --git a/include/meson.build b/include/meson.build
+index f76f557..dfca3c3 100644
+--- a/include/meson.build
 b/include/meson.build
+@@ -153,10 +153,10 @@ conf_data.set('BUSFAULT', 
conf_data.get('HAVE_SIGACTION'))
+ conf_data.set('_XTYPEDEF_POINTER', '1')
+ conf_data.set('_XITYPEDEF_POINTER', '1')
+ 
++conf_data.set('LISTEN_TCP', get_option('listen_tcp'))
++conf_data.set('LISTEN_UNIX', get_option('listen_unix'))
++conf_data.set('LISTEN_LOCAL', get_option('listen_local'))
+ # XXX: Configurable?
+-conf_data.set('LISTEN_TCP', '1')
+-conf_data.set('LISTEN_UNIX', '1')
+-conf_data.set('LISTEN_LOCAL', '1')
+ conf_data.set('XTRANS_SEND_FDS', '1')
+ 
+ conf_data.set('TCPCONN', '1')
+diff --git a/meson_options.txt b/meson_options.txt
+index 86fca46..3453b8d 100644
+--- a/meson_options.txt
 b/meson_options.txt
+@@ -45,6 +45,13 @@ option('vendor_name_short', type: 'string', value: 'X.Org')
+ option('vendor_web', type: 'string', value: 'http://wiki.x.org')
+ option('os_vendor', type: 'string', value: '')
+ 
++option('listen_tcp', type: 'boolean', value: false,
++   description: 'Listen on TCP by default')
++option('listen_unix', type: 'boolean', value: true,
++   description: 'Listen on Unix by default')
++option('listen_local', type: 'boolean', value: true,
++

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

2018-05-25 Thread Jan Steffens via arch-commits 
Date: Friday, May 25, 2018 @ 22:35:36
  Author: heftig
Revision: 324993

1.20.0-5: FS#58705

Added:
  
xorg-server/trunk/xserver-1-2-glamor-Always-return-0-from-glamor_fds_from_pixmap-on-error.patch
  
xorg-server/trunk/xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_pixmap.patch
Modified:
  xorg-server/trunk/PKGBUILD

--+
 PKGBUILD   
  |   11 +++
 xserver-1-2-glamor-Always-return-0-from-glamor_fds_from_pixmap-on-error.patch  
  |   28 +
 
xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_pixmap.patch
 |   29 ++
 3 files changed, 67 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-05-25 22:18:17 UTC (rev 324992)
+++ PKGBUILD2018-05-25 22:35:36 UTC (rev 324993)
@@ -6,7 +6,7 @@
 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.20.0
-pkgrel=4
+pkgrel=5
 arch=('x86_64')
 license=('custom')
 groups=('xorg')
@@ -21,6 +21,8 @@
 
'xwayland-config.h.meson.in::https://cgit.freedesktop.org/xorg/xserver/plain/include/xwayland-config.h.meson.in?id=xorg-server-1.20.0'
 xserver-autobind-hotplug.patch
 0001-v2-FS-58644.patch
+
xserver-1-2-glamor-Always-return-0-from-glamor_fds_from_pixmap-on-error.patch
+
xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_pixmap.patch
 xvfb-run # with updates from FC master
 xvfb-run.1)
 validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
@@ -32,6 +34,8 @@
 
'd707e0870367de2665c3b82f09564d17ed3f62c9e8b4bd471c11af1fb1e9249e306e92c7961a04e355756eec9f5271bc8e66999e56c73c31bc9da4127ff30a8e'
 
'd84f4d63a502b7af76ea49944d1b21e2030dfd250ac1e82878935cf631973310ac9ba1f0dfedf10980ec6c7431d61b7daa4b7bbaae9ee477b2c19812c1661a22'
 
'74e1aa0c101e42f0f25349d305641873b3a79ab3b9bb2d4ed68ba8e392b4db2701fcbc35826531ee2667d3ee55673e4b4fecc2a9f088141af29ceb400f72f363'
+
'a8f65ca23ae52865147bdc1bc059b1265ba4bc61527992cf054fe76a0396ef5dfd2386782be371e926184a63def3be7333bb37fc429627d4e6fa159d263f40f7'
+
'fc259a0a4acb7b70209fc599b0f4bc94942316bbc8c6995f783026b7cd455900bcb7527615d76c99bd2e0155e0035cbd619939a1f7ddf3af32ed854afe45b631'
 
'55bbf520333f6e818b0125b37179a7039b69a0d3d2242b80a08da003d94cbf6c1fb912d880abcce318a85d7947e3eff8fbc4cdf57d7118572e8ebc56c4569af6'
 
'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22')
 
@@ -47,6 +51,11 @@
   # Fix rootless xorg - FS#58644
   # https://bugs.freedesktop.org/show_bug.cgi?id=106588
   patch -Np1 -i ../0001-v2-FS-58644.patch
+
+  # Fix XWayland hangs - FS#58705
+  # https://patchwork.freedesktop.org/series/43618/
+  patch -Np1 -i 
../xserver-1-2-glamor-Always-return-0-from-glamor_fds_from_pixmap-on-error.patch
+  patch -Np1 -i 
../xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_pixmap.patch
 }
 
 build() {

Added: 
xserver-1-2-glamor-Always-return-0-from-glamor_fds_from_pixmap-on-error.patch
===
--- 
xserver-1-2-glamor-Always-return-0-from-glamor_fds_from_pixmap-on-error.patch   
(rev 0)
+++ 
xserver-1-2-glamor-Always-return-0-from-glamor_fds_from_pixmap-on-error.patch   
2018-05-25 22:35:36 UTC (rev 324993)
@@ -0,0 +1,28 @@
+diff --git a/glamor/glamor.c b/glamor/glamor.c
+index d984d20f3..e2c74d17a 100644
+--- a/glamor/glamor.c
 b/glamor/glamor.c
+@@ -836,20 +836,20 @@ glamor_fds_from_pixmap(ScreenPtr screen, PixmapPtr 
pixmap, int *fds,
+ glamor_get_screen_private(pixmap->drawable.pScreen);
+ 
+ if (!glamor_priv->dri3_enabled)
+-return -1;
++return 0;
+ switch (pixmap_priv->type) {
+ case GLAMOR_TEXTURE_DRM:
+ case GLAMOR_TEXTURE_ONLY:
+ if (!glamor_pixmap_ensure_fbo(pixmap, pixmap->drawable.depth == 30 ?
+   GL_RGB10_A2 : GL_RGBA, 0))
+-return -1;
++return 0;
+ return glamor_egl_fds_from_pixmap(screen, pixmap, fds,
+   strides, offsets,
+   modifier);
+ default:
+ break;
+ }
+-return -1;
++return 0;
+ }
+ 
+ _X_EXPORT int

Added: 
xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_pixmap.patch
===
--- 
xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_pixmap.patch
(rev

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

2018-05-11 Thread Andreas Radke via arch-commits 
Date: Friday, May 11, 2018 @ 14:11:24
  Author: andyrtr
Revision: 323945

upgpkg: xorg-server 1.20.0-1

upstream update 1.20.0

Added:
  xorg-server/trunk/xwayland-config.h.meson.in
Modified:
  xorg-server/trunk/PKGBUILD
  xorg-server/trunk/xvfb-run

+
 PKGBUILD   |  241 ++-
 xvfb-run   |   84 +-
 xwayland-config.h.meson.in |8 +
 3 files changed, 163 insertions(+), 170 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-05-11 12:06:12 UTC (rev 323944)
+++ PKGBUILD2018-05-11 14:11:24 UTC (rev 323945)
@@ -3,7 +3,8 @@
 # Maintainer: Jan de Groot 
 
 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')
+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.20.0
 pkgrel=1
 arch=('x86_64')
@@ -10,19 +11,19 @@
 license=('custom')
 groups=('xorg')
 url="http://xorg.freedesktop.org;
-makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 
'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 
- 'inputproto' 'fontsproto' 'videoproto' 'presentproto' 
'compositeproto' 'recordproto' 'scrnsaverproto'
- 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont2' 
'renderproto' 'libpciaccess' 'libxv'
- 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 
'libdmx' 'libxtst' 'libxres'
- 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 
'dri2proto' 'libgcrypt' 'libepoxy'
- 'xcb-util' 'xcb-util-image' 'xcb-util-renderutil' 'xcb-util-wm' 
'xcb-util-keysyms' 'dri3proto'
- 'libxshmfence' 'libunwind' 'systemd' 'wayland-protocols') # 
'meson') # ''git')
+makedepends=('xorgproto' 'pixman' 'libx11' 'mesa' 'mesa-libgl' 'xtrans'
+ 'libxkbfile' 'libxfont2' 'libpciaccess' 'libxv'
+ 'libxmu' 'libxrender' 'libxi' 'libxaw' 'libdmx' 'libxtst' 
'libxres'
+ 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'libepoxy'
+ 'xcb-util' 'xcb-util-image' 'xcb-util-renderutil' 'xcb-util-wm' 
'xcb-util-keysyms'
+ 'libxshmfence' 'libunwind' 'systemd' 'wayland-protocols' 'meson') 
# 'git')
 #_commit=d0d1a694f967af770fba0d36043fd5218ff20984 # branch 1.19
 
 
#source=("git+https://anongit.freedesktop.org/git/xorg/xserver.git#commit=$_commit;
 
source=(https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig}
+xwayland-config.h.meson.in # missing from tarball
 xserver-autobind-hotplug.patch
-xvfb-run
+xvfb-run # with updates from FC master
 xvfb-run.1)
 validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
   'C383B778255613DFDB409D91DB221A690011'
@@ -30,8 +31,9 @@
   '995ED5C8A6138EB0961F18474C09DD83CAAA50B2')
 
sha512sums=('1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde'
 'SKIP'
+
'4ed2a66dd98697accef34f84d44490594bf071232fa74640d514a170f1fbe760b292a0b53fe47080b73acf6083cea57e35f11cfd42ba9dc211b8e8dcac343dfc'
 
'd84f4d63a502b7af76ea49944d1b21e2030dfd250ac1e82878935cf631973310ac9ba1f0dfedf10980ec6c7431d61b7daa4b7bbaae9ee477b2c19812c1661a22'
-
'ca1cda27016f7c269cbdecc45da36255afeef5c1973cc484544f9dfbf56ed1868365c93a4c7f93e3a23e5322f084ec0cdd137e15b43872aae7f0c03040028ce6'
+
'55bbf520333f6e818b0125b37179a7039b69a0d3d2242b80a08da003d94cbf6c1fb912d880abcce318a85d7947e3eff8fbc4cdf57d7118572e8ebc56c4569af6'
 
'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22')
 
 #pkgver() {
@@ -40,13 +42,13 @@
 #}
 
 prepare() {
+  cp xwayland-config.h.meson.in ${pkgbase}-${pkgver}/include/
+
   #cd xserver
   cd "${pkgbase}-${pkgver}"
 
   # patch from Fedora, not yet merged
   patch -Np1 -i ../xserver-autobind-hotplug.patch
-
-  autoreconf -vfi
 }
 
 build() {
@@ -57,59 +59,42 @@
   export CXXFLAGS=${CXXFLAGS/-fno-plt}
   export LDFLAGS=${LDFLAGS/,-z,now}
 
-  #cd xserver
-  cd "${pkgbase}-${pkgver}"
+  arch-meson ${pkgbase}-$pkgver build \
+-D os_vendor="Arch Linux" \
+-D ipv6=true \
+-D dmx=true \
+-D xvfb=true \
+-D xnest=true \
+-D xcsecurity=true \
+-D xorg=true \
+-D xephyr=true \
+-D xwayland=true \
+-D glamor=true \
+-D udev=true \
+-D systemd_logind=true \
+-D suid_wrapper=true \
+-D xkb_dir=/usr/share/X11/xkb \
+-D xkb_output_dir=/var/lib/xkb \
+-D default_font_path=/usr/share/fonts
+ 
+# -D xwayland_eglstream=true \ #

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

2018-01-26 Thread Laurent Carlier via arch-commits 
Date: Friday, January 26, 2018 @ 10:34:33
  Author: lcarlier
Revision: 315463

upgpkg: xorg-server 1.19.6+13+gd0d1a694f-1

move to git branch of 1.19, should fix FS#57229

Modified:
  xorg-server/trunk/PKGBUILD
Deleted:
  xorg-server/trunk/revert-udev-changes.diff
  xorg-server/trunk/xwrap-suid-race.patch

--+
 PKGBUILD |   64 ++-
 revert-udev-changes.diff |  105 -
 xwrap-suid-race.patch|   15 --
 3 files changed, 34 insertions(+), 150 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-01-26 01:04:41 UTC (rev 315462)
+++ PKGBUILD2018-01-26 10:34:33 UTC (rev 315463)
@@ -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.19.6
-pkgrel=2
+pkgver=1.19.6+13+gd0d1a694f
+pkgrel=1
 arch=('x86_64')
 license=('custom')
 groups=('xorg')
@@ -16,29 +16,32 @@
  'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 
'libdmx' 'libxtst' 'libxres'
  'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 
'dri2proto' 'libgcrypt' 'libepoxy'
  'xcb-util' 'xcb-util-image' 'xcb-util-renderutil' 'xcb-util-wm' 
'xcb-util-keysyms' 'dri3proto'
- 'libxshmfence' 'libunwind' 'systemd' 'wayland-protocols')
-source=(https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig}
+ 'libxshmfence' 'libunwind' 'systemd' 'wayland-protocols' 'git')
+_commit=d0d1a694f967af770fba0d36043fd5218ff20984 # branch 1.19
+#source=(https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig}
+source=("git+https://anongit.freedesktop.org/git/xorg/xserver.git#commit=$_commit;
 nvidia-add-modulepath-support.patch
 xserver-autobind-hotplug.patch
 xvfb-run
-xvfb-run.1
-revert-udev-changes.diff
-xwrap-suid-race.patch)
+xvfb-run.1)
 validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
   'C383B778255613DFDB409D91DB221A690011'
   'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3'
   '995ED5C8A6138EB0961F18474C09DD83CAAA50B2')
-sha256sums=('a732502f1db000cf36a376cd0c010ffdbf32ecdd7f1fa08ba7f5bdf9601cc197'
-'SKIP'
+sha256sums=('SKIP'
 '914a8d775b708f836ae3f0eeca553da3872727a2e4262190f4d5c01241cb14e8'
 'fcaf536e4fc307958923b58f2baf3d3102ad694efc28506f6f95a9e64483fa57'
 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
-'2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
-'ce9b235c053ac85a9da86fba3b60fcfc48d36a8bd789b94ed79d5d571bc7b0aa'
-'bce0e105386d75239f473b867d8ea6bc60e5302d87e03fdc720f48f43f5454f1')
+'2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776')
 
+pkgver() {
+  cd xserver
+  git describe --tags | sed 's/^xorg-server-//;s/_/./g;s/-/+/g'
+}
+
 prepare() {
-  cd "${pkgbase}-${pkgver}"
+  cd xserver
+  #cd "${pkgbase}-${pkgver}"
 
   # merged upstream in trunk
   patch -Np1 -i ../nvidia-add-modulepath-support.patch
@@ -45,14 +48,6 @@
   # patch from Fedora, not yet merged
   patch -Np1 -i ../xserver-autobind-hotplug.patch
 
-  # https://bugs.archlinux.org/task/56804 
-  # https://bugs.freedesktop.org/show_bug.cgi?id=104382
-  patch -Rp1 -i ../revert-udev-changes.diff
-
-  # https://bugs.archlinux.org/task/56893
-  # Fixes Makefile race condition when installing Xorg.wrap
-  patch -Np1 -i ../xwrap-suid-race.patch
-
   autoreconf -vfi
 }
 
@@ -64,7 +59,8 @@
   export CXXFLAGS=${CXXFLAGS/-fno-plt}
   export LDFLAGS=${LDFLAGS/,-z,now}
 
-  cd "${pkgbase}-${pkgver}"
+  cd xserver
+  #cd "${pkgbase}-${pkgver}"
   ./configure --prefix=/usr \
   --enable-ipv6 \
   --enable-dri \
@@ -115,7 +111,8 @@
   pkgdesc="Xorg server common files"
   depends=(xkeyboard-config xorg-xkbcomp xorg-setxkbmap)
 
-  cd "${pkgbase}-${pkgver}"
+  cd xserver
+  #cd "${pkgbase}-${pkgver}"
   install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-common"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/xorg-server-common"
   
@@ -140,7 +137,8 @@
   replaces=('glamor-egl' 'xf86-video-modesetting')
   install=xorg-server.install
 
-  cd "${pkgbase}-${pkgver}"
+  cd xserver
+  #cd "${pkgbase}-${pkgver}"
   make DESTDIR="${pkgdir}" install
   
   # distro specific files must be installed in /usr/share/X11/xorg.conf.d
@@ -164,7 +162,8 @@
   depends=(libxfont2 libgl libepoxy libunwind libsystemd libxv pixman 
xorg-server-common xcb-util-image
xcb-util-renderutil xcb-util-wm xcb-util-keysyms)
 
-  cd "${pkgbase}-${pkgver}/hw/kdrive"
+  cd xserver/hw/kdrive
+  #cd "${pkgbase}-${pkgver}/hw/kdrive"
   make DESTDIR="${pkgdir}" install
 
   install

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

2017-01-05 Thread Laurent Carlier 
Date: Thursday, January 5, 2017 @ 20:36:04
  Author: lcarlier
Revision: 285311

upgpkg: xorg-server 1.19.0-4

add more upstream fixes

Added:
  xorg-server/trunk/git-fixes.diff
(from rev 285310, xorg-server/trunk/damageRegionProcessPending.diff)
Modified:
  xorg-server/trunk/PKGBUILD
Deleted:
  xorg-server/trunk/damageRegionProcessPending.diff

-+
 PKGBUILD|   13 
 damageRegionProcessPending.diff |  516 ---
 git-fixes.diff  |  614 ++
 3 files changed, 622 insertions(+), 521 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-01-05 20:18:30 UTC (rev 285310)
+++ PKGBUILD2017-01-05 20:36:04 UTC (rev 285311)
@@ -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.19.0
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 license=('custom')
 groups=('xorg')
@@ -20,7 +20,7 @@
 
source=(https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig}
 xvfb-run
 xvfb-run.1
-damageRegionProcessPending.diff)
+git-fixes.diff)
 validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
   'C383B778255613DFDB409D91DB221A690011'
   'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3')
@@ -28,12 +28,15 @@
 'SKIP'
 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
 '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
-'c8344b94d946005b28ad1e0771c77174afd7288100763ab7bb7c2b50be52f1e0')
+'63e37008fdbd0c3630db38b995d3be8891b9c2cabb46cb4dc3596ba988a259cd')
 
 prepare() {
   cd "${pkgbase}-${pkgver}"
-  # apply upstream commit d6da2086951693e047fdd22b0d21c539ea1bb1e1
-  patch -Np1 -i ../damageRegionProcessPending.diff
+  # apply upstream fixes:
+  # Revert "damage: Make damageRegionProcessPending take a damage not a 
drawable"
+  # os: return 0 from check_timers if we touched any of them
+  # glamor: Trust eglGetPlatformDisplayEXT if it exists
+  patch -Np1 -i ../git-fixes.diff
 }
 
 build() {

Deleted: damageRegionProcessPending.diff
===
--- damageRegionProcessPending.diff 2017-01-05 20:18:30 UTC (rev 285310)
+++ damageRegionProcessPending.diff 2017-01-05 20:36:04 UTC (rev 285311)
@@ -1,516 +0,0 @@
-From d6da2086951693e047fdd22b0d21c539ea1bb1e1 Mon Sep 17 00:00:00 2001
-From: Adam Jackson 
-Date: Mon, 12 Dec 2016 13:08:17 -0500
-Subject: Revert "damage: Make damageRegionProcessPending take a damage not a
- drawable"
-
-The commit message makes the assertion that the code below damage is not
-allowed to change whether there's a damage monitor for the drawable.
-That turns out not to be the case! exa's mixed code, at least, will
-create and destroy a damage in PrepareAccess. The destroy path can then
-be catastrophic, as damageRegionProcessPending will attempt to
-RegionEmpty memory from the middle of a freed block.
-
-I'd wanted that invariant for performance, but faster isn't worth
-broken, so revert it. I think what exa's doing is reasonable, so the
-better way to improve performance for the unmonitored case is to either
-revisit dynamically wrapping into the GC, or inline damage into dix.
-
-This reverts commit 4e124203f2260daaf54155f4a05fe469733e0b97.
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1389886
-Signed-off-by: Adam Jackson 
-(cherry picked from commit 32e632e85894eddc3ace83f16f1e973b1be478fe)
-
-diff --git a/miext/damage/damage.c b/miext/damage/damage.c
-index 17c2abf..d6a3614 100644
 a/miext/damage/damage.c
-+++ b/miext/damage/damage.c
-@@ -282,8 +282,10 @@ damageRegionAppend(DrawablePtr pDrawable, RegionPtr 
pRegion, Bool clip,
- }
- 
- static void
--damageRegionProcessPending(DamagePtr pDamage)
-+damageRegionProcessPending(DrawablePtr pDrawable)
- {
-+drawableDamage(pDrawable);
-+
- for (; pDamage != NULL; pDamage = pDamage->pNext) {
- if (pDamage->reportAfter) {
- /* It's possible that there is only interest in postRendering 
reporting. */
-@@ -358,7 +360,6 @@ damageCreateGC(GCPtr pGC)
- 
- #define DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable) \
- damageGCPriv(pGC);  \
--drawableDamage(pDrawable); \
- const GCFuncs *oldFuncs = pGC->funcs; \
- unwrap(pGCPriv, pGC, funcs);  \
- unwrap(pGCPriv, pGC, ops); \
-@@ -456,7 +457,7 @@ damageDestroyClip(GCPtr pGC)
- #define BOX_NOT_EMPTY(box) \
- (((box.x2 - box.x1) > 0) && ((box.y2 - box.y1) > 0))
- 
--#define checkGCDamage(d,g)(d && \
-+#define checkGCDamage(d,g)(getDrawableDamage(d) && \
-(!g->pCompositeClip ||\
-

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

2016-07-19 Thread Laurent Carlier 
Date: Tuesday, July 19, 2016 @ 18:07:32
  Author: lcarlier
Revision: 272007

upgpkg: xorg-server 1.18.4-1

upstream update 1.18.4

Modified:
  xorg-server/trunk/PKGBUILD
Deleted:
  xorg-server/trunk/call-eglBindAPI-after-eglInitialize.patch
  
xorg-server/trunk/xserver-dix-Work-around-non-premultiplied-ARGB-cursor-data.patch

--+
 PKGBUILD |   21 +---
 call-eglBindAPI-after-eglInitialize.patch|   48 
--
 xserver-dix-Work-around-non-premultiplied-ARGB-cursor-data.patch |   34 ---
 3 files changed, 5 insertions(+), 98 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-07-19 14:28:51 UTC (rev 272006)
+++ PKGBUILD2016-07-19 18:07:32 UTC (rev 272007)
@@ -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.3
-pkgrel=3
+pkgver=1.18.4
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom')
 groups=('xorg')
@@ -19,27 +19,16 @@
  'libxshmfence' 'libunwind')
 source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig}
 xvfb-run
-xvfb-run.1
-call-eglBindAPI-after-eglInitialize.patch
-xserver-dix-Work-around-non-premultiplied-ARGB-cursor-data.patch)
+xvfb-run.1)
 validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
   'C383B778255613DFDB409D91DB221A690011'
   'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3')
-sha256sums=('ea739c22517cdbe2b5f7c0a5fd05fe8a10ac0629003e71c0c7862f4bb60142cd'
+sha256sums=('278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8'
 'SKIP'
 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
-'2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
-'45fdc2a1241d458756c41a93c01846e04cc75f3c75f81f48b61533d08280918d'
-'ecb0b1f73342e8c3de1563efcc812ac0235e2994d0343b392c1f51920510aa18')
+'2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776')
 
-prepare() {
-  cd "${pkgbase}-${pkgver}"
 
-  patch -Np1 -i ../call-eglBindAPI-after-eglInitialize.patch
-  # fix broken cursor in games with mesa drivers
-  patch -Np1 -i 
../xserver-dix-Work-around-non-premultiplied-ARGB-cursor-data.patch
-}
-
 build() {
   cd "${pkgbase}-${pkgver}"
   ./configure --prefix=/usr \

Deleted: call-eglBindAPI-after-eglInitialize.patch
===
--- call-eglBindAPI-after-eglInitialize.patch   2016-07-19 14:28:51 UTC (rev 
272006)
+++ call-eglBindAPI-after-eglInitialize.patch   2016-07-19 18:07:32 UTC (rev 
272007)
@@ -1,48 +0,0 @@
-diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
-index 4bcd3ce..16a20a7 100644
 a/glamor/glamor_egl.c
-+++ b/glamor/glamor_egl.c
-@@ -770,11 +770,6 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
- 
- glamor_egl->has_gem = glamor_egl_check_has_gem(fd);
- 
--#ifndef GLAMOR_GLES2
--eglBindAPI(EGL_OPENGL_API);
--#else
--eglBindAPI(EGL_OPENGL_ES_API);
--#endif
- if (!eglInitialize
- (glamor_egl->display, _egl->major, _egl->minor)) {
- xf86DrvMsg(scrn->scrnIndex, X_ERROR, "eglInitialize() failed\n");
-@@ -782,6 +777,12 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
- goto error;
- }
- 
-+#ifndef GLAMOR_GLES2
-+eglBindAPI(EGL_OPENGL_API);
-+#else
-+eglBindAPI(EGL_OPENGL_ES_API);
-+#endif
-+
- version = eglQueryString(glamor_egl->display, EGL_VERSION);
- xf86Msg(X_INFO, "%s: EGL version %s:\n", glamor_name, version);
- 
-diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c
-index ad66cf6..73ccd71 100644
 a/hw/xwayland/xwayland-glamor.c
-+++ b/hw/xwayland/xwayland-glamor.c
-@@ -298,12 +298,13 @@ xwl_drm_init_egl(struct xwl_screen *xwl_screen)
- return;
- }
- 
--eglBindAPI(EGL_OPENGL_API);
- if (!eglInitialize(xwl_screen->egl_display, , )) {
- ErrorF("eglInitialize() failed\n");
- return;
- }
- 
-+eglBindAPI(EGL_OPENGL_API);
-+
- version = eglQueryString(xwl_screen->egl_display, EGL_VERSION);
- ErrorF("glamor: EGL version %s:\n", version);
- 

Deleted: xserver-dix-Work-around-non-premultiplied-ARGB-cursor-data.patch
===
--- xserver-dix-Work-around-non-premultiplied-ARGB-cursor-data.patch
2016-07-19 14:28:51 UTC (rev 272006)
+++ xserver-dix-Work-around-non-premultiplied-ARGB-cursor-data.patch
2016-07-19 18:07:32 UTC (rev 272007)
@@ -1,34 +0,0 @@
-diff --git a/dix/cursor.c b/dix/cursor.c
-index e459456..25d6767 100644
 a/dix/cursor.c
-+++ b/dix/cursor.c
-@@ -288,6 +288,29 @@ AllocARGBCursor(unsigned char *psrcbits, unsigned char

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

2016-03-16 Thread Laurent Carlier 
Date: Wednesday, March 16, 2016 @ 08:26:05
  Author: lcarlier
Revision: 261836

upgpkg: xorg-server 1.18.2-2

add upstream patches to fix a glamor regression and a log flooding issue

Added:
  xorg-server/trunk/0001-glamor-swizzle-RED-to-0-for-alpha-textures.patch
  xorg-server/trunk/0002-Xext-vidmode-Reduce-verbosity-of-GetModeLine.patch
Modified:
  xorg-server/trunk/PKGBUILD

-+
 0001-glamor-swizzle-RED-to-0-for-alpha-textures.patch   |   16 
 0002-Xext-vidmode-Reduce-verbosity-of-GetModeLine.patch |  374 ++
 PKGBUILD|   19 
 3 files changed, 406 insertions(+), 3 deletions(-)

Added: 0001-glamor-swizzle-RED-to-0-for-alpha-textures.patch
===
--- 0001-glamor-swizzle-RED-to-0-for-alpha-textures.patch   
(rev 0)
+++ 0001-glamor-swizzle-RED-to-0-for-alpha-textures.patch   2016-03-16 
07:26:05 UTC (rev 261836)
@@ -0,0 +1,16 @@
+diff --git a/glamor/glamor_fbo.c b/glamor/glamor_fbo.c
+index a531f60..f4f8749 100644
+--- a/glamor/glamor_fbo.c
 b/glamor/glamor_fbo.c
+@@ -352,8 +352,10 @@ _glamor_create_tex(glamor_screen_private *glamor_priv,
+ glBindTexture(GL_TEXTURE_2D, tex);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+-if (format == glamor_priv->one_channel_format && format == GL_RED)
++if (format == glamor_priv->one_channel_format && format == GL_RED) {
++glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_R, GL_ZERO);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_A, GL_RED);
++}
+ glamor_priv->suppress_gl_out_of_memory_logging = true;
+ glTexImage2D(GL_TEXTURE_2D, 0, format, w, h, 0,
+  format, GL_UNSIGNED_BYTE, NULL);

Added: 0002-Xext-vidmode-Reduce-verbosity-of-GetModeLine.patch
===
--- 0002-Xext-vidmode-Reduce-verbosity-of-GetModeLine.patch 
(rev 0)
+++ 0002-Xext-vidmode-Reduce-verbosity-of-GetModeLine.patch 2016-03-16 
07:26:05 UTC (rev 261836)
@@ -0,0 +1,374 @@
+From 75eecf28ae3709181a51571132b0accd9cae316e Mon Sep 17 00:00:00 2001
+From: Chris Wilson 
+Date: Sun, 13 Mar 2016 13:54:01 +
+Subject: Xext/vidmode: Reduce verbosity of GetModeLine debug messages
+
+In commit f175cf45aebcdda53f3ae49c0eaf27da1f194e92
+Author: Olivier Fourdan 
+Date:   Wed Feb 10 09:34:34 2016 +0100
+
+vidmode: move to a separate library of its own
+
+the verbosity of some old debug messages (which print the reply to every
+GetModeLine client request and others) was increased leading to lots of
+log spam. Downgrade the logging back to DebugF.
+
+[ajax: Fix a typo so it compiles.]
+
+Reviewed-by: Adam Jackson 
+References: https://bugs.freedesktop.org/show_bug.cgi?id=94515
+Signed-off-by: Chris Wilson 
+Cc: Olivier Fourdan 
+
+diff --git a/Xext/vidmode.c b/Xext/vidmode.c
+index 7c838f4..0cbbdc3 100644
+--- a/Xext/vidmode.c
 b/Xext/vidmode.c
+@@ -69,7 +69,7 @@ typedef struct {
+ dixSetPrivate(&(c)->devPrivates, VidModeClientPrivateKey, p)
+ 
+ #ifdef DEBUG
+-#define DEBUG_P(x) LogMessage(X_INFO, x"\n");
++#define DEBUG_P(x) DebugF(x"\n")
+ #else
+ #define DEBUG_P(x) /**/
+ #endif
+@@ -267,13 +267,13 @@ ProcVidModeGetModeLine(ClientPtr client)
+ rep.vtotal = VidModeGetModeValue(mode, VIDMODE_V_TOTAL);
+ rep.flags = VidModeGetModeValue(mode, VIDMODE_FLAGS);
+ 
+-LogMessage(X_INFO, "GetModeLine - scrn: %d clock: %ld\n",
+-   stuff->screen, (unsigned long) rep.dotclock);
+-LogMessage(X_INFO, "GetModeLine - hdsp: %d hbeg: %d hend: %d httl: %d\n",
+-   rep.hdisplay, rep.hsyncstart, rep.hsyncend, rep.htotal);
+-LogMessage(X_INFO, "  vdsp: %d vbeg: %d vend: %d vttl: %d 
flags: %ld\n",
+-   rep.vdisplay, rep.vsyncstart, rep.vsyncend,
+-   rep.vtotal, (unsigned long) rep.flags);
++DebugF("GetModeLine - scrn: %d clock: %ld\n",
++   stuff->screen, (unsigned long) rep.dotclock);
++DebugF("GetModeLine - hdsp: %d hbeg: %d hend: %d httl: %d\n",
++   rep.hdisplay, rep.hsyncstart, rep.hsyncend, rep.htotal);
++DebugF("  vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n",
++   rep.vdisplay, rep.vsyncstart, rep.vsyncend,
++   rep.vtotal, (unsigned long) rep.flags);
+ 
+ /*
+  * Older servers sometimes had server privates that the VidMode
+@@ -483,23 +483,23 @@ ProcVidModeAddModeLine(ClientPtr client)
+ stuff->after_vtotal = oldstuff->after_vtotal;
+ stuff->after_flags = oldstuff->after_flags;
+ }
+-LogMessage(X_INFO, "AddModeLine - scrn: %d clock: %ld\n",
+-   (int) stuff->screen,

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

2016-02-09 Thread 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
===
--- PKGBUILD2016-02-09 03:14:33 UTC (rev 258998)
+++ PKGBUILD2016-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'
   'C383B778255613DFDB409D91DB221A690011'
   '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 
- #include 

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,

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

2015-10-27 Thread Laurent Carlier 
Date: Tuesday, October 27, 2015 @ 14:18:40
  Author: lcarlier
Revision: 249791

upgpkg: xorg-server 1.17.3-1

upstream update 1.17.3

Modified:
  xorg-server/trunk/PKGBUILD
Deleted:
  xorg-server/trunk/0001-glamor-make-current-in-prepare-paths.patch
  
xorg-server/trunk/0001-linux-Do-not-call-FatalError-from-xf86CloseConsole.patch

---+
 0001-glamor-make-current-in-prepare-paths.patch   |   34 
 0001-linux-Do-not-call-FatalError-from-xf86CloseConsole.patch |   84 --
 PKGBUILD  |   18 --
 3 files changed, 5 insertions(+), 131 deletions(-)

Deleted: 0001-glamor-make-current-in-prepare-paths.patch
===
--- 0001-glamor-make-current-in-prepare-paths.patch 2015-10-27 13:08:28 UTC 
(rev 249790)
+++ 0001-glamor-make-current-in-prepare-paths.patch 2015-10-27 13:18:40 UTC 
(rev 249791)
@@ -1,34 +0,0 @@
-From 422a9f7f37eb6027fa4d20a4be208978832be6d6 Mon Sep 17 00:00:00 2001
-From: Dave Airlie 
-Date: Wed, 15 Jul 2015 17:54:03 +1000
-Subject: [PATCH] glamor: make current in prepare paths
-
-Lots of the accel paths only make current once they start
-doing someting, so a lot of them call the bail paths without
-make current, which means on PRIME systems for example
-we end up in the wrong context.
-
-Add a prepare pixmap in the prepare fallback path.
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90667
-Signed-off-by: Dave Airlie 

- glamor/glamor_prepare.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/glamor/glamor_prepare.c b/glamor/glamor_prepare.c
-index 9bfc557..68fb58f 100644
 a/glamor/glamor_prepare.c
-+++ b/glamor/glamor_prepare.c
-@@ -45,6 +45,8 @@ glamor_prep_pixmap_box(PixmapPtr pixmap, glamor_access_t 
access, BoxPtr box)
- if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(priv))
- return TRUE;
- 
-+glamor_make_current(glamor_priv);
-+
- RegionInit(, box, 1);
- 
- /* See if it's already mapped */
--- 
-2.4.3
-

Deleted: 0001-linux-Do-not-call-FatalError-from-xf86CloseConsole.patch
===
--- 0001-linux-Do-not-call-FatalError-from-xf86CloseConsole.patch   
2015-10-27 13:08:28 UTC (rev 249790)
+++ 0001-linux-Do-not-call-FatalError-from-xf86CloseConsole.patch   
2015-10-27 13:18:40 UTC (rev 249791)
@@ -1,84 +0,0 @@
-From ca355e9d6acab994453cdbb65cb213d09ee4a50f Mon Sep 17 00:00:00 2001
-From: Hans de Goede 
-Date: Wed, 14 Oct 2015 15:10:35 +0200
-Subject: [PATCH] linux: Do not call FatalError from xf86CloseConsole
-
-FatalError ends up calling xf86CloseConsole itself, so calling FatalError
-from within xf86CloseConsole is not a good idea.
-
-All the other error checking done in xf86CloseConsole uses
-xf86Msg(X_WARNING, ...) except for the switch_to() helper function,
-change things so that switch_to() also uses xf86Msg rather then FatalError
-when called from xf86CloseConsole.
-
-BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1269210
-Signed-off-by: Hans de Goede 

- hw/xfree86/os-support/linux/lnx_init.c | 24 
- 1 file changed, 16 insertions(+), 8 deletions(-)
-
-diff --git a/hw/xfree86/os-support/linux/lnx_init.c 
b/hw/xfree86/os-support/linux/lnx_init.c
-index ec06a05..9fec964 100644
 a/hw/xfree86/os-support/linux/lnx_init.c
-+++ b/hw/xfree86/os-support/linux/lnx_init.c
-@@ -64,17 +64,25 @@ drain_console(int fd, void *closure)
- }
- 
- static void
--switch_to(int vt, const char *from)
-+switch_to(int vt, Bool is_open)
- {
- int ret;
- 
- SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_ACTIVATE, vt));
--if (ret < 0)
--FatalError("%s: VT_ACTIVATE failed: %s\n", from, strerror(errno));
-+if (ret < 0) {
-+if (is_open)
-+FatalError("xf86OpenConsole: VT_ACTIVATE failed: %s\n", 
strerror(errno));
-+else
-+xf86Msg(X_WARNING, "xf86CloseConsole: VT_ACTIVATE failed: %s\n", 
strerror(errno));
-+}
- 
- SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_WAITACTIVE, vt));
--if (ret < 0)
--FatalError("%s: VT_WAITACTIVE failed: %s\n", from, strerror(errno));
-+if (ret < 0) {
-+if (is_open)
-+FatalError("xf86OpenConsole: VT_WAITACTIVE failed: %s\n", 
strerror(errno));
-+else
-+xf86Msg(X_WARNING, "xf86CloseConsole: VT_WAITACTIVE failed: 
%s\n", strerror(errno));
-+}
- }
- 
- #pragma GCC diagnostic push
-@@ -233,7 +241,7 @@ xf86OpenConsole(void)
- /*
-  * now get the VT.  This _must_ succeed, or else fail completely.
-  */
--switch_to(xf86Info.vtno, "xf86OpenConsole");
-+switch_to(xf86Info.vtno, TRUE);
- 
- SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_GETMODE, ));
- if (ret < 0)
-@@ -294,7 +302,7 @@

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

2015-02-21 Thread Laurent Carlier 
Date: Saturday, February 21, 2015 @ 14:38:48
  Author: lcarlier
Revision: 231711

upgpkg: xorg-server 1.17.1-2

fix FS#43884, and partially FS#43867

Added:
  xorg-server/trunk/os-access-fix-regression-in-server-interpreted-auth.patch
  xorg-server/trunk/v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch
Modified:
  xorg-server/trunk/PKGBUILD

---+
 PKGBUILD  |   18 ++-
 os-access-fix-regression-in-server-interpreted-auth.patch |   30 
 v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch |   23 +
 3 files changed, 68 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-02-21 03:04:37 UTC (rev 231710)
+++ PKGBUILD2015-02-21 13:38:48 UTC (rev 231711)
@@ -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.17.1
-pkgrel=1 # build first with 0.1 and then rebuild it after xf86-input-evdev 
rebuild
+pkgrel=2 # build first with 0.1 and then rebuild it after xf86-input-evdev 
rebuild
 arch=('i686' 'x86_64')
 license=('custom')
 url=http://xorg.freedesktop.org;
@@ -19,7 +19,9 @@
 source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig}
 nvidia-drm-outputclass.conf
 xvfb-run
-xvfb-run.1)
+xvfb-run.1
+os-access-fix-regression-in-server-interpreted-auth.patch
+v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch)
 validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
   'C383B778255613DFDB409D91DB221A690011')
 sha256sums=('2bf8e9f6f0a710dec1d2472467bff1f4e247cb6dcd76eb469aafdc8a2d7db2ab'
@@ -26,8 +28,18 @@
 'SKIP'
 'af1c3d2ea5de7f6a6b5f7c60951a189a4749d1495e5462f3157ae7ac8fe1dc56'
 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
-'2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776')
+'2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
+'8a9d76eecf8795ca645fb1ce261733965578e953f6606153ce001a0e15d036e8'
+'a73e33644682d9f430db987c192da0f7193907af50539669ebd59614a5ebd0f9')
 
+prepare() {
+  cd ${pkgbase}-${pkgver}
+  # fix FS#43884, not yet upstream
+  patch -Np1 -i ../os-access-fix-regression-in-server-interpreted-auth.patch
+  # partially fix FS#43867, not yet upstream
+  patch -Np1 -i ../v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch
+}
+
 build() {
   cd ${pkgbase}-${pkgver}
   autoreconf -fi

Added: os-access-fix-regression-in-server-interpreted-auth.patch
===
--- os-access-fix-regression-in-server-interpreted-auth.patch   
(rev 0)
+++ os-access-fix-regression-in-server-interpreted-auth.patch   2015-02-21 
13:38:48 UTC (rev 231711)
@@ -0,0 +1,30 @@
+diff --git a/os/access.c b/os/access.c
+index 28f2d32..fe6e831 100644
+--- a/os/access.c
 b/os/access.c
+@@ -1390,14 +1390,23 @@ InvalidHost(register struct sockaddr *saddr, int len, 
ClientPtr client)
+ else
+ return 0;
+ }
++
++/* An empty address requires both a NULL addr *and* a zero length
++ * as the address comparison functions call memcmp with both
++ * parameters. Make sure they agree here
++ */
++if (addr == NULL)
++len = 0;
++if (len == 0)
++addr = NULL;
+ for (host = validhosts; host; host = host-next) {
+ if (host-family == FamilyServerInterpreted) {
+-if (addr  siAddrMatch(family, addr, len, host, client)) {
++if (siAddrMatch(family, addr, len, host, client)) {
+ return 0;
+ }
+ }
+ else {
+-if (addr  addrEqual(family, addr, len, host))
++if (addrEqual(family, addr, len, host))
+ return 0;
+ }
+

Added: v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch
===
--- v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch   
(rev 0)
+++ v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch   2015-02-21 
13:38:48 UTC (rev 231711)
@@ -0,0 +1,23 @@
+diff --git a/os/xdmcp.c b/os/xdmcp.c
+index b6e97c9..0e9e625 100644
+--- a/os/xdmcp.c
 b/os/xdmcp.c
+@@ -1409,8 +1409,16 @@ recv_alive_msg(unsigned length)
+ static void
+ XdmcpFatal(const char *type, ARRAY8Ptr status)
+ {
+-FatalError(XDMCP fatal error: %s %*.*s\n, type,
+-   status-length, status-length, status-data);
++char *error_message;
++
++/* error_message is leaked, but that's fine, we're aborting */
++error_message = malloc (status-length + 1);
++if (!error_message)
++FatalError(XDMCP

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

2014-12-20 Thread Laurent Carlier 
Date: Saturday, December 20, 2014 @ 14:56:29
  Author: lcarlier
Revision: 227820

upgpkg: xorg-server 1.16.3-1

upstream update 1.16.3

Modified:
  xorg-server/trunk/PKGBUILD
Deleted:
  xorg-server/trunk/autoconfig-nvidia.patch
  xorg-server/trunk/glamor-upstream-fix.patch

---+
 PKGBUILD  |5 -
 autoconfig-nvidia.patch   |   28 --
 glamor-upstream-fix.patch |  178 
 3 files changed, 3 insertions(+), 208 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-12-20 12:23:54 UTC (rev 227819)
+++ PKGBUILD2014-12-20 13:56:29 UTC (rev 227820)
@@ -4,7 +4,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.16.2.901
+pkgver=1.16.3
 pkgrel=1 # build first with 0.1 and then rebuild it after xf86-input-evdev 
rebuild
 arch=('i686' 'x86_64')
 license=('custom')
@@ -20,7 +20,8 @@
 nvidia-drm-outputclass.conf
 xvfb-run
 xvfb-run.1)
-sha256sums=('ef885a5ce441e6ae5c73461b624f9e66e801e52eaf495e551663306ec4464ba6'
+validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C')
+sha256sums=('5e0f443238af1078b48f6eea98a382861b59187da221c2cf714d31c1d560b0fb'
 'SKIP'
 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
 'af1c3d2ea5de7f6a6b5f7c60951a189a4749d1495e5462f3157ae7ac8fe1dc56'

Deleted: autoconfig-nvidia.patch
===
--- autoconfig-nvidia.patch 2014-12-20 12:23:54 UTC (rev 227819)
+++ autoconfig-nvidia.patch 2014-12-20 13:56:29 UTC (rev 227820)
@@ -1,28 +0,0 @@
-diff -Nur xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c 
xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c
 xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c
2012-02-10 10:10:37.583014924 +
-+++ xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c 2012-02-10 
11:16:07.148971317 +
-@@ -1144,7 +1144,23 @@
- int idx = 0;
- 
- #ifdef __linux__
--driverList[idx++] = nouveau;
-+  switch (dev-device_id)
-+  {
-+  /* NV1 */
-+  case 0x0008:
-+  case 0x0009:
-+  driverList[idx++] = vesa;
-+  break;
-+  /* NV3 */
-+  case 0x0018:
-+  case 0x0019:
-+  driverList[idx++] = nouveau;
-+  break;
-+  default:
-+  driverList[idx++] = nouveau;
-+  driverList[idx++] = nvidia;
-+  break;
-+  }
- #endif
- driverList[idx++] = nv;
- break;

Deleted: glamor-upstream-fix.patch
===
--- glamor-upstream-fix.patch   2014-12-20 12:23:54 UTC (rev 227819)
+++ glamor-upstream-fix.patch   2014-12-20 13:56:29 UTC (rev 227820)
@@ -1,178 +0,0 @@
-From 3c0431b8911241552a15a43e4279c50658b50a18 Mon Sep 17 00:00:00 2001
-From: Keith Packard kei...@keithp.com
-Date: Wed, 16 Jul 2014 23:03:23 +
-Subject: glamor: Fix temp picture coordinates in 
glamor_composite_clipped_region
-
-To understand this patch, let's start at the protocol interface where
-the relationship between the coordinate spaces is documented:
-
-static Bool
-_glamor_composite(CARD8 op,
-  PicturePtr source,
-  PicturePtr mask,
-  PicturePtr dest,
-  INT16 x_source,
-  INT16 y_source,
-  INT16 x_mask,
-  INT16 y_mask,
-  INT16 x_dest, INT16 y_dest,
-  CARD16 width, CARD16 height, Bool fallback)
-
-The coordinates are passed to this function directly off the wire and
-are all relative to their respective drawables. For Windows, this means
-that they are relative to the upper left corner of the window, in
-whatever pixmap that window is getting drawn to.
-
-_glamor_composite calls miComputeCompositeRegion to construct a clipped
-region to actually render to. In reality, miComputeCompositeRegion clips
-only to the destination these days; source clip region based clipping
-would have to respect the transform, which isn't really possible. The
-returned region is relative to the screen in which dest lives; offset by
-dest-drawable.x and dest-drawable.y.
-
-What is important to realize here is that, because of clipping, the
-composite region may not have the same position within the destination
-drawable as x_dest, y_dest. The protocol coordinates now exist solely to
-'pin' the three objects together.
-
-extents-x1,y1 Screen origin of clipped operation
-width,height

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

2013-03-09 Thread Andreas Radke 
Date: Saturday, March 9, 2013 @ 11:26:07
  Author: andyrtr
Revision: 179666

upgpkg: xorg-server 1.14.0-1

upstream update 1.14.0

Modified:
  xorg-server/trunk/PKGBUILD
Deleted:
  xorg-server/trunk/git-fixes.patch
  xorg-server/trunk/use-pixman-glyph-cache.patch

--+
 PKGBUILD |   15 
 git-fixes.patch  |  643 -
 use-pixman-glyph-cache.patch |  270 -
 3 files changed, 7 insertions(+), 921 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-03-09 10:16:08 UTC (rev 179665)
+++ PKGBUILD2013-03-09 10:26:07 UTC (rev 179666)
@@ -1,9 +1,10 @@
 # $Id$
+# Maintainer: AndyRTR andy...@archlinux.org
 # Maintainer: Jan de Groot j...@archlinux.org
 
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 
'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.13.3
+pkgver=1.14.0
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom')
@@ -20,17 +21,15 @@
 bug59825.patch
 xvfb-run
 xvfb-run.1
-10-quirks.conf
-use-pixman-glyph-cache.patch)
-sha256sums=('c9e38eb6404749cab9e3c4a4901d951d4d62958b11f002ce968225ef92902762'
+10-quirks.conf)
+sha256sums=('1f5107573252c26439fdd165481765a2c0964e02a2e9fab36e02414d08f30630'
 '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162'
 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
 'e033f9bcc21980f7f0428e6ed6c362a3d55ad293b05fd6e6c6c1933b86f9e63a'
 '26ee6ff255a60d7c1e136c612925eb63c86e85a4a3a55d531852ad9275526588'
 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
 '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
-'94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166'
-'7c1dacd30c46b01424c7c75974285cd348dafd0327eb3f211cbe446ad90dd308')
+'94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166')
 
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
@@ -106,8 +105,8 @@
   pkgdesc=Xorg X server
   depends=(libxdmcp libxfont libpciaccess libdrm 'pixman=0.28.0' libgcrypt 
libxau xorg-server-common xf86-input-evdev)
   backup=('etc/X11/xorg.conf.d/10-evdev.conf' 
'etc/X11/xorg.conf.d/10-quirks.conf')
-  # see xorg-server-1.13.0/hw/xfree86/common/xf86Module.h for ABI versions - 
we provide major numbers that drivers can depend on
-  provides=('X-ABI-VIDEODRV_VERSION=13' 'X-ABI-XINPUT_VERSION=18' 
'X-ABI-EXTENSION_VERSION=7.0' 'x-server')
+  # see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions - we 
provide major numbers that drivers can depend on
+  provides=('X-ABI-VIDEODRV_VERSION=14' 'X-ABI-XINPUT_VERSION=19' 
'X-ABI-EXTENSION_VERSION=7.0' 'x-server')
   groups=('xorg')
   conflicts=('nvidia-utils=290.10')
 

Deleted: git-fixes.patch
===
--- git-fixes.patch 2013-03-09 10:16:08 UTC (rev 179665)
+++ git-fixes.patch 2013-03-09 10:26:07 UTC (rev 179666)
@@ -1,643 +0,0 @@
-diff --git a/Xi/exevents.c b/Xi/exevents.c
-index 494d07e..106da3a 100644
 a/Xi/exevents.c
-+++ b/Xi/exevents.c
-@@ -949,8 +949,6 @@ UpdateDeviceState(DeviceIntPtr device, DeviceEvent *event)
- 
- if (!(event-flags  TOUCH_POINTER_EMULATED))
- return DONT_PROCESS;
--if (!(event-flags  TOUCH_END))
--return DONT_PROCESS;
- 
- DecreaseButtonCount(device, key, t-buttonsDown, t-motionMask,
- t-state);
-@@ -1561,6 +1559,7 @@ ProcessTouchEvent(InternalEvent *ev, DeviceIntPtr dev)
- uint32_t touchid;
- int type = ev-any.type;
- int emulate_pointer = ! !(ev-device_event.flags  
TOUCH_POINTER_EMULATED);
-+DeviceIntPtr kbd;
- 
- if (!t)
- return;
-@@ -1570,9 +1569,6 @@ ProcessTouchEvent(InternalEvent *ev, DeviceIntPtr dev)
- else
- touchid = ev-device_event.touchid;
- 
--if (emulate_pointer)
--UpdateDeviceState(dev, ev-device_event);
--
- if (type == ET_TouchBegin) {
- ti = TouchBeginTouch(dev, ev-device_event.sourceid, touchid,
-  emulate_pointer);
-@@ -1619,9 +1615,14 @@ ProcessTouchEvent(InternalEvent *ev, DeviceIntPtr dev)
-  * events which _only_ emulate motion just work normally */
- if (emulate_pointer  ev-any.type != ET_TouchUpdate)
- DeliverEmulatedMotionEvent(dev, ti, ev);
-+
- if (emulate_pointer  IsMaster(dev))
- CheckMotion(ev-device_event, dev);
- 
-+kbd = GetMaster(dev, KEYBOARD_OR_FLOAT);
-+event_set_state(NULL, kbd, ev-device_event);
-+ev-device_event.corestate = event_get_corestate(NULL, kbd);
-+
- /* Make sure we have a valid window trace for event delivery; must be
-  * called after event type mutation. Touch end events are always

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

2013-02-18 Thread Jan de Groot 
Date: Monday, February 18, 2013 @ 16:57:20
  Author: jgc
Revision: 178228

upgpkg: xorg-server 1.13.2.901-1

Update to 1.13.3 RC1. Disable acpid code (FS#31907), Initialize a value to NULL 
to fix xorg segfaulting with vboxvideo (FS#33229)

Added:
  xorg-server/trunk/bug59825.patch
  xorg-server/trunk/xserver-1.6.0-less-acpi-brokenness.patch
Modified:
  xorg-server/trunk/PKGBUILD

--+
 PKGBUILD |   21 -
 bug59825.patch   |   12 
 xserver-1.6.0-less-acpi-brokenness.patch |   25 +
 3 files changed, 49 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-18 14:46:39 UTC (rev 178227)
+++ PKGBUILD2013-02-18 15:57:20 UTC (rev 178228)
@@ -3,7 +3,7 @@
 
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 
'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.13.2
+pkgver=1.13.2.901
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom')
@@ -16,14 +16,17 @@
 source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
 autoconfig-nvidia.patch
 autoconfig-sis.patch
+xserver-1.6.0-less-acpi-brokenness.patch
+bug59825.patch
 xvfb-run
 xvfb-run.1
 10-quirks.conf
-#git-fixes.patch
 use-pixman-glyph-cache.patch)
-sha256sums=('3850adb89e9170ad85aea39d240279494c07779e50cd3cd60126028681209408'
+sha256sums=('5351e2d18949f22c92350ffa037cfc49d3ac09f2ac4d3be6a3ea566d2052723c'
 '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162'
 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
+'e033f9bcc21980f7f0428e6ed6c362a3d55ad293b05fd6e6c6c1933b86f9e63a'
+'26ee6ff255a60d7c1e136c612925eb63c86e85a4a3a55d531852ad9275526588'
 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
 '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
 '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166'
@@ -32,18 +35,18 @@
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
 
-  # Apply upstream fixes from server-1.13 branch
-#  patch -Np1 -i ${srcdir}/git-fixes.patch
-
-  # Use pixman 0.28.0 glyph cache - backported from git master
-#  patch -Np1 -i ${srcdir}/use-pixman-glyph-cache.patch
-
   # Use nouveau/nv/nvidia drivers for nvidia devices
   patch -Np1 -i ${srcdir}/autoconfig-nvidia.patch
 
   # Use unofficial imedia SiS driver for supported SiS devices
   patch -Np0 -i ${srcdir}/autoconfig-sis.patch
 
+  # https://bugs.freedesktop.org/show_bug.cgi?id=59825 - fixes crash with 
vboxvideo
+  patch -Np1 -i ${srcdir}/bug59825.patch
+
+  # From Fedora. Do not build acpid code, it is buggy and we do not need it
+  patch -Np1 -i ${srcdir}/xserver-1.6.0-less-acpi-brokenness.patch
+
   autoreconf -fi
   ./configure --prefix=/usr \
   --enable-ipv6 \

Added: bug59825.patch
===
--- bug59825.patch  (rev 0)
+++ bug59825.patch  2013-02-18 15:57:20 UTC (rev 178228)
@@ -0,0 +1,12 @@
+diff -U 3 -b -d -p -r -- a/glx/glxdri.c b/glx/glxdri.c
+--- a/glx/glxdri.c 2013-01-24 22:14:35.216092949 +0100
 b/glx/glxdri.c 2013-01-24 22:13:48.499427991 +0100
+@@ -971,6 +971,8 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
+ size_t buffer_size;
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+ 
++framebuffer.base = NULL;
++
+ if (!xf86LoaderCheckSymbol(DRIQueryDirectRenderingCapable) ||
+ !DRIQueryDirectRenderingCapable(pScreen, isCapable) || !isCapable) {
+ LogMessage(X_INFO,
\ No newline at end of file

Added: xserver-1.6.0-less-acpi-brokenness.patch
===
--- xserver-1.6.0-less-acpi-brokenness.patch(rev 0)
+++ xserver-1.6.0-less-acpi-brokenness.patch2013-02-18 15:57:20 UTC (rev 
178228)
@@ -0,0 +1,25 @@
+From 0002cde5312e785529b2901d7f8a82d5623e4ca7 Mon Sep 17 00:00:00 2001
+From: Adam Jackson a...@redhat.com
+Date: Wed, 9 Nov 2011 11:52:06 +1000
+Subject: [PATCH 2/7] Don't build the ACPI code.
+
+No good can come of this.
+---
+ configure.ac |1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index a12783c..54f4464 100644
+--- a/configure.ac
 b/configure.ac
+@@ -1620,7 +1620,6 @@ if test x$XORG = xyes; then
+   linux_alpha=yes
+   ;;
+ i*86|amd64*|x86_64*|ia64*)
+-  linux_acpi=yes
+   ;;
+ *)
+   ;;
+-- 
+1.7.10.1
+

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

2012-08-09 Thread Jan de Groot 
Date: Thursday, August 9, 2012 @ 06:15:36
  Author: jgc
Revision: 165035

upgpkg: xorg-server 1.12.3.901-1

Update to 1.12.4 RC1. Built against new protos/libs from testing, so if this 
moves to extra, move those too

Modified:
  xorg-server/trunk/PKGBUILD
Deleted:
  
xorg-server/trunk/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff
  xorg-server/trunk/git-fixes.patch

-+
 EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff |  116 
 PKGBUILD|   14 
 git-fixes.patch | 1717 
--
 3 files changed, 2 insertions(+), 1845 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 165034:165035 to see the changes.

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

2012-03-31 Thread andyrtr 
Date: Saturday, March 31, 2012 @ 05:50:06
  Author: andyrtr
Revision: 154932

upgpkg: xorg-server 1.12.0.901-1

upstream update 1.12.1 rc1

Modified:
  xorg-server/trunk/PKGBUILD
  xorg-server/trunk/autoconfig-nvidia.patch
  xorg-server/trunk/autoconfig-sis.patch

-+
 PKGBUILD|8 
 autoconfig-nvidia.patch |   12 ++--
 autoconfig-sis.patch|   18 ++
 3 files changed, 20 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-31 09:15:49 UTC (rev 154931)
+++ PKGBUILD2012-03-31 09:50:06 UTC (rev 154932)
@@ -3,7 +3,7 @@
 
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 
'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.12.0
+pkgver=1.12.0.901
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom')
@@ -20,9 +20,9 @@
 xvfb-run
 xvfb-run.1
 10-quirks.conf)
-sha1sums=('5f48db767f71e9f58ded6ff356f3b8340820e524'
-  'f19658773d3fa4dc468bb28f9f01866acce71540'
-  '962fecc159c128728f14e8ba231c5b00391ff4ac'
+sha1sums=('80465deb799cdc6b7c2cc7d61e7ad8b4bc3892d7'
+  '63836e5cfb4ae7353fb2e31239a544409c7ead32'
+  '175de5630b43dbc97778adfba5563b7fdd77f11f'
   'c94f742d3f9cabf958ae58e4015d9dd185aabedc'
   '6838fc00ef4618c924a77e0fb03c05346080908a'
   '993798f3d22ad672d769dae5f48d1fa068d5578f')

Modified: autoconfig-nvidia.patch
===
--- autoconfig-nvidia.patch 2012-03-31 09:15:49 UTC (rev 154931)
+++ autoconfig-nvidia.patch 2012-03-31 09:50:06 UTC (rev 154932)
@@ -1,11 +1,11 @@
 diff -Nur xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c 
xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c
 --- xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c
2012-02-10 10:10:37.583014924 +
 +++ xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c 2012-02-10 
11:16:07.148971317 +
-@@ -,7 +,23 @@
-   {
-   int idx = 0;
+@@ -1144,7 +1144,23 @@
+ int idx = 0;
+ 
  #ifdef __linux__
--  driverList[idx++] = nouveau;
+-driverList[idx++] = nouveau;
 +  switch (dev-device_id)
 +  {
 +  /* NV1 */
@@ -24,5 +24,5 @@
 +  break;
 +  }
  #endif
-   driverList[idx++] = nv;
-   break;
+ driverList[idx++] = nv;
+ break;

Modified: autoconfig-sis.patch
===
--- autoconfig-sis.patch2012-03-31 09:15:49 UTC (rev 154931)
+++ autoconfig-sis.patch2012-03-31 09:50:06 UTC (rev 154932)
@@ -1,10 +1,12 @@
 --- hw/xfree86/common/xf86pciBus.c.orig2011-09-24 10:53:45.421697668 
+
 +++ hw/xfree86/common/xf86pciBus.c 2011-09-24 10:55:56.416250708 +
-@@ -1140,7 +1140,15 @@
-   driverList[0] = savage; break;
-   }
-   break;
--  case 0x1039:driverList[0] = sis;  break;
+@@ -1200,9 +1200,15 @@
+ break;
+ }
+ break;
+-case 0x1039:
+-driverList[0] = sis;
+-break;
 +  case 0x1039:
 +  switch (dev-device_id)
 +  {
@@ -14,6 +16,6 @@
 +  driverList[0] = sis; break;
 +  }
 +  break;
-   case 0x126f:driverList[0] = siliconmotion; break;
-   case 0x121a:
-   if (dev-device_id  0x0003)
+ case 0x126f:
+ driverList[0] = siliconmotion;
+ break;

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

2012-02-10 Thread Ionut Biru 
Date: Friday, February 10, 2012 @ 09:41:52
  Author: ibiru
Revision: 149764

update autoconfig-nvidia.patch for xorg-server 1.12
drop revert-trapezoids.patch because the bug was fixed somet time ago in nvidia 
driver

Modified:
  xorg-server/trunk/PKGBUILD
  xorg-server/trunk/autoconfig-nvidia.patch
Deleted:
  xorg-server/trunk/revert-trapezoids.patch

-+
 PKGBUILD|   11 --
 autoconfig-nvidia.patch |   55 ++
 revert-trapezoids.patch |  179 --
 3 files changed, 30 insertions(+), 215 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-10 13:45:21 UTC (rev 149763)
+++ PKGBUILD2012-02-10 14:41:52 UTC (rev 149764)
@@ -4,7 +4,7 @@
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 
'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
 pkgver=1.11.99.902
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('custom')
 url=http://xorg.freedesktop.org;
@@ -16,15 +16,13 @@
 source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
 autoconfig-nvidia.patch
 autoconfig-sis.patch
-revert-trapezoids.patch
 #git-fixes.patch
 xvfb-run
 xvfb-run.1
 10-quirks.conf)
 md5sums=('c1535e351dc73836a9000b7c9bc13112'
- '6c7e87d63ac4b535e19a80c89d0cf091'
+ '7adcd74aebad71af7cc7b68c35aaaf35'
  'f8194638ca4872c2b0a67862a70bcebf'
- 'f6c84f4936f8e00abdfbd9fb4eda83fb'
  '52fd3effd80d7bc6c1660d4ecf23d31c'
  '376c70308715cd2643f7bff936d9934b'
  'd4f7dfc6be4ef4e2c6dd7632a9d88abe')
@@ -33,14 +31,11 @@
   cd ${srcdir}/${pkgbase}-${pkgver}
 
   # Use nouveau/nv/nvidia drivers for nvidia devices
-#  patch -Np1 -i ${srcdir}/autoconfig-nvidia.patch
+  patch -Np1 -i ${srcdir}/autoconfig-nvidia.patch
 
   # Use unofficial imedia SiS driver for supported SiS devices
   patch -Np0 -i ${srcdir}/autoconfig-sis.patch
 
-  # Revert commit that causes huge slowdowns with binary nVidia driver
-  patch -Np1 -i ${srcdir}/revert-trapezoids.patch
-
   # Add post-release patches from 1.11 branch
 #  patch -Np1 -i ${srcdir}/git-fixes.patch
 

Modified: autoconfig-nvidia.patch
===
--- autoconfig-nvidia.patch 2012-02-10 13:45:21 UTC (rev 149763)
+++ autoconfig-nvidia.patch 2012-02-10 14:41:52 UTC (rev 149764)
@@ -1,29 +1,28 @@
 a/hw/xfree86/common/xf86pciBus.c
-+++ b/hw/xfree86/common/xf86pciBus.c
-@@ -1123,7 +1123,25 @@ videoPtrToDriverList(struct pci_device *
+diff -Nur xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c 
xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c
+--- xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c
2012-02-10 10:10:37.583014924 +
 xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c 2012-02-10 
11:16:07.148971317 +
+@@ -,7 +,23 @@
+   {
+   int idx = 0;
+ #ifdef __linux__
+-  driverList[idx++] = nouveau;
++  switch (dev-device_id)
++  {
++  /* NV1 */
++  case 0x0008:
++  case 0x0009:
++  driverList[idx++] = vesa;
++  break;
++  /* NV3 */
++  case 0x0018:
++  case 0x0019:
++  driverList[idx++] = nouveau;
++  break;
++  default:
++  driverList[idx++] = nouveau;
++  driverList[idx++] = nvidia;
++  break;
++  }
+ #endif
+   driverList[idx++] = nv;
break;
-   case 0x102b:driverList[0] = mga;  break;
-   case 0x10c8:driverList[0] = neomagic; break;
--  case 0x10de: case 0x12d2:   driverList[0] = nv;   break;
-+  case 0x10de: case 0x12d2:
-+  switch (dev-device_id) {
-+  /* NV1 */
-+  case 0x0008:
-+  case 0x0009:
-+  driverList[0] = vesa;
-+  break;
-+  /* NV3 */
-+  case 0x0018:
-+  case 0x0019:
-+  driverList[0] = nv;
-+  break;
-+  default:
-+  driverList[0] = nouveau;
-+  driverList[1] = nv;
-+  driverList[2] = nvidia;
-+  break;
-+  }
-+  break;
-   case 0x1106:driverList[0] = openchrome; break;
- case 0x1b36:  driverList[0] = qxl; break;
-   case 0x1163:driverList[0] = rendition; break;

Deleted: revert-trapezoids.patch
===
--- revert-trapezoids.patch 2012-02-10 13:45:21 UTC (rev 149763)
+++ revert-trapezoids.patch 2012-02-10 14:41:52 UTC (rev 149764)
@@ -1,179 +0,0 @@
-diff -ru a/fb/fbpict.c b/fb/fbpict.c
 a/fb/fbpict.c

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

2011-10-10 Thread Jan de Groot 
Date: Monday, October 10, 2011 @ 05:05:46
  Author: jgc
Revision: 140221

upgpkg: xorg-server 1.11.1-2

Add upstream patches from 1.11 branch, revert commit that causes huge slowdown 
with nvidia drivers

Added:
  xorg-server/trunk/git-fixes.patch
  xorg-server/trunk/revert-trapezoids.patch
Modified:
  xorg-server/trunk/PKGBUILD

-+
 PKGBUILD|   12 +
 git-fixes.patch |  288 ++
 revert-trapezoids.patch |  179 
 3 files changed, 478 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-10-09 23:40:26 UTC (rev 140220)
+++ PKGBUILD2011-10-10 09:05:46 UTC (rev 140221)
@@ -4,7 +4,7 @@
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 
'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
 pkgver=1.11.1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('custom')
 url=http://xorg.freedesktop.org;
@@ -13,12 +13,16 @@
 source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
 autoconfig-nvidia.patch
 autoconfig-sis.patch
+revert-trapezoids.patch
+git-fixes.patch
 xvfb-run
 xvfb-run.1
 10-quirks.conf)
 sha1sums=('ed0358b61294f1283aad42cf1e609752ceeffafd'
   '0249b892f27243d8fe6fe6d226bf4c2391cedf49'
   '962fecc159c128728f14e8ba231c5b00391ff4ac'
+  'd9f7d9553e772c2682c15079019d30c658a4f83b'
+  'd73125bf93aea09b0beb55e75c510b9f72f5d21a'
   'c94f742d3f9cabf958ae58e4015d9dd185aabedc'
   '6838fc00ef4618c924a77e0fb03c05346080908a'
   '993798f3d22ad672d769dae5f48d1fa068d5578f')
@@ -32,6 +36,12 @@
   # Use unofficial imedia SiS driver for supported SiS devices
   patch -Np0 -i ${srcdir}/autoconfig-sis.patch
 
+  # Revert commit that causes huge slowdowns with binary nVidia driver
+  patch -Np1 -i ${srcdir}/revert-trapezoids.patch
+
+  # Add post-release patches from 1.11 branch
+  patch -Np1 -i ${srcdir}/git-fixes.patch
+
   autoreconf
   ./configure --prefix=/usr \
   --enable-ipv6 \

Added: git-fixes.patch
===
--- git-fixes.patch (rev 0)
+++ git-fixes.patch 2011-10-10 09:05:46 UTC (rev 140221)
@@ -0,0 +1,288 @@
+From bd6ea85209e5ab80375d4ec9994d10a89fd1374a Mon Sep 17 00:00:00 2001
+From: Jamey Sharp ja...@minilop.net
+Date: Wed, 15 Sep 2010 01:35:21 +
+Subject: Fix pixmap double-frees on error paths.
+
+If AddResource fails, it will automatically free the object that was
+passed to it by calling the appropriate deleteFunc; and of course
+FreeResource also calls the deleteFunc. In both cases it's wrong to call
+the destroy hook manually.
+
+Commit by Jamey Sharp and Josh Triplett.
+
+Signed-off-by: Jamey Sharp ja...@minilop.net
+Signed-off-by: Josh Triplett j...@joshtriplett.org
+Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
+Reviewed-by: Aaron Plattner aplatt...@nvidia.com
+(cherry picked from commit 0f380a5005f800572773cd4667ce43c7459cc467)
+---
+diff --git a/Xext/shm.c b/Xext/shm.c
+index b08af82..4141a8f 100644
+--- a/Xext/shm.c
 b/Xext/shm.c
+@@ -991,7 +991,6 @@ CreatePmap:
+   pMap-drawable.serialNumber = NEXT_SERIAL_NUMBER;
+   pMap-drawable.id = newPix-info[j].id;
+   if (!AddResource(newPix-info[j].id, RT_PIXMAP, (pointer)pMap)) {
+-  (*pScreen-DestroyPixmap)(pMap);
+   result = BadAlloc;
+   break;
+   }
+@@ -1002,10 +1001,8 @@ CreatePmap:
+ }
+ 
+ if(result == BadAlloc) {
+-  while(j--) {
+-  (*pScreen-DestroyPixmap)(pMap);
++  while(j--)
+   FreeResource(newPix-info[j].id, RT_NONE);
+-  }
+   free(newPix);
+ } else 
+   AddResource(stuff-pid, XRT_PIXMAP, newPix);
+@@ -1110,7 +1107,6 @@ CreatePmap:
+   {
+   return Success;
+   }
+-  pDraw-pScreen-DestroyPixmap(pMap);
+ }
+ return BadAlloc;
+ }
+diff --git a/dix/dispatch.c b/dix/dispatch.c
+index 192c8c3..f8200b1 100644
+--- a/dix/dispatch.c
 b/dix/dispatch.c
+@@ -1419,7 +1419,6 @@ CreatePmap:
+   }
+   if (AddResource(stuff-pid, RT_PIXMAP, (pointer)pMap))
+   return Success;
+-  (*pDraw-pScreen-DestroyPixmap)(pMap);
+ }
+ return BadAlloc;
+ }
+--
+cgit v0.9.0.2-2-gbebe
+From 347f5610ca023fb31485aa19c20607af8bf9c834 Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho carl...@gnome.org
+Date: Tue, 30 Aug 2011 22:46:52 +
+Subject: Xi: Fix passive XI2 ungrabs on XIAll[Master]Devices
+
+The corresponding DeviceIntPtr wasn't being gotten properly,
+resulting in BadDevice from dixLookupDevice().
+
+Signed-off-by: Carlos Garnacho carl...@gnome.org
+Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+(cherry picked from commit