[111805] trunk/dports/graphics
ryandesign at macports.org
ryandesign at macports.org
Wed Oct 2 08:36:46 PDT 2013
Revision: 111805
https://trac.macports.org/changeset/111805
Author: ryandesign at macports.org
Date: 2013-10-02 08:36:45 -0700 (Wed, 02 Oct 2013)
Log Message:
-----------
cairo, cairo-devel: update to 1.12.16
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
Removed Paths:
-------------
trunk/dports/graphics/cairo-devel/files/patch-llvm-gcc-lto.diff
Modified: trunk/dports/graphics/cairo/Portfile
===================================================================
--- trunk/dports/graphics/cairo/Portfile 2013-10-02 15:23:23 UTC (rev 111804)
+++ trunk/dports/graphics/cairo/Portfile 2013-10-02 15:36:45 UTC (rev 111805)
@@ -11,7 +11,7 @@
name cairo
conflicts cairo-devel
set my_name cairo
-version 1.12.14
+version 1.12.16
categories graphics
maintainers ryandesign
license {LGPL-2.1 MPL-1.1}
@@ -30,8 +30,8 @@
advantage of display hardware acceleration when \
available (e.g. through the X Render Extension).
-checksums rmd160 8198930d820f91480b69c8736b5b090b1a2e3100 \
- sha256 96d0d1e3f9b74d2ca3469ff187c5e5f25649b1ad35cf06f4f3a83847dff4ac13
+checksums rmd160 379283c2f5c9690bdfd69c629b8efd59be7a8670 \
+ sha256 2505959eb3f1de3e1841023b61585bfd35684b9733c7b6a3643f4f4cbde6d846
depends_build port:pkgconfig
@@ -41,7 +41,6 @@
port:freetype \
port:libpng \
port:zlib \
- port:lzo2 \
port:expat
minimum_xcodeversions {8 2.4.1}
@@ -87,6 +86,9 @@
# Prevent cairo from using ghostscript.
configure.args-append ac_cv_prog_GS=""
+# Prevent cairo from using lzo2 because its GPL license makes cairo's effective license GPL too.
+configure.args-append ac_cv_lib_lzo2_lzo2a_decompress=no
+
variant opengl requires x11 description {Add OpenGL graphics interface} {
depends_lib-append port:mesa
configure.args-delete --disable-gl
Modified: trunk/dports/graphics/cairo/files/patch-configure.diff
===================================================================
--- trunk/dports/graphics/cairo/files/patch-configure.diff 2013-10-02 15:23:23 UTC (rev 111804)
+++ trunk/dports/graphics/cairo/files/patch-configure.diff 2013-10-02 15:36:45 UTC (rev 111805)
@@ -1,6 +1,6 @@
---- configure.orig 2013-01-31 09:26:02.000000000 -0600
-+++ configure 2013-01-31 14:47:53.000000000 -0600
-@@ -30503,7 +30503,7 @@
+--- configure.orig 2013-08-26 12:00:41.000000000 -0500
++++ configure 2013-10-02 10:25:37.000000000 -0500
+@@ -30488,7 +30488,7 @@
@@ -9,7 +9,7 @@
test_ps=no
any2ppm_ps=no
if test "x$use_ps" = "xyes"; then
-@@ -30900,7 +30900,7 @@
+@@ -30885,7 +30885,7 @@
# poppler-0.17.4 fixes text-pattern and text-transform
@@ -18,7 +18,7 @@
test_pdf=no
any2ppm_pdf=no
if test "x$use_pdf" = "xyes"; then
-@@ -31270,7 +31270,7 @@
+@@ -31255,7 +31255,7 @@
Modified: trunk/dports/graphics/cairo-devel/Portfile
===================================================================
--- trunk/dports/graphics/cairo-devel/Portfile 2013-10-02 15:23:23 UTC (rev 111804)
+++ trunk/dports/graphics/cairo-devel/Portfile 2013-10-02 15:36:45 UTC (rev 111805)
@@ -11,17 +11,18 @@
name cairo-devel
conflicts cairo
set my_name cairo
-version 1.11.4
-revision 1
+version 1.12.16
categories graphics
maintainers ryandesign
license {LGPL-2.1 MPL-1.1}
homepage http://cairographics.org/
master_sites ${homepage}snapshots/
+master_sites ${homepage}releases/
platforms darwin macosx
use_parallel_build yes
dist_subdir ${my_name}
distname ${my_name}-${version}
+use_xz yes
description a vector graphics library with cross-device output support
@@ -30,8 +31,8 @@
advantage of display hardware acceleration when \
available (e.g. through the X Render Extension).
-checksums rmd160 18d4c3eb62727bbff02da36fef6426c485d535a5 \
- sha256 aa78ac12294b34f31cf2462343564996ea9f90de8c9f9da4eb6f9b3d10317e68
+checksums rmd160 379283c2f5c9690bdfd69c629b8efd59be7a8670 \
+ sha256 2505959eb3f1de3e1841023b61585bfd35684b9733c7b6a3643f4f4cbde6d846
depends_build port:pkgconfig
@@ -86,7 +87,10 @@
# Prevent cairo from using ghostscript.
configure.args-append ac_cv_prog_GS=""
-variant opengl requires x11 conflicts no_x11 description {Add OpenGL graphics interface} {
+# Prevent cairo from using lzo2 because its GPL license makes cairo's effective license GPL too.
+configure.args-append ac_cv_lib_lzo2_lzo2a_decompress=no
+
+variant opengl requires x11 description {Add OpenGL graphics interface} {
depends_lib-append port:mesa
configure.args-delete --disable-gl
configure.args-append --enable-gl --enable-glx
@@ -103,13 +107,10 @@
}
}
-if {[string match *llvm-gcc* ${configure.compiler}]} {
- patchfiles-append patch-llvm-gcc-lto.diff
-}
-
-variant no_x11 conflicts opengl x11_xcb x11 description {Legacy compatibility variant} {}
-variant x11 conflicts no_x11 description {Enable X11 support} {
- depends_lib-append port:xrender port:xorg-xcb-util
+variant x11 {
+ depends_lib-append port:xrender \
+ port:xorg-libXext \
+ port:xorg-xcb-util
configure.args-delete --disable-xlib \
--without-x \
--disable-xcb
@@ -123,14 +124,8 @@
--x-lib=${prefix}/lib
}
-variant x11_xcb requires x11 conflicts no_x11 description {Legacy compatibility variant} {}
+default_variants +x11
-if {[variant_isset no_x11]} {
- default_variants -x11
-} else {
- default_variants +x11
-}
-
test.run yes
test.target check
Modified: trunk/dports/graphics/cairo-devel/files/patch-configure.diff
===================================================================
--- trunk/dports/graphics/cairo-devel/files/patch-configure.diff 2013-10-02 15:23:23 UTC (rev 111804)
+++ trunk/dports/graphics/cairo-devel/files/patch-configure.diff 2013-10-02 15:36:45 UTC (rev 111805)
@@ -1,6 +1,6 @@
---- configure.orig 2012-03-23 14:35:31.000000000 -0500
-+++ configure 2012-04-12 06:11:54.000000000 -0500
-@@ -30131,7 +30131,7 @@
+--- configure.orig 2013-08-26 12:00:41.000000000 -0500
++++ configure 2013-10-02 10:25:37.000000000 -0500
+@@ -30488,7 +30488,7 @@
@@ -9,7 +9,7 @@
test_ps=no
any2ppm_ps=no
if test "x$use_ps" = "xyes"; then
-@@ -30528,7 +30528,7 @@
+@@ -30885,7 +30885,7 @@
# poppler-0.17.4 fixes text-pattern and text-transform
@@ -18,7 +18,7 @@
test_pdf=no
any2ppm_pdf=no
if test "x$use_pdf" = "xyes"; then
-@@ -30898,7 +30898,7 @@
+@@ -31255,7 +31255,7 @@
Deleted: trunk/dports/graphics/cairo-devel/files/patch-llvm-gcc-lto.diff
===================================================================
--- trunk/dports/graphics/cairo-devel/files/patch-llvm-gcc-lto.diff 2013-10-02 15:23:23 UTC (rev 111804)
+++ trunk/dports/graphics/cairo-devel/files/patch-llvm-gcc-lto.diff 2013-10-02 15:36:45 UTC (rev 111805)
@@ -1,11 +0,0 @@
---- configure.orig 2012-03-12 04:26:22.000000000 -0500
-+++ configure 2012-03-12 08:44:05.000000000 -0500
-@@ -17945,7 +17945,7 @@
- MAYBE_WARN="$MAYBE_WARN -erroff=E_ENUM_TYPE_MISMATCH_ARG \
- -erroff=E_ENUM_TYPE_MISMATCH_OP"
-
--MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common -flto"
-+MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common"
-
- MAYBE_WARN="$MAYBE_WARN -Wp,-D_FORTIFY_SOURCE=2"
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131002/1984f697/attachment-0001.html>
More information about the macports-changes
mailing list