[128925] trunk/dports/graphics
ryandesign at macports.org
ryandesign at macports.org
Sat Nov 29 21:48:19 PST 2014
Revision: 128925
https://trac.macports.org/changeset/128925
Author: ryandesign at macports.org
Date: 2014-11-29 21:48:19 -0800 (Sat, 29 Nov 2014)
Log Message:
-----------
cairo, cairo-devel: update to 1.14.0 (#45391) and make Quartz support always enabled (#44414)
Modified Paths:
--------------
trunk/dports/graphics/cairo/Portfile
trunk/dports/graphics/cairo/files/patch-configure.diff
trunk/dports/graphics/cairo-devel/Portfile
trunk/dports/graphics/cairo-devel/files/patch-configure.diff
Added Paths:
-----------
trunk/dports/graphics/cairo/files/patch-src-cairo-tor-scan-converter.c.diff
trunk/dports/graphics/cairo-devel/files/patch-src-cairo-tor-scan-converter.c.diff
Modified: trunk/dports/graphics/cairo/Portfile
===================================================================
--- trunk/dports/graphics/cairo/Portfile 2014-11-30 02:03:08 UTC (rev 128924)
+++ trunk/dports/graphics/cairo/Portfile 2014-11-30 05:48:19 UTC (rev 128925)
@@ -11,8 +11,7 @@
name cairo
conflicts cairo-devel
set my_name cairo
-version 1.12.16
-revision 2
+version 1.14.0
categories graphics
maintainers ryandesign
license {LGPL-2.1 MPL-1.1}
@@ -31,8 +30,8 @@
advantage of display hardware acceleration when \
available (e.g. through the X Render Extension).
-checksums rmd160 379283c2f5c9690bdfd69c629b8efd59be7a8670 \
- sha256 2505959eb3f1de3e1841023b61585bfd35684b9733c7b6a3643f4f4cbde6d846
+checksums rmd160 87213a12c9789ff78dfbffbe4555aa28811c12c5 \
+ sha256 2cf5f81432e77ea4359af9dcd0f4faf37d015934501391c311bfd2d19a0134b7
depends_build port:pkgconfig
@@ -49,6 +48,9 @@
# Prevent cairo from using librsvg, libspectre, poppler.
patchfiles-append patch-configure.diff
+# Fix crash.
+patchfiles-append patch-src-cairo-tor-scan-converter.c.diff
+
# https://trac.macports.org/ticket/34137
compiler.blacklist-append {clang < 318.0.61}
@@ -57,15 +59,6 @@
compiler.blacklist-append gcc-4.0
}
-pre-configure {
- set pixman_minimum_version 0.20.2
- set pixman_installed_version [exec ${prefix}/bin/pkg-config pixman-1 --modversion]
- if {[vercmp ${pixman_installed_version} ${pixman_minimum_version}] < 0} {
- ui_error "${name} ${version} requires libpixman ${pixman_minimum_version} or later but you have libpixman ${pixman_installed_version}."
- return -code error "incompatible libpixman version"
- }
-}
-
configure.args --disable-gl \
--disable-quartz \
--disable-quartz-font \
@@ -105,6 +98,11 @@
configure.args-replace --disable-quartz-font --enable-quartz-font
configure.args-replace --disable-quartz-image --enable-quartz-image
}
+
+ default_variants +quartz
+ # Don't allow Quartz support to be disabled. Keep the variant for awhile in
+ # case any dependents are using the active_variants portgroup to check for it.
+ variant_set quartz
}
variant x11 {
@@ -122,6 +120,11 @@
}
default_variants +x11
+if {${os.platform} ne "darwin" || ${os.subplatform} ne "macosx"} {
+ # When not on OS X, don't allow X11 support to be disabled, since it is the
+ # only available option.
+ variant_set x11
+}
test.run yes
test.target check
Modified: trunk/dports/graphics/cairo/files/patch-configure.diff
===================================================================
--- trunk/dports/graphics/cairo/files/patch-configure.diff 2014-11-30 02:03:08 UTC (rev 128924)
+++ trunk/dports/graphics/cairo/files/patch-configure.diff 2014-11-30 05:48:19 UTC (rev 128925)
@@ -1,6 +1,6 @@
---- configure.orig 2013-08-26 12:00:41.000000000 -0500
-+++ configure 2013-10-02 10:25:37.000000000 -0500
-@@ -30488,7 +30488,7 @@
+--- configure.orig 2014-10-13 20:47:29.000000000 -0500
++++ configure 2014-10-14 19:35:14.000000000 -0500
+@@ -30634,7 +30634,7 @@
@@ -9,7 +9,7 @@
test_ps=no
any2ppm_ps=no
if test "x$use_ps" = "xyes"; then
-@@ -30885,7 +30885,7 @@
+@@ -31031,7 +31031,7 @@
# poppler-0.17.4 fixes text-pattern and text-transform
@@ -18,11 +18,11 @@
test_pdf=no
any2ppm_pdf=no
if test "x$use_pdf" = "xyes"; then
-@@ -31255,7 +31255,7 @@
+@@ -31401,7 +31401,7 @@
--LIBRSVG_VERSION_REQUIRED=2.15.0
+-LIBRSVG_VERSION_REQUIRED=2.35.0
+LIBRSVG_VERSION_REQUIRED=99999
test_svg=no
any2ppm_svg=no
Added: trunk/dports/graphics/cairo/files/patch-src-cairo-tor-scan-converter.c.diff
===================================================================
--- trunk/dports/graphics/cairo/files/patch-src-cairo-tor-scan-converter.c.diff (rev 0)
+++ trunk/dports/graphics/cairo/files/patch-src-cairo-tor-scan-converter.c.diff 2014-11-30 05:48:19 UTC (rev 128925)
@@ -0,0 +1,15 @@
+https://bugs.freedesktop.org/show_bug.cgi?id=85372
+http://cgit.freedesktop.org/cairo/commit/?id=2de69581c28bf115852037ca41eba13cb7335976
+--- src/cairo-tor-scan-converter.c.orig
++++ 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;
Modified: trunk/dports/graphics/cairo-devel/Portfile
===================================================================
--- trunk/dports/graphics/cairo-devel/Portfile 2014-11-30 02:03:08 UTC (rev 128924)
+++ trunk/dports/graphics/cairo-devel/Portfile 2014-11-30 05:48:19 UTC (rev 128925)
@@ -11,8 +11,7 @@
name cairo-devel
conflicts cairo
set my_name cairo
-version 1.12.16
-revision 2
+version 1.14.0
categories graphics
maintainers ryandesign
license {LGPL-2.1 MPL-1.1}
@@ -32,8 +31,8 @@
advantage of display hardware acceleration when \
available (e.g. through the X Render Extension).
-checksums rmd160 379283c2f5c9690bdfd69c629b8efd59be7a8670 \
- sha256 2505959eb3f1de3e1841023b61585bfd35684b9733c7b6a3643f4f4cbde6d846
+checksums rmd160 87213a12c9789ff78dfbffbe4555aa28811c12c5 \
+ sha256 2cf5f81432e77ea4359af9dcd0f4faf37d015934501391c311bfd2d19a0134b7
depends_build port:pkgconfig
@@ -50,6 +49,9 @@
# Prevent cairo from using librsvg, libspectre, poppler.
patchfiles-append patch-configure.diff
+# Fix crash.
+patchfiles-append patch-src-cairo-tor-scan-converter.c.diff
+
# https://trac.macports.org/ticket/34137
compiler.blacklist-append {clang < 318.0.61}
@@ -58,15 +60,6 @@
compiler.blacklist-append gcc-4.0
}
-pre-configure {
- set pixman_minimum_version 0.20.2
- set pixman_installed_version [exec ${prefix}/bin/pkg-config pixman-1 --modversion]
- if {[vercmp ${pixman_installed_version} ${pixman_minimum_version}] < 0} {
- ui_error "${name} ${version} requires libpixman ${pixman_minimum_version} or later but you have libpixman ${pixman_installed_version}."
- return -code error "incompatible libpixman version"
- }
-}
-
configure.args --disable-gl \
--disable-quartz \
--disable-quartz-font \
@@ -106,6 +99,11 @@
configure.args-replace --disable-quartz-font --enable-quartz-font
configure.args-replace --disable-quartz-image --enable-quartz-image
}
+
+ default_variants +quartz
+ # Don't allow Quartz support to be disabled. Keep the variant for awhile in
+ # case any dependents are using the active_variants portgroup to check for it.
+ variant_set quartz
}
variant x11 {
@@ -123,10 +121,15 @@
}
default_variants +x11
+if {${os.platform} ne "darwin" || ${os.subplatform} ne "macosx"} {
+ # When not on OS X, don't allow X11 support to be disabled, since it is the
+ # only available option.
+ variant_set x11
+}
test.run yes
test.target check
livecheck.type regex
livecheck.url ${homepage}news/
-livecheck.regex ${my_name}-(\[0-9\]+\\.\[0-9\]*\[13579\]\\.\[0-9\]+)
+livecheck.regex ${my_name}-(\[0-9.\]+)
Modified: trunk/dports/graphics/cairo-devel/files/patch-configure.diff
===================================================================
--- trunk/dports/graphics/cairo-devel/files/patch-configure.diff 2014-11-30 02:03:08 UTC (rev 128924)
+++ trunk/dports/graphics/cairo-devel/files/patch-configure.diff 2014-11-30 05:48:19 UTC (rev 128925)
@@ -1,6 +1,6 @@
---- configure.orig 2013-08-26 12:00:41.000000000 -0500
-+++ configure 2013-10-02 10:25:37.000000000 -0500
-@@ -30488,7 +30488,7 @@
+--- configure.orig 2014-10-13 20:47:29.000000000 -0500
++++ configure 2014-10-14 19:35:14.000000000 -0500
+@@ -30634,7 +30634,7 @@
@@ -9,7 +9,7 @@
test_ps=no
any2ppm_ps=no
if test "x$use_ps" = "xyes"; then
-@@ -30885,7 +30885,7 @@
+@@ -31031,7 +31031,7 @@
# poppler-0.17.4 fixes text-pattern and text-transform
@@ -18,11 +18,11 @@
test_pdf=no
any2ppm_pdf=no
if test "x$use_pdf" = "xyes"; then
-@@ -31255,7 +31255,7 @@
+@@ -31401,7 +31401,7 @@
--LIBRSVG_VERSION_REQUIRED=2.15.0
+-LIBRSVG_VERSION_REQUIRED=2.35.0
+LIBRSVG_VERSION_REQUIRED=99999
test_svg=no
any2ppm_svg=no
Added: trunk/dports/graphics/cairo-devel/files/patch-src-cairo-tor-scan-converter.c.diff
===================================================================
--- trunk/dports/graphics/cairo-devel/files/patch-src-cairo-tor-scan-converter.c.diff (rev 0)
+++ trunk/dports/graphics/cairo-devel/files/patch-src-cairo-tor-scan-converter.c.diff 2014-11-30 05:48:19 UTC (rev 128925)
@@ -0,0 +1,15 @@
+https://bugs.freedesktop.org/show_bug.cgi?id=85372
+http://cgit.freedesktop.org/cairo/commit/?id=2de69581c28bf115852037ca41eba13cb7335976
+--- src/cairo-tor-scan-converter.c.orig
++++ 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;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141129/7a9f9e9c/attachment-0001.html>
More information about the macports-changes
mailing list