Skip to Content.
Sympa Menu

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

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 (f22fe44b68e96981d514d8b4c38be09009376a10)
  • Date: Wed, 12 Jan 2011 20:32:50 -0600

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

gnome2-libs/pango/DEPENDS | 12 +-----
gnome2-libs/pango/HISTORY | 3 +
gnome2-libs/pango/SUB_DEPENDS | 2 -
x11-libs/cairo/DEPENDS | 55
++++++++++++++++++++++--------
x11-libs/cairo/HISTORY | 4 ++
x11-libs/cairo/PRE_SUB_DEPENDS | 2 -
x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS | 2 -
x11-libs/cairo/SUB_DEPENDS | 2 -
8 files changed, 54 insertions(+), 28 deletions(-)

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

cairo: added missing dependencies

commit d173f039fbf42a540763be62c45830cab93e6929
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

pango: fixed X flags

diff --git a/gnome2-libs/pango/DEPENDS b/gnome2-libs/pango/DEPENDS
index 60b66b5..1988406 100755
--- a/gnome2-libs/pango/DEPENDS
+++ b/gnome2-libs/pango/DEPENDS
@@ -4,8 +4,8 @@ depends fontconfig &&
depends glib2 &&

optional_depends libx11 \
- "--with-x11" \
- "--without-x11" \
+ "--with-x" \
+ "--without-x" \
"for XFT and X11 support" &&

if is_depends_enabled $SPELL libx11; then
@@ -27,11 +27,3 @@ optional_depends gobject-introspection \
"--enable-introspection=yes" \
"--enable-introspection=no" \
"to enable introspection"
-
-#
-# For DirectFB support with gtk+-directfb
-#
-#optional_depends xorg-libs \
-# "--with-x" \
-# "--without-x" \
-# "for X library support"
diff --git a/gnome2-libs/pango/HISTORY b/gnome2-libs/pango/HISTORY
index d8310c7..ba5efba 100644
--- a/gnome2-libs/pango/HISTORY
+++ b/gnome2-libs/pango/HISTORY
@@ -1,3 +1,6 @@
+2011-01-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * {PRE_,}DEPENDS: corrected X11 flags
+
2010-09-30 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 1.28.3

diff --git a/gnome2-libs/pango/SUB_DEPENDS b/gnome2-libs/pango/SUB_DEPENDS
index 058ca27..d14bfb6 100755
--- a/gnome2-libs/pango/SUB_DEPENDS
+++ b/gnome2-libs/pango/SUB_DEPENDS
@@ -1,6 +1,6 @@
case $THIS_SUB_DEPENDS in
X) message "Pango with X11 support requested, forcing libx11 dependency" &&
- depends libx11 "--with-x11" &&
+ depends libx11 "--with-x" &&
depends libxau &&
depends libxft &&
depends libxdmcp &&
diff --git a/x11-libs/cairo/DEPENDS b/x11-libs/cairo/DEPENDS
index ad9278f..d80296a 100755
--- a/x11-libs/cairo/DEPENDS
+++ b/x11-libs/cairo/DEPENDS
@@ -6,36 +6,58 @@ if spell_ok pixman && [[ $(installed_version pixman) < 0.12
]]; 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 \
@@ -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 a123e66..4c3bdfd 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,7 @@
+2011-01-13 Vlad Glagolev <stealth AT 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 AT 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 b0ffc2e..ee5d6fc 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 b0ffc2e..ee5d6fc 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 c592450..eaee0b8 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;;



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

Archive powered by MHonArc 2.6.24.

Top of Page