[arch-commits] Commit in xorg-server/trunk (3 files)
Laurent Carlier
lcarlier at archlinux.org
Tue Jul 19 18:07:33 UTC 2016
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
===================================================================
--- PKGBUILD 2016-07-19 14:28:51 UTC (rev 272006)
+++ PKGBUILD 2016-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'
'C383B778255613DFDB409D91DB221A6900000011'
'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, &glamor_egl->major, &glamor_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, &major, &minor)) {
- 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 *pmaskbits,
- goto error;
-
- *ppCurs = pCurs;
-+
-+ if (argb) {
-+ size_t i, size = bits->width * bits->height;
-+
-+ for (i = 0; i < size; i++) {
-+ if ((argb[i] & 0xff000000) == 0 && (argb[i] & 0xffffff) != 0) {
-+ /* ARGB data doesn't seem pre-multiplied, fix it */
-+ for (i = 0; i < size; i++) {
-+ CARD32 a, ar, ag, ab;
-+
-+ a = argb[i] >> 24;
-+ ar = a * ((argb[i] >> 16) & 0xff) / 0xff;
-+ ag = a * ((argb[i] >> 8) & 0xff) / 0xff;
-+ ab = a * (argb[i] & 0xff) / 0xff;
-+
-+ argb[i] = a << 24 | ar << 16 | ag << 8 | ab;
-+ }
-+
-+ break;
-+ }
-+ }
-+ }
-+
- return Success;
-
- error:
More information about the arch-commits
mailing list