Merge branch 'master' into libpng

7 files changed, 68 insertions, 25 deletions

diff --git a/x11-libs/cairo/BUILD b/x11-libs/cairo/BUILD
index 92da9e9b06..bad1ab6082 100755
--- a/x11-libs/cairo/BUILD
+++ b/x11-libs/cairo/BUILD
@@ -1,5 +1,3 @@
-if [[ "$CAIRO_TEE" == "y" ]]; then
-   OPTS="--enable-tee=yes $OPTS"
-fi &&
+OPTS="$CAIRO_OPTS $OPTS" &&
 
 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/DEPENDS b/x11-libs/cairo/DEPENDS
index ad9278fe75..aed7b62f72 100755
--- a/x11-libs/cairo/DEPENDS
+++ b/x11-libs/cairo/DEPENDS
@@ -1,41 +1,63 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
 depends freetype2 '--enable-ft' &&
 depends fontconfig &&
 depends pixman &&
 
-if spell_ok pixman && [[ $(installed_version pixman) < 0.12 ]]; then
+if spell_ok pixman && is_version_less $(installed_version pixman) 0.18.4; then
   force_depends pixman
 fi &&
 
-optional_depends libx11 \
-                 "--enable-xlib" \
-                 "--disable-xlib" \
-                 "for Xlib surface backend feature" &&
+optional_depends zlib \
+                 "--enable-xml" \
+                 "--disable-xml" \
+                 "for XML surface backend" &&
 
 optional_depends libxcb \
                  "--enable-xcb" \
                  "--disable-xcb" \
-                 "for xcb rendering backend" &&
+                 "for XCB surface backend feature" &&
+
+optional_depends libx11 \
+                   "--enable-xlib" \
+                   "--disable-xlib" \
+                   "for Xlib surface backend feature" &&
 
 if is_depends_enabled $SPELL libx11; then
   optional_depends libxrender \
                    "--enable-xlib-xrender" \
                    "--disable-xlib-xrender" \
-                   "for Xlib Xrender surface backend"
+                   "for Xlib Xrender surface backend" &&
+
+  config_query_option CAIRO_OPTS "Enable Xlib/XCB functions feature?" n \
+                                 "--enable-xlib-xcb" \
+                                 "--disable-xlib-xcb"
 fi &&
 
-optional_depends xcb-util \
-                 "--enable-xcb" \
-                 "--disable-xcb" \
-                 "for XCB surface backend feature" &&
+optional_depends udev \
+                 "--enable-drm" \
+                 "--disable-drm" \
+                 "for drm support" &&
+
+# 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" \
                  "--disable-png --disable-svg" \
                  "for PNG support" &&
 
-optional_depends glitz \
-                 "--enable-glitz" \
-                 "--disable-glitz" \
+optional_depends OPENGL \
+                 "--enable-gl" \
+                 "--disable-gl" \
                  "for OpenGL accelerated graphics" &&
 
 optional_depends directfb \
@@ -46,4 +68,9 @@ optional_depends directfb \
 optional_depends gtk-doc \
                  "--enable-gtk-doc" \
                  "--disable-gtk-doc" \
-                 "Build documentation with gtk-doc"
+                 "Build documentation with gtk-doc" &&
+
+optional_depends valgrind \
+                 "--enable-valgrind" \
+                 "--disable-valgrind" \
+                 "for Valgrind support"
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index 1264be9c20..cc67c14096 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,13 @@
+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
+
+2011-06-20 Vlad Glagolev <stealth@sourcemage.org>
+	* DEPENDS: bumped pixman version requirement
+
 2011-03-22 George Sherwood <gsherwood@sourcemage.org>
 	* CONFIGURE: Added option for tee surface backend feature
 	* BUILD: Added build to add option for TEE
@@ -5,6 +15,12 @@
 	* SUB_DEPENDS: Added sub_depends on TEE
 	* REPAIR^all^PRE_SUB_DEPENDS: Updated
 
+2011-01-13 Vlad Glagolev <stealth@sourcemage.org>
+	* 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
 	* REPAIR^all^PRE_SUB_DEPENDS: Updated to be current with
diff --git a/x11-libs/cairo/PRE_SUB_DEPENDS b/x11-libs/cairo/PRE_SUB_DEPENDS
index 927b6106ac..fd530b1872 100755
--- a/x11-libs/cairo/PRE_SUB_DEPENDS
+++ b/x11-libs/cairo/PRE_SUB_DEPENDS
@@ -1,12 +1,12 @@
 case $THIS_SUB_DEPENDS in
   CAIRO_DEVEL) [[ "$CAIRO_DEVEL" == "y" ]];;
   PDF) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-pdf.h" ]];;
-  XCB) is_depends_enabled $SPELL xcb-util;;
+  XCB) is_depends_enabled $SPELL libxcb;;
   PNG) is_depends_enabled $SPELL libpng;;
    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 927b6106ac..fd530b1872 100755
--- a/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
+++ b/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
@@ -1,12 +1,12 @@
 case $THIS_SUB_DEPENDS in
   CAIRO_DEVEL) [[ "$CAIRO_DEVEL" == "y" ]];;
   PDF) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-pdf.h" ]];;
-  XCB) is_depends_enabled $SPELL xcb-util;;
+  XCB) is_depends_enabled $SPELL libxcb;;
   PNG) is_depends_enabled $SPELL libpng;;
    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 8647655321..8fe658ff13 100755
--- a/x11-libs/cairo/SUB_DEPENDS
+++ b/x11-libs/cairo/SUB_DEPENDS
@@ -3,7 +3,7 @@ case $THIS_SUB_DEPENDS in
        CAIRO_DEVEL="y"                          ;;
   PDF) return 0;;
   XCB) message "Cairo with XCB support requested, forcing xcb-util dependency" &&
-       depends xcb-util "--enable-xcb";;
+       depends libxcb "--enable-xcb";;
   PNG) message "Cairo with PNG support requested, forcing libpng dependency" &&
        depends libpng "--enable-png --enable-svg";;
    PS) return 0;;
@@ -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