From ddbccff147d13e091081ef9b8a1ff33f0aab4d75 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 11 Mar 2015 13:24:36 +0100 Subject: [PATCH] cairo: update to 1.14.2. --- srcpkgs/cairo/patches/fdo-bug-85151.patch | 32 ----------------------- srcpkgs/cairo/template | 22 ++++++---------- 2 files changed, 8 insertions(+), 46 deletions(-) delete mode 100644 srcpkgs/cairo/patches/fdo-bug-85151.patch diff --git a/srcpkgs/cairo/patches/fdo-bug-85151.patch b/srcpkgs/cairo/patches/fdo-bug-85151.patch deleted file mode 100644 index 97fc5180490..00000000000 --- a/srcpkgs/cairo/patches/fdo-bug-85151.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 2de69581c28bf115852037ca41eba13cb7335976 Mon Sep 17 00:00:00 2001 -From: Massimo Valentini -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 - -diff --git a/src/cairo-tor-scan-converter.c b/src/cairo-tor-scan-converter.c -index 4adcafb..14922d0 100644 ---- src/cairo-tor-scan-converter.c -+++ 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 diff --git a/srcpkgs/cairo/template b/srcpkgs/cairo/template index bfc5e2063f7..17ad159779b 100644 --- a/srcpkgs/cairo/template +++ b/srcpkgs/cairo/template @@ -1,7 +1,7 @@ # Template build file for 'cairo'. pkgname=cairo -version=1.14.0 -revision=3 +version=1.14.2 +revision=1 build_style=gnu-configure configure_args="--disable-static --disable-lto --enable-tee $(vopt_if opengl '--enable-gl --enable-egl') @@ -11,10 +11,11 @@ maintainer="Juan RP " license="LGPL-2.1, MPL-1.1" homepage="http://cairographics.org" distfiles="${homepage}/releases/$pkgname-$version.tar.xz" -checksum=2cf5f81432e77ea4359af9dcd0f4faf37d015934501391c311bfd2d19a0134b7 +checksum=c919d999ddb1bbbecd4bbe65299ca2abd2079c7e13d224577895afa7005ecceb hostmakedepends="automake libtool pkg-config" -makedepends="libpng-devel fontconfig-devel pixman-devel libXrender-devel libglib-devel" +makedepends="libpng-devel fontconfig-devel pixman-devel libXrender-devel libglib-devel + $(vopt_if opengl MesaLib-devel) $(vopt_if gles2 MesaLib-devel)" pre_configure() { autoreconf -fi @@ -23,16 +24,9 @@ pre_configure() { # Package build options build_options="gles2 opengl" -# XXX -# On RaspberryPi do not use GL; weston needs rpi-firmware-pcfiles which -# conflicts with MesaLib-devel. -if [ "$XBPS_TARGET_MACHINE" != "armv6l" ]; then - build_options_default="opengl" -fi - -if [ "$build_option_opengl" -o "$build_option_gles2" ]; then - makedepends+=" MesaLib-devel" -fi +case "$XBPS_TARGET_MACHINE" in + i686*|x86_64*) build_options_default="opengl";; +esac cairo-devel_package() { depends="${makedepends} cairo>=${version}_${revision}"