cairo: backported dependency changes from devel-xorg-modular (stage 1)

5 files changed, 48 insertions, 17 deletions

diff --git a/x11-libs/cairo/DEPENDS b/x11-libs/cairo/DEPENDS
index 03bcf55a92..ee2923e7b4 100755
--- a/x11-libs/cairo/DEPENDS
+++ b/x11-libs/cairo/DEPENDS
@@ -8,36 +8,58 @@ 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" &&
+
+  optional_depends libxcb \
+                   "--enable-xcb" \
+                   "--disable-xcb" \
+                   "for Xlib/XCB functions feature"
 fi &&
 
-optional_depends xcb-util \
-                 "--enable-xcb" \
-                 "--disable-xcb" \
-                 "for XCB surface backend feature" &&
+optional_depends udev \
+                 "--enable-drm" \
+                 "--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 &&
 
 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 \
@@ -48,4 +70,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 ba507b1429..ed8da83aea 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -11,6 +11,10 @@
 	* 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
+	* REPAIR^all^{,PRE_{,SUB_DEPENDS}}: needs libxcb, not xcb-util
+
 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..1865291f58 100755
--- a/x11-libs/cairo/PRE_SUB_DEPENDS
+++ b/x11-libs/cairo/PRE_SUB_DEPENDS
@@ -1,7 +1,7 @@
 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" ]];;
diff --git a/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS b/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
index 927b6106ac..1865291f58 100755
--- a/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
+++ b/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
@@ -1,7 +1,7 @@
 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" ]];;
diff --git a/x11-libs/cairo/SUB_DEPENDS b/x11-libs/cairo/SUB_DEPENDS
index 8647655321..05ff4961b3 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;;