Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (bcc1a7500cd453f3593301b3fb1ef1dd1ff0d517)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (bcc1a7500cd453f3593301b3fb1ef1dd1ff0d517)
  • Date: Wed, 12 Jan 2011 21:10:09 -0600

GIT changes to devel-xorg-modular grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:

x11-libs/cairo/BUILD | 3 +++
x11-libs/cairo/DEPENDS | 28 +++++++++++++---------------
x11-libs/cairo/HISTORY | 4 +++-
3 files changed, 19 insertions(+), 16 deletions(-)

New commits:
commit bcc1a7500cd453f3593301b3fb1ef1dd1ff0d517
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

cairo: nicely select configure options

diff --git a/x11-libs/cairo/BUILD b/x11-libs/cairo/BUILD
new file mode 100755
index 0000000..bad1ab6
--- /dev/null
+++ b/x11-libs/cairo/BUILD
@@ -0,0 +1,3 @@
+OPTS="$CAIRO_OPTS $OPTS" &&
+
+default_build
diff --git a/x11-libs/cairo/DEPENDS b/x11-libs/cairo/DEPENDS
index d80296a..9ca85ed 100755
--- a/x11-libs/cairo/DEPENDS
+++ b/x11-libs/cairo/DEPENDS
@@ -27,10 +27,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 \
@@ -38,17 +37,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 4c3bdfd..3dad579 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,6 +1,8 @@
2011-01-13 Vlad Glagolev <stealth AT 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 AT sourcemage.org>
* PRE_SUB_DEPENDS: Fix to work correctly



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (bcc1a7500cd453f3593301b3fb1ef1dd1ff0d517), Vlad Glagolev, 01/12/2011

Archive powered by MHonArc 2.6.24.

Top of Page