summaryrefslogtreecommitdiffstats
path: root/x11-libs/cairo
diff options
context:
space:
mode:
authorVlad Glagolev2011-07-25 02:45:18 +0400
committerVlad Glagolev2011-07-25 02:45:58 +0400
commit4d5ce93d01f4412e4781e55365a5c4bde6df509d (patch)
treea55f903d870b01f18a3bc42aed8ffd688f676460 /x11-libs/cairo
parent19e65c8ed7c6efe6d4058a6d3b6e6e1a6d142332 (diff)
cairo: simplified tee backend selection
(cherry picked from commit fc15c113c795b21bddefd3e50b0dc9879f4ddc73)
Diffstat (limited to 'x11-libs/cairo')
-rwxr-xr-xx11-libs/cairo/BUILD4
-rwxr-xr-xx11-libs/cairo/CONFIGURE4
-rw-r--r--x11-libs/cairo/HISTORY4
-rwxr-xr-xx11-libs/cairo/PRE_SUB_DEPENDS2
-rwxr-xr-xx11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS2
-rwxr-xr-xx11-libs/cairo/SUB_DEPENDS2
6 files changed, 10 insertions, 8 deletions
diff --git a/x11-libs/cairo/BUILD b/x11-libs/cairo/BUILD
index a13cf92eac..bad1ab6082 100755
--- a/x11-libs/cairo/BUILD
+++ b/x11-libs/cairo/BUILD
@@ -1,7 +1,3 @@
OPTS="$CAIRO_OPTS $OPTS" &&
-if [[ "$CAIRO_TEE" == "y" ]]; then
- OPTS="--enable-tee=yes $OPTS"
-fi &&
-
default_build
diff --git a/x11-libs/cairo/CONFIGURE b/x11-libs/cairo/CONFIGURE
index e38123fc99..6d4d95dd60 100755
--- a/x11-libs/cairo/CONFIGURE
+++ b/x11-libs/cairo/CONFIGURE
@@ -1 +1,3 @@
-config_query CAIRO_TEE "Enable cairo's tee surface backend feature?" n
+config_query_option CAIRO_OPTS "Enable cairo's tee surface backend feature?" n \
+ "--enable-tee=yes" \
+ "--enable-tee=no"
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index db1a590ec6..f46c4b62ef 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,7 @@
+2011-07-25 Vlad Glagolev <stealth@sourcemage.org>
+ * BUILD, CONFIGURE, {{REPAIR^all^,}PRE_,}SUB_DEPENDS: simplified tee
+ backend selection
+
2011-06-24 Vlad Glagolev <stealth@sourcemage.org>
* DEPENDS: correctly compare versions
diff --git a/x11-libs/cairo/PRE_SUB_DEPENDS b/x11-libs/cairo/PRE_SUB_DEPENDS
index 1865291f58..fd530b1872 100755
--- a/x11-libs/cairo/PRE_SUB_DEPENDS
+++ b/x11-libs/cairo/PRE_SUB_DEPENDS
@@ -6,7 +6,7 @@ case $THIS_SUB_DEPENDS in
PS) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-ps.h" ]];;
SVG) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-svg.h" ]];;
X) is_depends_enabled $SPELL libx11;;
- TEE) if [[ $CAIRO_TEE != "y" ]]; then return 1; fi;;
+ TEE) if ! list_find "$CAIRO_OPTS" "--enable-tee=yes"; then return 1; fi;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}"
return 1;;
esac
diff --git a/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS b/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
index 1865291f58..fd530b1872 100755
--- a/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
+++ b/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
@@ -6,7 +6,7 @@ case $THIS_SUB_DEPENDS in
PS) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-ps.h" ]];;
SVG) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-svg.h" ]];;
X) is_depends_enabled $SPELL libx11;;
- TEE) if [[ $CAIRO_TEE != "y" ]]; then return 1; fi;;
+ TEE) if ! list_find "$CAIRO_OPTS" "--enable-tee=yes"; then return 1; fi;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}"
return 1;;
esac
diff --git a/x11-libs/cairo/SUB_DEPENDS b/x11-libs/cairo/SUB_DEPENDS
index 05ff4961b3..8fe658ff13 100755
--- a/x11-libs/cairo/SUB_DEPENDS
+++ b/x11-libs/cairo/SUB_DEPENDS
@@ -12,7 +12,7 @@ case $THIS_SUB_DEPENDS in
X) message "Cairo with Xlib support requested, forcing libx11 dependency" &&
depends libx11 "--enable-xlib";;
TEE) message "Cairo with tee backend request, forcing it" &&
- CAIRO_TEE=y ;;
+ CAIRO_OPTS="--enable-tee=yes $CAIRO_OPTS" ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}"
return 1;;
esac