[arch-commits] Commit in pixman/trunk (2 files)
Date: Thursday, February 9, 2012 @ 14:47:41
Author: andyrtr
Revision: 149726
upgpkg: pixman 0.24.4-1
upstream update 0.24.4
Modified:
pixman/trunk/PKGBUILD
Deleted:
pixman/trunk/revert-reject-trapezoids-where-top-is-above-the-edges.patch
-+
PKGBUILD| 11 --
revert-reject-trapezoids-where-top-is-above-the-edges.patch | 47 --
2 files changed, 4 insertions(+), 54 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-02-09 19:30:17 UTC (rev 149725)
+++ PKGBUILD2012-02-09 19:47:41 UTC (rev 149726)
@@ -3,22 +3,19 @@
# Contributor: Alexander Baldeck alexan...@archlinux.org
pkgname=pixman
-pkgver=0.24.2
-pkgrel=2
+pkgver=0.24.4
+pkgrel=1
pkgdesc=The pixel-manipulation library for X and cairo
arch=(i686 x86_64)
url=http://xorg.freedesktop.org;
license=('custom')
depends=('glibc')
options=('!libtool')
-source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2
-revert-reject-trapezoids-where-top-is-above-the-edges.patch)
-sha1sums=('233eed3cd16ee1b2a842140477503d2c68b74418'
- 'ee36251d47ccefd5e276cabdba9917fbb2be787a')
+source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('683450f917015366ac7918fc517c76801aeff374')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- patch -Np1 -i
${srcdir}/revert-reject-trapezoids-where-top-is-above-the-edges.patch
./configure --prefix=/usr --disable-static
make
}
Deleted: revert-reject-trapezoids-where-top-is-above-the-edges.patch
===
--- revert-reject-trapezoids-where-top-is-above-the-edges.patch 2012-02-09
19:30:17 UTC (rev 149725)
+++ revert-reject-trapezoids-where-top-is-above-the-edges.patch 2012-02-09
19:47:41 UTC (rev 149726)
@@ -1,47 +0,0 @@
-From ed7a749c90288463ed1c294f58963c607e52 Mon Sep 17 00:00:00 2001
-From: Søren Sandmann Pedersen s...@redhat.com
-Date: Wed, 25 Jan 2012 19:03:05 +
-Subject: Revert Reject trapezoids where top (botttom) is above (below) the
edges
-
-Cairo 1.10 will sometimes generate trapezoids like this, so we can't
-consider them invalid. Fixes bug 45009, reported by Michael Biebl.
-
-This reverts commit 2437ae80e5066dec9fe52f56b016bf136d7cea06.
-diff --git a/pixman/pixman.h b/pixman/pixman.h
-index 20ff496..18d9513 100644
a/pixman/pixman.h
-+++ b/pixman/pixman.h
-@@ -908,14 +908,10 @@ struct pixman_triangle
- };
-
- /* whether 't' is a well defined not obviously empty trapezoid */
--#define pixman_trapezoid_valid(t) \
--((t)-left.p1.y != (t)-left.p2.y \
-- (t)-right.p1.y != (t)-right.p2.y \
-- (int) ((t)-bottom - (t)-top) 0 \
-- (t)-bottom = (t)-left.p2.y \
-- (t)-bottom = (t)-right.p2.y
\
-- (t)-top = (t)-left.p1.y \
-- (t)-top = (t)-right.p1.y)
-+#define pixman_trapezoid_valid(t)\
-+((t)-left.p1.y != (t)-left.p2.y \
-+ (t)-right.p1.y != (t)-right.p2.y\
-+ (int) ((t)-bottom - (t)-top) 0)
-
- struct pixman_span_fix
- {
-diff --git a/test/composite-traps-test.c b/test/composite-traps-test.c
-index de518d8..ff03b50 100644
a/test/composite-traps-test.c
-+++ b/test/composite-traps-test.c
-@@ -251,6 +251,6 @@ test_composite (int testnum,
- int
- main (int argc, const char *argv[])
- {
--return fuzzer_test_main(composite traps, 4, 0x4346479C,
-+return fuzzer_test_main(composite traps, 4, 0xE3112106,
- test_composite, argc, argv);
- }
---
-cgit v0.9.0.2-2-gbebe
[arch-commits] Commit in pixman/trunk (2 files)
Date: Monday, February 6, 2012 @ 08:29:25
Author: jgc
Revision: 149215
upgpkg: pixman 0.24.2-2
Revert upstream commit that causes broken rendering (FS#28188)
Added:
pixman/trunk/revert-reject-trapezoids-where-top-is-above-the-edges.patch
Modified:
pixman/trunk/PKGBUILD
-+
PKGBUILD| 11 +-
revert-reject-trapezoids-where-top-is-above-the-edges.patch | 47 ++
2 files changed, 54 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-02-06 12:55:05 UTC (rev 149214)
+++ PKGBUILD2012-02-06 13:29:25 UTC (rev 149215)
@@ -4,18 +4,21 @@
pkgname=pixman
pkgver=0.24.2
-pkgrel=1
-pkgdesc=Pixman library
+pkgrel=2
+pkgdesc=The pixel-manipulation library for X and cairo
arch=(i686 x86_64)
url=http://xorg.freedesktop.org;
license=('custom')
depends=('glibc')
options=('!libtool')
-source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('233eed3cd16ee1b2a842140477503d2c68b74418')
+source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2
+revert-reject-trapezoids-where-top-is-above-the-edges.patch)
+sha1sums=('233eed3cd16ee1b2a842140477503d2c68b74418'
+ 'ee36251d47ccefd5e276cabdba9917fbb2be787a')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
+ patch -Np1 -i
${srcdir}/revert-reject-trapezoids-where-top-is-above-the-edges.patch
./configure --prefix=/usr --disable-static
make
}
Added: revert-reject-trapezoids-where-top-is-above-the-edges.patch
===
--- revert-reject-trapezoids-where-top-is-above-the-edges.patch
(rev 0)
+++ revert-reject-trapezoids-where-top-is-above-the-edges.patch 2012-02-06
13:29:25 UTC (rev 149215)
@@ -0,0 +1,47 @@
+From ed7a749c90288463ed1c294f58963c607e52 Mon Sep 17 00:00:00 2001
+From: Søren Sandmann Pedersen s...@redhat.com
+Date: Wed, 25 Jan 2012 19:03:05 +
+Subject: Revert Reject trapezoids where top (botttom) is above (below) the
edges
+
+Cairo 1.10 will sometimes generate trapezoids like this, so we can't
+consider them invalid. Fixes bug 45009, reported by Michael Biebl.
+
+This reverts commit 2437ae80e5066dec9fe52f56b016bf136d7cea06.
+---
+diff --git a/pixman/pixman.h b/pixman/pixman.h
+index 20ff496..18d9513 100644
+--- a/pixman/pixman.h
b/pixman/pixman.h
+@@ -908,14 +908,10 @@ struct pixman_triangle
+ };
+
+ /* whether 't' is a well defined not obviously empty trapezoid */
+-#define pixman_trapezoid_valid(t) \
+-((t)-left.p1.y != (t)-left.p2.y \
+- (t)-right.p1.y != (t)-right.p2.y \
+- (int) ((t)-bottom - (t)-top) 0 \
+- (t)-bottom = (t)-left.p2.y \
+- (t)-bottom = (t)-right.p2.y
\
+- (t)-top = (t)-left.p1.y \
+- (t)-top = (t)-right.p1.y)
++#define pixman_trapezoid_valid(t)\
++((t)-left.p1.y != (t)-left.p2.y \
++ (t)-right.p1.y != (t)-right.p2.y\
++ (int) ((t)-bottom - (t)-top) 0)
+
+ struct pixman_span_fix
+ {
+diff --git a/test/composite-traps-test.c b/test/composite-traps-test.c
+index de518d8..ff03b50 100644
+--- a/test/composite-traps-test.c
b/test/composite-traps-test.c
+@@ -251,6 +251,6 @@ test_composite (int testnum,
+ int
+ main (int argc, const char *argv[])
+ {
+-return fuzzer_test_main(composite traps, 4, 0x4346479C,
++return fuzzer_test_main(composite traps, 4, 0xE3112106,
+ test_composite, argc, argv);
+ }
+--
+cgit v0.9.0.2-2-gbebe
