diff options
author | Mattias Andrée | 2016-07-07 06:36:13 +0200 |
---|---|---|
committer | Mattias Andrée | 2016-07-07 06:36:13 +0200 |
commit | 4e838644dbb0be46fbf088a584eb59ab3ea8cad9 (patch) | |
tree | 50ce4b02c2494695a9036f7671a875ef832e5ac5 | |
parent | 269057271286de9ab821905cbdb2a291280e5d1a (diff) | |
download | aur-4e838644dbb0be46fbf088a584eb59ab3ea8cad9.tar.gz |
Update to 2:1.18.3
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | PKGBUILD | 11 | ||||
-rw-r--r-- | call-eglBindAPI-after-eglInitialize.patch | 48 |
3 files changed, 63 insertions, 8 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Fri Apr 1 17:31:44 UTC 2016 +# Thu Jul 7 04:36:13 UTC 2016 pkgbase = xorg-server-hwcursor-gamma pkgdesc = Xorg X server with patch to apply gamma ramps on hardware cursors - pkgver = 1.18.1 + pkgver = 1.18.3 pkgrel = 1 epoch = 2 url = http://xorg.freedesktop.org @@ -68,7 +68,7 @@ pkgbase = xorg-server-hwcursor-gamma depends = libxshmfence depends = libgl depends = xf86-input-evdev - provides = xorg-server=1.18.1 + provides = xorg-server=1.18.3 provides = X-ABI-VIDEODRV_VERSION=20 provides = X-ABI-XINPUT_VERSION=22.1 provides = X-ABI-EXTENSION_VERSION=9.0 @@ -79,15 +79,17 @@ pkgbase = xorg-server-hwcursor-gamma conflicts = xf86-video-modesetting replaces = glamor-egl replaces = xf86-video-modesetting - source = http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.18.1.tar.bz2 + source = http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.18.3.tar.bz2 source = xvfb-run source = xvfb-run.1 + source = call-eglBindAPI-after-eglInitialize.patch source = 0001-When-an-cursor-is-set-it-is-adjusted-to-use-the.patch source = 0002-Fix-for-full-and-semi-transparency-under-negative-im.patch source = 0003-Use-Harms-s-suggest-do-not-use-inline-if.-And-fix-si.patch - sha256sums = 85ec56dbeb89a951295cdf4f39bf38e515f900d35e06d4a8081b114d1520789d + sha256sums = ea739c22517cdbe2b5f7c0a5fd05fe8a10ac0629003e71c0c7862f4bb60142cd sha256sums = ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9 sha256sums = 2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776 + sha256sums = 45fdc2a1241d458756c41a93c01846e04cc75f3c75f81f48b61533d08280918d sha256sums = bea348631dedd66475d84ac2cfe0840f22a80a642b4680d73fead4749e47f055 sha256sums = be9169b937b5d0b44f7f05d7c08aaa5f0c1092e128ce261d9cb350f09dfe1fb0 sha256sums = 0a643ae83e03faee0f4db669a33c5b3c99edbba5c86cde2c83962ae536d31081 @@ -5,8 +5,8 @@ _pkgname=xorg-server pkgname=xorg-server-hwcursor-gamma epoch=2 -pkgver=1.18.1 -pkgrel=1 # 1=2 in xorg-server +pkgver=1.18.3 +pkgrel=1 # 2 in xorg-server pkgdesc="Xorg X server with patch to apply gamma ramps on hardware cursors" depends=(libepoxy libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau xorg-server-common libxshmfence libgl xf86-input-evdev) provides=("xorg-server=${pkgver}" 'X-ABI-VIDEODRV_VERSION=20' 'X-ABI-XINPUT_VERSION=22.1' 'X-ABI-EXTENSION_VERSION=9.0' 'x-server') @@ -25,12 +25,14 @@ makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 'xcmiscproto' source=(${url}/releases/individual/xserver/${_pkgname}-${pkgver}.tar.bz2 xvfb-run xvfb-run.1 + call-eglBindAPI-after-eglInitialize.patch 0001-When-an-cursor-is-set-it-is-adjusted-to-use-the.patch 0002-Fix-for-full-and-semi-transparency-under-negative-im.patch 0003-Use-Harms-s-suggest-do-not-use-inline-if.-And-fix-si.patch) -sha256sums=('85ec56dbeb89a951295cdf4f39bf38e515f900d35e06d4a8081b114d1520789d' +sha256sums=('ea739c22517cdbe2b5f7c0a5fd05fe8a10ac0629003e71c0c7862f4bb60142cd' 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' + '45fdc2a1241d458756c41a93c01846e04cc75f3c75f81f48b61533d08280918d' 'bea348631dedd66475d84ac2cfe0840f22a80a642b4680d73fead4749e47f055' 'be9169b937b5d0b44f7f05d7c08aaa5f0c1092e128ce261d9cb350f09dfe1fb0' '0a643ae83e03faee0f4db669a33c5b3c99edbba5c86cde2c83962ae536d31081') @@ -42,6 +44,9 @@ prepare() { patch -Np1 -i ../0001-When-an-cursor-is-set-it-is-adjusted-to-use-the.patch patch -Np1 -i ../0002-Fix-for-full-and-semi-transparency-under-negative-im.patch patch -Np1 -i ../0003-Use-Harms-s-suggest-do-not-use-inline-if.-And-fix-si.patch + + msg2 'Apply call-eglBindAPI-after-eglInitialize.patch' + patch -Np1 -i ../call-eglBindAPI-after-eglInitialize.patch } build() { diff --git a/call-eglBindAPI-after-eglInitialize.patch b/call-eglBindAPI-after-eglInitialize.patch new file mode 100644 index 000000000000..09773a2200f2 --- /dev/null +++ b/call-eglBindAPI-after-eglInitialize.patch @@ -0,0 +1,48 @@ +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); + |