[arch-commits] Commit in xorg-server/trunk (3 files)
Laurent Carlier
lcarlier at archlinux.org
Tue Oct 27 13:18:41 UTC 2015
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 <airlied at redhat.com>
-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 <airlied at redhat.com>
----
- 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(®ion, 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 <hdegoede at redhat.com>
-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 <hdegoede at redhat.com>
----
- 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, &VT));
- if (ret < 0)
-@@ -294,7 +302,7 @@ xf86OpenConsole(void)
- else { /* serverGeneration != 1 */
- if (!xf86Info.ShareVTs && xf86Info.autoVTSwitch) {
- /* now get the VT */
-- switch_to(xf86Info.vtno, "xf86OpenConsole");
-+ switch_to(xf86Info.vtno, TRUE);
- }
- }
- }
-@@ -346,7 +354,7 @@ xf86CloseConsole(void)
- * Perform a switch back to the active VT when we were started
- */
- if (activeVT >= 0) {
-- switch_to(activeVT, "xf86CloseConsole");
-+ switch_to(activeVT, FALSE);
- activeVT = -1;
- }
- }
---
-2.5.0
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-10-27 13:08:28 UTC (rev 249790)
+++ PKGBUILD 2015-10-27 13:18:40 UTC (rev 249791)
@@ -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.17.2
-pkgrel=5
+pkgver=1.17.3
+pkgrel=1
arch=('i686' 'x86_64')
license=('custom')
url="http://xorg.freedesktop.org"
@@ -23,13 +23,11 @@
0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch
0002-dix-hook-up-the-unaccelerated-valuator-masks.patch
0001-systemd-logind-do-not-rely-on-directed-signals.patch
- 0001-glamor-make-current-in-prepare-paths.patch
- 0001-os-make-sure-the-clientsWritable-fd_set-is-initializ.patch
- 0001-linux-Do-not-call-FatalError-from-xf86CloseConsole.patch)
+ 0001-os-make-sure-the-clientsWritable-fd_set-is-initializ.patch)
validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
'C383B778255613DFDB409D91DB221A6900000011'
'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3')
-sha256sums=('f61120612728f2c5034671d0ca3e2273438c60aba93b3dda4a8aa40e6a257993'
+sha256sums=('89b5c6b7e7ec4731645283d2178f607825b75a470e76b3ad3cb1c1dbd2456b73'
'SKIP'
'af1c3d2ea5de7f6a6b5f7c60951a189a4749d1495e5462f3157ae7ac8fe1dc56'
'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
@@ -37,9 +35,7 @@
'3dc795002b8763a7d29db94f0af200131da9ce5ffc233bfd8916060f83a8fad7'
'416a1422eed71efcebb1d893de74e7f27e408323a56c4df003db37f5673b3f96'
'3d7edab3a54d647e7d924b29d29f91b50212f308fcb1853a5aacd3181f58276c'
- '793579adbef979088cadc0fd9ce0c24df0455a6936d3de7a9356df537b7d9a81'
- 'efc05c06af2bfdf588ef7a60b44c1d180fb353b1bffdfdf96415d63690b6e394'
- 'bdcfc54ce0b64d29848efc56383d850778c6eeecf836c10b67ec2eda03a6160b')
+ 'efc05c06af2bfdf588ef7a60b44c1d180fb353b1bffdfdf96415d63690b6e394')
prepare() {
cd "${pkgbase}-${pkgver}"
@@ -51,12 +47,8 @@
patch -Np1 -i ../0001-systemd-logind-do-not-rely-on-directed-signals.patch
# fix FS#45009, merged upstream
- patch -Np1 -i ../0001-glamor-make-current-in-prepare-paths.patch
patch -Np1 -i ../0001-os-make-sure-the-clientsWritable-fd_set-is-initializ.patch
- # fix FS#46741, taken from Fedora
- patch -Np1 -i ../0001-linux-Do-not-call-FatalError-from-xf86CloseConsole.patch
-
autoreconf -fvi
}
More information about the arch-commits
mailing list