[77796] trunk/dports/graphics/clutter/Portfile

[devans at macports.org]

Revision: 77796
          http://trac.macports.org/changeset/77796
Author:   devans at macports.org
Date:     2011-04-13 11:11:43 -0700 (Wed, 13 Apr 2011)
Log Message:
-----------
clutter: address some issues from #29092.
    * update dependencies based on current port configuration requirements
    * default configuration remains glx/gdk-pixbuf for compatibility with all
      darwin platforms (not just macosx)
    * add macosx to platforms declaration
    * rename +no_x11 variant to +quartz for clarity but leave +no_x11 as an alias
      for backwards compatibility
    * allow +quartz/+no_x11 variant on macosx platforms only per jmr's comment
    * +quartz variant configuration remains macosx/quartz (experimental)
    * for clarity, explicitly indicate configuration options even when defaults are selected
    * correct typo in --x-libraries configuration option

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

Modified: trunk/dports/graphics/clutter/Portfile
===================================================================
--- trunk/dports/graphics/clutter/Portfile	2011-04-13 18:09:03 UTC (rev 77795)
+++ trunk/dports/graphics/clutter/Portfile	2011-04-13 18:11:43 UTC (rev 77796)
@@ -8,7 +8,7 @@
 set branch          [string range $version 0 [expr [string last "." $version] - 1]]
 categories          graphics
 maintainers         devans openmaintainer
-platforms           darwin
+platforms           darwin macosx
 description         A generic high-level canvas library.
 long_description    Clutter is an open source software library for \
                     creating fast, visually rich and animated graphical \
@@ -23,24 +23,43 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         port:gtk2 \
+depends_lib         port:atk \
+                    port:cairo \
+                    port:pango \
+                    port:gdk-pixbuf2 \
                     port:mesa \
+                    port:xorg-libXdamage \
+                    port:xorg-libXcomposite \
                     port:json-glib
 
 configure.args      --with-flavour=glx \
                     --with-imagebackend=gdk-pixbuf \
+                    --with-x \
                     --x-includes=${prefix}/include \
-                    --x-libraries=${prefix}/include \
+                    --x-libraries=${prefix}/lib \
                     --enable-introspection=no \
                     --disable-gtk-doc
 
-variant no_x11 {
-    depends_lib-delete   port:mesa
-    configure.args-delete --with-flavour=glx \
-                         --with-imagebackend=gdk-pixbuf \
-                         --x-includes=${prefix}/include \
-                         --x-libraries=${prefix}/include
-    configure.args-append --with-flavour=osx
+platform macosx {
+    variant no_x11 requires quartz {
+    }
+
+    variant quartz {
+        depends_lib-delete    port:mesa \
+                              port:gdk-pixbuf2 \
+                              port:xorg-libXdamage \
+                              port:xorg-libXcomposite
+
+        configure.args-delete --with-flavour=glx \
+                              --with-imagebackend=gdk-pixbuf \
+                              --with-x \
+                              --x-includes=${prefix}/include \
+                              --x-libraries=${prefix}/lib
+
+        configure.args-append --with-flavour=osx \
+                              --with-imagebackend=quartz \
+                              --without-x
+    }
 }
 
 livecheck.type      regex
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110413/5411bb49/attachment.html>