summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-04-14 17:56:10 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-04-14 18:41:58 -0300
commit715a30c86707c51c15e97384c775a914548ad79e (patch)
treecc9f14c0ed8828574ac93a498081a60e61c19a1d
parent84ad1ed513cc7a237ebb343cf364525966617554 (diff)
downloadabslibre-715a30c86707c51c15e97384c775a914548ad79e.tar.gz
abslibre-715a30c86707c51c15e97384c775a914548ad79e.tar.bz2
abslibre-715a30c86707c51c15e97384c775a914548ad79e.zip
xorg-server-1.17.1-5.parabola1: fix FS#43937 -> https://bugs.archlinux.org/task/43937
-rw-r--r--libre/xorg-server/0001-mi-Partial-pie-slice-filled-arcs-may-need-more-space.patch42
-rw-r--r--libre/xorg-server/PKGBUILD12
2 files changed, 50 insertions, 4 deletions
diff --git a/libre/xorg-server/0001-mi-Partial-pie-slice-filled-arcs-may-need-more-space.patch b/libre/xorg-server/0001-mi-Partial-pie-slice-filled-arcs-may-need-more-space.patch
new file mode 100644
index 000000000..668ae21ba
--- /dev/null
+++ b/libre/xorg-server/0001-mi-Partial-pie-slice-filled-arcs-may-need-more-space.patch
@@ -0,0 +1,42 @@
+From 41932dfbc841a1adc6512d41085ea3f8ebecb42c Mon Sep 17 00:00:00 2001
+From: Keith Packard <keithp@keithp.com>
+Date: Wed, 8 Apr 2015 07:45:28 -0700
+Subject: [PATCH] mi: Partial pie-slice filled arcs may need more space for
+ spans
+
+The mi filled arc code estimates that a filled arc will produce no
+more spans than the arc is tall. This is true for most arcs except
+for pie-slice arcs strictly between 180 and 360 degrees where the missing
+portion of the arc faces up or down such that we get two spans on some
+scanlines.
+
+For those, we need to reserve room for another height/2 spans. This
+patch just does it for all partial pie-sliced arcs to make the test
+easier to understand; it's just over-allocating a bit of memory, so
+that's safe.
+
+Signed-off-by: Keith Packard <keithp@keithp.com>
+Reviewed-by: Adam Jackson <ajax@redhat.com>
+---
+ mi/mifillarc.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/mi/mifillarc.c b/mi/mifillarc.c
+index 246d70f..888519e 100644
+--- a/mi/mifillarc.c
++++ b/mi/mifillarc.c
+@@ -660,6 +660,11 @@ miPolyFillArc(DrawablePtr pDraw, GCPtr pGC, int narcs_all, xArc * parcs)
+ if (narcs && nspans + arc->height > MAX_SPANS_PER_LOOP)
+ break;
+ nspans += arc->height;
++
++ /* A pie-slice arc may add another pile of spans */
++ if (pGC->arcMode == ArcPieSlice &&
++ (-FULLCIRCLE < arc->angle2 && arc->angle2 < FULLCIRCLE))
++ nspans += (arc->height + 1) >> 1;
+ }
+
+ pts = points = malloc (sizeof (DDXPointRec) * nspans +
+--
+2.3.5
+
diff --git a/libre/xorg-server/PKGBUILD b/libre/xorg-server/PKGBUILD
index 0e612b2f1..1c1c62690 100644
--- a/libre/xorg-server/PKGBUILD
+++ b/libre/xorg-server/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 233821 2015-03-14 18:51:11Z lcarlier $
+# $Id: PKGBUILD 236527 2015-04-14 10:41:30Z lcarlier $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
@@ -6,7 +6,7 @@
pkgbase=xorg-server
pkgname=('xorg-server')
pkgver=1.17.1
-pkgrel=4.parabola1 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild
+pkgrel=5.parabola1 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild
arch=('i686' 'x86_64' 'mips64el')
license=('custom')
url="http://xorg.freedesktop.org"
@@ -22,7 +22,8 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig}
xvfb-run.1
os-access-fix-regression-in-server-interpreted-auth.patch
v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch
- 0001-int10-Fix-error-check-for-pci_device_map_legacy.patch)
+ 0001-int10-Fix-error-check-for-pci_device_map_legacy.patch
+ 0001-mi-Partial-pie-slice-filled-arcs-may-need-more-space.patch)
validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
'C383B778255613DFDB409D91DB221A6900000011')
sha256sums=('2bf8e9f6f0a710dec1d2472467bff1f4e247cb6dcd76eb469aafdc8a2d7db2ab'
@@ -31,7 +32,8 @@ sha256sums=('2bf8e9f6f0a710dec1d2472467bff1f4e247cb6dcd76eb469aafdc8a2d7db2ab'
'2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
'8a9d76eecf8795ca645fb1ce261733965578e953f6606153ce001a0e15d036e8'
'a73e33644682d9f430db987c192da0f7193907af50539669ebd59614a5ebd0f9'
- '2ea82cdbd695f21c935710847913ed58e22d3d5c0c18c96175a4a6cc1142c071')
+ '2ea82cdbd695f21c935710847913ed58e22d3d5c0c18c96175a4a6cc1142c071'
+ 'ca89cc013844c5b50abfde4cc5e852ecdf4368f8b069ffd069a7100843c46e90')
prepare() {
cd "${pkgbase}-${pkgver}"
@@ -41,6 +43,8 @@ prepare() {
patch -Np1 -i ../v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch
# fix FS#43924, merged upstream
patch -Np1 -i ../0001-int10-Fix-error-check-for-pci_device_map_legacy.patch
+ # fix FS#43937, merged upstream
+ patch -Np1 -i ../0001-mi-Partial-pie-slice-filled-arcs-may-need-more-space.patch
# fix os name:
#Build Operating System = OSNAME="--kernel-name --kernel-release --machine" OSVENDOR=""