Date: Wednesday, October 29, 2014 @ 15:52:58
Author: andyrtr
Revision: 225433
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
cairo/repos/extra-i686/PKGBUILD
(from rev 225432, cairo/trunk/PKGBUILD)
cairo/repos/extra-i686/git_fixes.diff
(from rev 225432, cairo/trunk/git_fixes.diff)
cairo/repos/extra-x86_64/PKGBUILD
(from rev 225432, cairo/trunk/PKGBUILD)
cairo/repos/extra-x86_64/git_fixes.diff
(from rev 225432, cairo/trunk/git_fixes.diff)
Deleted:
cairo/repos/extra-i686/PKGBUILD
cairo/repos/extra-x86_64/PKGBUILD
-----------------------------+
/PKGBUILD | 134 ++++++++++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 58 ------------------
extra-i686/git_fixes.diff | 34 ++++++++++
extra-x86_64/PKGBUILD | 58 ------------------
extra-x86_64/git_fixes.diff | 34 ++++++++++
5 files changed, 202 insertions(+), 116 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-10-29 14:52:43 UTC (rev 225432)
+++ extra-i686/PKGBUILD 2014-10-29 14:52:58 UTC (rev 225433)
@@ -1,58 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <[email protected]>
-# Contributor: Brice Carpentier <[email protected]>
-
-pkgname=cairo
-pkgver=1.14.0
-pkgrel=1
-pkgdesc="Cairo vector graphics library"
-arch=(i686 x86_64)
-license=('LGPL' 'MPL')
-url="http://cairographics.org/";
-depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman>=0.28.0' 'glib2'
'mesa' 'libgl' 'lzo')
-makedepends=('mesa-libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre'
'gtk-doc' 'valgrind' 'git')
- # for the test suite:
- #'ttf-dejavu' 'gsfonts' 'xorg-server-xvfb' ) # 'libdrm')
-#optdepends=('xcb-util: for XCB backend') # really needed?
-provides=('cairo-xcb')
-replaces=('cairo-xcb')
-source=(http://cairographics.org/releases/cairo-$pkgver.tar.xz)
-sha1sums=('53cf589b983412ea7f78feee2e1ba9cea6e3ebae')
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --disable-static \
- --disable-lto \
- --enable-tee \
- --enable-gl \
- --enable-egl \
- --enable-svg \
- --enable-ps \
- --enable-pdf \
- --enable-gobject \
- --enable-gtk-doc
-
- #--disable-xlib-xcb \
- #--enable-test-surfaces \ takes ages
- #--enable-drm # breaks build
-
- make
-}
-
-check() {
- cd $pkgname-$pkgver
- #make -j1 -k test || /bin/true
-
- # results:
- # 1.12.8-1 # 162 Passed, 328 Failed [ 8 crashed, 10 expected], 26 Skipped
- # 1.12.12-2: # 29 Passed, 464 Failed [460 crashed, 2 expected], 26 Skipped
- # 1.12.16-1: # 144 Passed, 364 Failed [ 6 crashed, 12 expected], 27 Skipped
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
Copied: cairo/repos/extra-i686/PKGBUILD (from rev 225432, cairo/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-10-29 14:52:58 UTC (rev 225433)
@@ -0,0 +1,67 @@
+# $Id$
+# Maintainer: Jan de Groot <[email protected]>
+# Contributor: Brice Carpentier <[email protected]>
+
+pkgname=cairo
+pkgver=1.14.0
+pkgrel=2
+pkgdesc="Cairo vector graphics library"
+arch=(i686 x86_64)
+license=('LGPL' 'MPL')
+url="http://cairographics.org/";
+depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman>=0.28.0' 'glib2'
'mesa' 'libgl' 'lzo')
+makedepends=('mesa-libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre'
'gtk-doc' 'valgrind' 'git')
+ # for the test suite:
+ #'ttf-dejavu' 'gsfonts' 'xorg-server-xvfb' ) # 'libdrm')
+#optdepends=('xcb-util: for XCB backend') # really needed?
+provides=('cairo-xcb')
+replaces=('cairo-xcb')
+source=(http://cairographics.org/releases/cairo-$pkgver.tar.xz
+ git_fixes.diff)
+sha1sums=('53cf589b983412ea7f78feee2e1ba9cea6e3ebae'
+ '0ebac538dfa510e8e3f07ba71a49dabc627b08ff')
+
+prepare() {
+ cd $pkgname-$pkgver
+ # fix some segfaults: https://bugs.freedesktop.org/show_bug.cgi?id=85151
+ # https://bugs.archlinux.org/task/42596
+ patch -Np1 -i ${srcdir}/git_fixes.diff
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --disable-static \
+ --disable-lto \
+ --enable-tee \
+ --enable-gl \
+ --enable-egl \
+ --enable-svg \
+ --enable-ps \
+ --enable-pdf \
+ --enable-gobject \
+ --enable-gtk-doc
+
+ #--disable-xlib-xcb \
+ #--enable-test-surfaces \ takes ages
+ #--enable-drm # breaks build
+
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ #make -j1 -k test || /bin/true
+
+ # results:
+ # 1.12.8-1 # 162 Passed, 328 Failed [ 8 crashed, 10 expected], 26 Skipped
+ # 1.12.12-2: # 29 Passed, 464 Failed [460 crashed, 2 expected], 26 Skipped
+ # 1.12.16-1: # 144 Passed, 364 Failed [ 6 crashed, 12 expected], 27 Skipped
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Copied: cairo/repos/extra-i686/git_fixes.diff (from rev 225432,
cairo/trunk/git_fixes.diff)
===================================================================
--- extra-i686/git_fixes.diff (rev 0)
+++ extra-i686/git_fixes.diff 2014-10-29 14:52:58 UTC (rev 225433)
@@ -0,0 +1,34 @@
+From 2de69581c28bf115852037ca41eba13cb7335976 Mon Sep 17 00:00:00 2001
+From: Massimo Valentini <[email protected]>
+Date: Sun, 19 Oct 2014 09:19:10 +0200
+Subject: tor-scan-converter: can't do_fullrow when intersection in row +
+ 0.5subrow
+
+the active edges list must be left sorted at the next possible use
+and since full_row does not deal with intersections it is not usable
+when there is an intersection in the top half of the next row first
+subrow
+
+Reported-and-tested-by: Matthew Leach
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85151
+Reviewed-by: Chris Wilson <[email protected]>
+
+diff --git a/src/cairo-tor-scan-converter.c b/src/cairo-tor-scan-converter.c
+index 4adcafb..14922d0 100644
+--- a/src/cairo-tor-scan-converter.c
++++ b/src/cairo-tor-scan-converter.c
+@@ -1167,8 +1167,8 @@ can_do_full_row (struct active_list *active)
+
+ if (e->dy) {
+ struct quorem x = e->x;
+- x.quo += e->dxdy_full.quo - e->dxdy.quo/2;
+- x.rem += e->dxdy_full.rem - e->dxdy.rem/2;
++ x.quo += e->dxdy_full.quo;
++ x.rem += e->dxdy_full.rem;
+ if (x.rem < 0) {
+ x.quo--;
+ x.rem += e->dy;
+--
+cgit v0.10.2
+
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-10-29 14:52:43 UTC (rev 225432)
+++ extra-x86_64/PKGBUILD 2014-10-29 14:52:58 UTC (rev 225433)
@@ -1,58 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <[email protected]>
-# Contributor: Brice Carpentier <[email protected]>
-
-pkgname=cairo
-pkgver=1.14.0
-pkgrel=1
-pkgdesc="Cairo vector graphics library"
-arch=(i686 x86_64)
-license=('LGPL' 'MPL')
-url="http://cairographics.org/";
-depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman>=0.28.0' 'glib2'
'mesa' 'libgl' 'lzo')
-makedepends=('mesa-libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre'
'gtk-doc' 'valgrind' 'git')
- # for the test suite:
- #'ttf-dejavu' 'gsfonts' 'xorg-server-xvfb' ) # 'libdrm')
-#optdepends=('xcb-util: for XCB backend') # really needed?
-provides=('cairo-xcb')
-replaces=('cairo-xcb')
-source=(http://cairographics.org/releases/cairo-$pkgver.tar.xz)
-sha1sums=('53cf589b983412ea7f78feee2e1ba9cea6e3ebae')
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --disable-static \
- --disable-lto \
- --enable-tee \
- --enable-gl \
- --enable-egl \
- --enable-svg \
- --enable-ps \
- --enable-pdf \
- --enable-gobject \
- --enable-gtk-doc
-
- #--disable-xlib-xcb \
- #--enable-test-surfaces \ takes ages
- #--enable-drm # breaks build
-
- make
-}
-
-check() {
- cd $pkgname-$pkgver
- #make -j1 -k test || /bin/true
-
- # results:
- # 1.12.8-1 # 162 Passed, 328 Failed [ 8 crashed, 10 expected], 26 Skipped
- # 1.12.12-2: # 29 Passed, 464 Failed [460 crashed, 2 expected], 26 Skipped
- # 1.12.16-1: # 144 Passed, 364 Failed [ 6 crashed, 12 expected], 27 Skipped
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
Copied: cairo/repos/extra-x86_64/PKGBUILD (from rev 225432,
cairo/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-10-29 14:52:58 UTC (rev 225433)
@@ -0,0 +1,67 @@
+# $Id$
+# Maintainer: Jan de Groot <[email protected]>
+# Contributor: Brice Carpentier <[email protected]>
+
+pkgname=cairo
+pkgver=1.14.0
+pkgrel=2
+pkgdesc="Cairo vector graphics library"
+arch=(i686 x86_64)
+license=('LGPL' 'MPL')
+url="http://cairographics.org/";
+depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman>=0.28.0' 'glib2'
'mesa' 'libgl' 'lzo')
+makedepends=('mesa-libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre'
'gtk-doc' 'valgrind' 'git')
+ # for the test suite:
+ #'ttf-dejavu' 'gsfonts' 'xorg-server-xvfb' ) # 'libdrm')
+#optdepends=('xcb-util: for XCB backend') # really needed?
+provides=('cairo-xcb')
+replaces=('cairo-xcb')
+source=(http://cairographics.org/releases/cairo-$pkgver.tar.xz
+ git_fixes.diff)
+sha1sums=('53cf589b983412ea7f78feee2e1ba9cea6e3ebae'
+ '0ebac538dfa510e8e3f07ba71a49dabc627b08ff')
+
+prepare() {
+ cd $pkgname-$pkgver
+ # fix some segfaults: https://bugs.freedesktop.org/show_bug.cgi?id=85151
+ # https://bugs.archlinux.org/task/42596
+ patch -Np1 -i ${srcdir}/git_fixes.diff
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --disable-static \
+ --disable-lto \
+ --enable-tee \
+ --enable-gl \
+ --enable-egl \
+ --enable-svg \
+ --enable-ps \
+ --enable-pdf \
+ --enable-gobject \
+ --enable-gtk-doc
+
+ #--disable-xlib-xcb \
+ #--enable-test-surfaces \ takes ages
+ #--enable-drm # breaks build
+
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ #make -j1 -k test || /bin/true
+
+ # results:
+ # 1.12.8-1 # 162 Passed, 328 Failed [ 8 crashed, 10 expected], 26 Skipped
+ # 1.12.12-2: # 29 Passed, 464 Failed [460 crashed, 2 expected], 26 Skipped
+ # 1.12.16-1: # 144 Passed, 364 Failed [ 6 crashed, 12 expected], 27 Skipped
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Copied: cairo/repos/extra-x86_64/git_fixes.diff (from rev 225432,
cairo/trunk/git_fixes.diff)
===================================================================
--- extra-x86_64/git_fixes.diff (rev 0)
+++ extra-x86_64/git_fixes.diff 2014-10-29 14:52:58 UTC (rev 225433)
@@ -0,0 +1,34 @@
+From 2de69581c28bf115852037ca41eba13cb7335976 Mon Sep 17 00:00:00 2001
+From: Massimo Valentini <[email protected]>
+Date: Sun, 19 Oct 2014 09:19:10 +0200
+Subject: tor-scan-converter: can't do_fullrow when intersection in row +
+ 0.5subrow
+
+the active edges list must be left sorted at the next possible use
+and since full_row does not deal with intersections it is not usable
+when there is an intersection in the top half of the next row first
+subrow
+
+Reported-and-tested-by: Matthew Leach
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85151
+Reviewed-by: Chris Wilson <[email protected]>
+
+diff --git a/src/cairo-tor-scan-converter.c b/src/cairo-tor-scan-converter.c
+index 4adcafb..14922d0 100644
+--- a/src/cairo-tor-scan-converter.c
++++ b/src/cairo-tor-scan-converter.c
+@@ -1167,8 +1167,8 @@ can_do_full_row (struct active_list *active)
+
+ if (e->dy) {
+ struct quorem x = e->x;
+- x.quo += e->dxdy_full.quo - e->dxdy.quo/2;
+- x.rem += e->dxdy_full.rem - e->dxdy.rem/2;
++ x.quo += e->dxdy_full.quo;
++ x.rem += e->dxdy_full.rem;
+ if (x.rem < 0) {
+ x.quo--;
+ x.rem += e->dy;
+--
+cgit v0.10.2
+
+
