summaryrefslogtreecommitdiffstats
path: root/x11-libs/cairo
diff options
context:
space:
mode:
authorVlad Glagolev2011-01-13 06:10:00 +0300
committerVlad Glagolev2011-07-25 02:25:28 +0400
commit19e65c8ed7c6efe6d4058a6d3b6e6e1a6d142332 (patch)
treeb819949e1bd8624368f8bc85fef34c1a0053342f /x11-libs/cairo
parente2fcfec049b64e7f2f2b160c7d3577745ab8ea3c (diff)
cairo: backported dependency changes from devel-xorg-modular (stage 2)
Diffstat (limited to 'x11-libs/cairo')
-rwxr-xr-xx11-libs/cairo/BUILD2
-rwxr-xr-xx11-libs/cairo/DEPENDS28
-rw-r--r--x11-libs/cairo/HISTORY4
3 files changed, 18 insertions, 16 deletions
diff --git a/x11-libs/cairo/BUILD b/x11-libs/cairo/BUILD
index 92da9e9b06..a13cf92eac 100755
--- a/x11-libs/cairo/BUILD
+++ b/x11-libs/cairo/BUILD
@@ -1,3 +1,5 @@
+OPTS="$CAIRO_OPTS $OPTS" &&
+
if [[ "$CAIRO_TEE" == "y" ]]; then
OPTS="--enable-tee=yes $OPTS"
fi &&
diff --git a/x11-libs/cairo/DEPENDS b/x11-libs/cairo/DEPENDS
index ee2923e7b4..aed7b62f72 100755
--- a/x11-libs/cairo/DEPENDS
+++ b/x11-libs/cairo/DEPENDS
@@ -29,10 +29,9 @@ if is_depends_enabled $SPELL libx11; then
"--disable-xlib-xrender" \
"for Xlib Xrender surface backend" &&
- optional_depends libxcb \
- "--enable-xcb" \
- "--disable-xcb" \
- "for Xlib/XCB functions feature"
+ config_query_option CAIRO_OPTS "Enable Xlib/XCB functions feature?" n \
+ "--enable-xlib-xcb" \
+ "--disable-xlib-xcb"
fi &&
optional_depends udev \
@@ -40,17 +39,16 @@ optional_depends udev \
"--disable-drm" \
"for drm support" &&
-if is_depends_enabled udev; then
- optional_depends libxcb \
- "--enable-xcb" \
- "--disable-xcb" \
- "for XCB drm functions feature" &&
-
- optional_depends xorg-server \
- "--enable-drm-xr" \
- "--disable-drm-xr" \
- "for DRM Xr (DDX) functions feature"
-fi &&
+# these options are bogus
+#if is_depends_enabled $SPELL udev; then
+# config_query_option CAIRO_OPTS "Enable XCB drm functions feature?" n \
+# "--enable-xcb-drm" \
+# "--disable-xcb-drm" &&
+# optional_depends xorg-server \
+# "--enable-drm-xr" \
+# "--disable-drm-xr" \
+# "for DRM Xr (DDX) functions feature"
+#fi &&
optional_depends libpng \
"--enable-png --enable-svg" \
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index ed8da83aea..db1a590ec6 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -12,8 +12,10 @@
* REPAIR^all^PRE_SUB_DEPENDS: Updated
2011-01-13 Vlad Glagolev <stealth@sourcemage.org>
- * DEPENDS: glitz is superseded by OpenGL; added missing dependencies
+ * DEPENDS: glitz is superseded by OpenGL; added missing dependencies;
+ use queries for selecting different options
* REPAIR^all^{,PRE_{,SUB_DEPENDS}}: needs libxcb, not xcb-util
+ * BUILD: added, to use CAIRO_OPTS
2011-01-02 George Sherwood <gsherwood@sourcemage.org>
* PRE_SUB_DEPENDS: Fix to work correctly