[78840] trunk/dports/graphics/cairo/Portfile

[jmr at macports.org]

Revision: 78840
          http://trac.macports.org/changeset/78840
Author:   jmr at macports.org
Date:     2011-05-24 04:00:54 -0700 (Tue, 24 May 2011)
Log Message:
-----------
cairo: always enable xcb when x11 is enabled (#23483)

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

Modified: trunk/dports/graphics/cairo/Portfile
===================================================================
--- trunk/dports/graphics/cairo/Portfile	2011-05-24 10:51:35 UTC (rev 78839)
+++ trunk/dports/graphics/cairo/Portfile	2011-05-24 11:00:54 UTC (rev 78840)
@@ -35,7 +35,6 @@
 
 depends_lib                 path:lib/pkgconfig/pixman-1.pc:libpixman \
                             path:lib/pkgconfig/glib-2.0.pc:glib2 \
-                            port:xrender \
                             port:fontconfig \
                             port:freetype \
                             port:libpng \
@@ -44,7 +43,6 @@
 
 archcheck.files             lib/libpixman-1.dylib \
                             lib/libglib-2.0.dylib \
-                            lib/libXrender.dylib \
                             lib/libfontconfig.dylib \
                             lib/libfreetype.dylib \
                             lib/libpng.dylib \
@@ -66,7 +64,9 @@
                             --disable-quartz \
                             --disable-quartz-font \
                             --disable-quartz-image \
+                            --disable-xlib \
                             --disable-xcb \
+                            --without-x \
                             --enable-ft \
                             --enable-pdf \
                             --enable-png \
@@ -74,14 +74,9 @@
                             --enable-script \
                             --enable-svg \
                             --enable-tee \
-                            --enable-xml \
-                            --enable-xlib \
-                            --enable-xlib-xrender \
-                            --with-x \
-                            --x-include=${prefix}/include \
-                            --x-lib=${prefix}/lib
+                            --enable-xml
 
-variant opengl conflicts no_x11 description {Add OpenGL graphics interface} {
+variant opengl requires x11 conflicts no_x11 description {Add OpenGL graphics interface} {
     depends_lib-append      port:mesa
     archcheck.files-append  lib/libGL.dylib
     configure.args-delete   --disable-gl
@@ -104,24 +99,28 @@
     configure.compiler      gcc-4.2
 }
 
-variant no_x11 conflicts opengl x11_xcb {
-    depends_lib-delete      port:xrender
-    archcheck.files-delete  lib/libXrender.dylib
-    configure.args-delete   --enable-xlib \
+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
+    configure.args-delete   --disable-xlib \
+                            --without-x \
+                            --disable-xcb
+    configure.args-append   --enable-xlib \
                             --enable-xlib-xrender \
-                            --with-x
-    configure.args-append   --disable-xlib \
-                            --disable-xlib-xrender \
-                            --without-x
+                            --enable-xcb \
+                            --enable-xcb-shm \
+                            --enable-xlib-xcb \
+                            --with-x \
+                            --x-include=${prefix}/include \
+                            --x-lib=${prefix}/lib
 }
 
-variant x11_xcb conflicts no_x11 description {Use libxcb for X11 protocol communication} {
-    configure.args-delete   --disable-xcb
-    configure.args-append   --enable-xcb \
-                            --enable-xcb-shm \
-                            --enable-xlib-xcb
-    depends_lib-append      port:xorg-xcb-util
-    archcheck.files-append  lib/libxcb-render-util.dylib
+variant x11_xcb requires x11 conflicts no_x11 description {Legacy compatibility variant} {}
+
+if {[variant_isset no_x11]} {
+    default_variants -x11
+} else {
+    default_variants +x11
 }
 
 test.run                    yes
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110524/8ce84b14/attachment.html>