[arch-commits] Commit in pixman/repos (6 files)
Jan de Groot
jgc at archlinux.org
Mon Feb 6 13:29:48 UTC 2012
Date: Monday, February 6, 2012 @ 08:29:48
Author: jgc
Revision: 149216
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
pixman/repos/extra-i686/PKGBUILD
(from rev 149215, pixman/trunk/PKGBUILD)
pixman/repos/extra-i686/revert-reject-trapezoids-where-top-is-above-the-edges.patch
(from rev 149215, pixman/trunk/revert-reject-trapezoids-where-top-is-above-the-edges.patch)
pixman/repos/extra-x86_64/PKGBUILD
(from rev 149215, pixman/trunk/PKGBUILD)
pixman/repos/extra-x86_64/revert-reject-trapezoids-where-top-is-above-the-edges.patch
(from rev 149215, pixman/trunk/revert-reject-trapezoids-where-top-is-above-the-edges.patch)
Deleted:
pixman/repos/extra-i686/PKGBUILD
pixman/repos/extra-x86_64/PKGBUILD
--------------------------------------------------------------------------+
extra-i686/PKGBUILD | 69 +++++-----
extra-i686/revert-reject-trapezoids-where-top-is-above-the-edges.patch | 47 ++++++
extra-x86_64/PKGBUILD | 69 +++++-----
extra-x86_64/revert-reject-trapezoids-where-top-is-above-the-edges.patch | 47 ++++++
4 files changed, 166 insertions(+), 66 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-02-06 13:29:25 UTC (rev 149215)
+++ extra-i686/PKGBUILD 2012-02-06 13:29:48 UTC (rev 149216)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Contributor: Alexander Baldeck <alexander at archlinux.org>
-
-pkgname=pixman
-pkgver=0.24.2
-pkgrel=1
-pkgdesc="Pixman library"
-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')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --disable-static
- make
-}
-
-check() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make check
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
- install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
Copied: pixman/repos/extra-i686/PKGBUILD (from rev 149215, pixman/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-02-06 13:29:48 UTC (rev 149216)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Alexander Baldeck <alexander at archlinux.org>
+
+pkgname=pixman
+pkgver=0.24.2
+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
+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
+}
+
+check() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make check
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
Copied: pixman/repos/extra-i686/revert-reject-trapezoids-where-top-is-above-the-edges.patch (from rev 149215, pixman/trunk/revert-reject-trapezoids-where-top-is-above-the-edges.patch)
===================================================================
--- extra-i686/revert-reject-trapezoids-where-top-is-above-the-edges.patch (rev 0)
+++ extra-i686/revert-reject-trapezoids-where-top-is-above-the-edges.patch 2012-02-06 13:29:48 UTC (rev 149216)
@@ -0,0 +1,47 @@
+From e5555d7a749c90288463ed1c294f58963c607e52 Mon Sep 17 00:00:00 2001
+From: Søren Sandmann Pedersen <ssp at redhat.com>
+Date: Wed, 25 Jan 2012 19:03:05 +0000
+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", 40000, 0x4346479C,
++ return fuzzer_test_main("composite traps", 40000, 0xE3112106,
+ test_composite, argc, argv);
+ }
+--
+cgit v0.9.0.2-2-gbebe
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-02-06 13:29:25 UTC (rev 149215)
+++ extra-x86_64/PKGBUILD 2012-02-06 13:29:48 UTC (rev 149216)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Contributor: Alexander Baldeck <alexander at archlinux.org>
-
-pkgname=pixman
-pkgver=0.24.2
-pkgrel=1
-pkgdesc="Pixman library"
-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')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --disable-static
- make
-}
-
-check() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make check
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
- install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
Copied: pixman/repos/extra-x86_64/PKGBUILD (from rev 149215, pixman/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-02-06 13:29:48 UTC (rev 149216)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Alexander Baldeck <alexander at archlinux.org>
+
+pkgname=pixman
+pkgver=0.24.2
+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
+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
+}
+
+check() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make check
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
Copied: pixman/repos/extra-x86_64/revert-reject-trapezoids-where-top-is-above-the-edges.patch (from rev 149215, pixman/trunk/revert-reject-trapezoids-where-top-is-above-the-edges.patch)
===================================================================
--- extra-x86_64/revert-reject-trapezoids-where-top-is-above-the-edges.patch (rev 0)
+++ extra-x86_64/revert-reject-trapezoids-where-top-is-above-the-edges.patch 2012-02-06 13:29:48 UTC (rev 149216)
@@ -0,0 +1,47 @@
+From e5555d7a749c90288463ed1c294f58963c607e52 Mon Sep 17 00:00:00 2001
+From: Søren Sandmann Pedersen <ssp at redhat.com>
+Date: Wed, 25 Jan 2012 19:03:05 +0000
+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", 40000, 0x4346479C,
++ return fuzzer_test_main("composite traps", 40000, 0xE3112106,
+ test_composite, argc, argv);
+ }
+--
+cgit v0.9.0.2-2-gbebe
More information about the arch-commits
mailing list