[90567] trunk/dports/graphics/libpixman

[ryandesign at macports.org]

Revision: 90567
          http://trac.macports.org/changeset/90567
Author:   ryandesign at macports.org
Date:     2012-03-08 18:56:25 -0800 (Thu, 08 Mar 2012)
Log Message:
-----------
libpixman: add patch to prevent use of libpng to build demos and tests; libpng might not be installed for the right arch (#32260)

Modified Paths:
--------------
    trunk/dports/graphics/libpixman/Portfile

Added Paths:
-----------
    trunk/dports/graphics/libpixman/files/
    trunk/dports/graphics/libpixman/files/0001-configure.ac-Add-an-enable-libpng-option.patch

Modified: trunk/dports/graphics/libpixman/Portfile
===================================================================
--- trunk/dports/graphics/libpixman/Portfile	2012-03-09 02:37:48 UTC (rev 90566)
+++ trunk/dports/graphics/libpixman/Portfile	2012-03-09 02:56:25 UTC (rev 90567)
@@ -28,6 +28,14 @@
 checksums               rmd160  1df92f83b0b944e8a493a8cdf6318ebc6e778914 \
                         sha256  5f4b384aa39e82a582bdc8835e2e81b28176db851dd1f7ff32d682d026a23bb5
 
+
+# remove when updating libpixman to 0.26.x
+patch.pre_args          -p1
+patchfiles-append       0001-configure.ac-Add-an-enable-libpng-option.patch
+use_autoreconf          yes
+# end of stuff to remove
+
+
 # llvm-gcc-4.2 makes cairo fail to generate PDFs properly
 if {${configure.compiler} == "llvm-gcc-4.2"} {
     if {[vercmp $xcodeversion 4.1] >= 0} {
@@ -40,7 +48,8 @@
 configure.args          ac_cv_prog_AWK=/usr/bin/awk \
                         ac_cv_path_GREP=/usr/bin/grep \
                         lt_cv_path_SED=/usr/bin/sed \
-                        --disable-gtk
+                        --disable-gtk \
+                        --disable-libpng
 
 build.args              V=1
 

Added: trunk/dports/graphics/libpixman/files/0001-configure.ac-Add-an-enable-libpng-option.patch
===================================================================
--- trunk/dports/graphics/libpixman/files/0001-configure.ac-Add-an-enable-libpng-option.patch	                        (rev 0)
+++ trunk/dports/graphics/libpixman/files/0001-configure.ac-Add-an-enable-libpng-option.patch	2012-03-09 02:56:25 UTC (rev 90567)
@@ -0,0 +1,35 @@
+From 60b668768618c02312d247028f651b65296ac9a6 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Sat, 11 Feb 2012 01:04:13 -0800
+Subject: [PATCH 1/2] configure.ac: Add an --enable-libpng option
+
+Now there is a way to not link against libpng even if it's available.
+
+Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+---
+ configure.ac |    9 ++++++++-
+ 1 files changed, 8 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2eded70..54c8fb9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -855,7 +855,14 @@ AC_SUBST(TOOLCHAIN_SUPPORTS_ATTRIBUTE_CONSTRUCTOR)
+ dnl ==================
+ dnl libpng
+ 
+-PKG_CHECK_MODULES(PNG, [libpng], have_libpng=yes, have_libpng=no)
++AC_ARG_ENABLE(libpng, AS_HELP_STRING([--enable-libpng], [Build support for libpng (default: auto)]),
++                      [have_libpng=$enableval], [have_libpng=auto])
++
++case x$have_libpng in
++	xyes) PKG_CHECK_MODULES(PNG, [libpng]) ;;
++	xno) ;;
++	*) PKG_CHECK_MODULES(PNG, [libpng], have_libpng=yes, have_libpng=no) ;;
++esac
+ 
+ if test x$have_libpng = xyes; then
+     AC_DEFINE([HAVE_LIBPNG], [1], [Whether we have libpng])
+-- 
+1.7.9
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120308/64291079/attachment-0001.html>