diff options
| -rw-r--r-- | .SRCINFO | 9 | ||||
| -rw-r--r-- | 0001-glamor-make-current-in-prepare-paths.patch | 34 | ||||
| -rw-r--r--[-rwxr-xr-x] | PKGBUILD | 13 | ||||
| -rw-r--r--[-rwxr-xr-x] | xvfb-run | 0 |
4 files changed, 48 insertions, 8 deletions
@@ -1,6 +1,6 @@ pkgbase = xorg-server-dev pkgver = 1.17.2 - pkgrel = 2 + pkgrel = 3 url = http://xorg.freedesktop.org arch = i686 arch = x86_64 @@ -60,6 +60,7 @@ pkgbase = xorg-server-dev source = 0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch source = 0002-dix-hook-up-the-unaccelerated-valuator-masks.patch source = 0001-systemd-logind-do-not-rely-on-directed-signals.patch + source = 0001-glamor-make-current-in-prepare-paths.patch sha256sums = f61120612728f2c5034671d0ca3e2273438c60aba93b3dda4a8aa40e6a257993 sha256sums = SKIP sha256sums = af1c3d2ea5de7f6a6b5f7c60951a189a4749d1495e5462f3157ae7ac8fe1dc56 @@ -68,6 +69,7 @@ pkgbase = xorg-server-dev sha256sums = 3dc795002b8763a7d29db94f0af200131da9ce5ffc233bfd8916060f83a8fad7 sha256sums = 416a1422eed71efcebb1d893de74e7f27e408323a56c4df003db37f5673b3f96 sha256sums = 3d7edab3a54d647e7d924b29d29f91b50212f308fcb1853a5aacd3181f58276c + sha256sums = 793579adbef979088cadc0fd9ce0c24df0455a6936d3de7a9356df537b7d9a81 pkgname = xorg-server-dev pkgdesc = Xorg X server - Bleeding edge version @@ -85,9 +87,8 @@ pkgname = xorg-server-dev depends = xf86-input-evdev depends = libxshmfence depends = libgl - provides = X-ABI-VIDEODRV_VERSION=19.0 - provides = X-ABI-XINPUT_VERSION=21.1 - provides = X-ABI-EXTENSION_VERSION=9.0 + provides = + provides = X-ABI-_VERSION=grep: xorg-server-1.17.2/hw/xfree86/common/xf86Module.h: No such file or directory provides = x-server provides = xorg-server conflicts = nvidia-utils<=331.20 diff --git a/0001-glamor-make-current-in-prepare-paths.patch b/0001-glamor-make-current-in-prepare-paths.patch new file mode 100644 index 000000000000..6167395d7459 --- /dev/null +++ b/0001-glamor-make-current-in-prepare-paths.patch @@ -0,0 +1,34 @@ +From 422a9f7f37eb6027fa4d20a4be208978832be6d6 Mon Sep 17 00:00:00 2001 +From: Dave Airlie <airlied@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@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 + diff --git a/PKGBUILD b/PKGBUILD index 85f64dfde755..348cd306e569 100755..100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ _pkgbase=xorg-server pkgname=('xorg-server-dev' 'xorg-server-xephyr-dev' 'xorg-server-xdmx-dev' 'xorg-server-xvfb-dev' 'xorg-server-xnest-dev' 'xorg-server-xwayland-dev' 'xorg-server-common-dev' 'xorg-server-devel-dev') pkgver=1.17.2 # http://lists.x.org/archives/xorg/2015-June/057436.html -pkgrel=2 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild +pkgrel=3 arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org" @@ -21,7 +21,8 @@ source=(${url}/releases/individual/xserver/${_pkgbase}-${pkgver}.tar.bz2{,.sig} xvfb-run.1 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-systemd-logind-do-not-rely-on-directed-signals.patch + 0001-glamor-make-current-in-prepare-paths.patch) validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C' 'C383B778255613DFDB409D91DB221A6900000011' 'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3') @@ -32,7 +33,8 @@ sha256sums=('f61120612728f2c5034671d0ca3e2273438c60aba93b3dda4a8aa40e6a257993' '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' '3dc795002b8763a7d29db94f0af200131da9ce5ffc233bfd8916060f83a8fad7' '416a1422eed71efcebb1d893de74e7f27e408323a56c4df003db37f5673b3f96' - '3d7edab3a54d647e7d924b29d29f91b50212f308fcb1853a5aacd3181f58276c') + '3d7edab3a54d647e7d924b29d29f91b50212f308fcb1853a5aacd3181f58276c' + '793579adbef979088cadc0fd9ce0c24df0455a6936d3de7a9356df537b7d9a81') prepare() { cd "${_pkgbase}-${pkgver}" @@ -41,7 +43,10 @@ prepare() { patch -Np1 -i ../0002-dix-hook-up-the-unaccelerated-valuator-masks.patch msg2 "fix VT switching with kdbus; from upstream" - patch -Np1 -i "../0001-systemd-logind-do-not-rely-on-directed-signals.patch" + patch -Np1 -i ../0001-systemd-logind-do-not-rely-on-directed-signals.patch + + msg2 "fix FS#45009, merged upstream" + patch -Np1 -i ../0001-glamor-make-current-in-prepare-paths.patch msg2 "Starting autoreconf..." autoreconf -fvi |