Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (a5a29fd7fc017aceeaee43eb640953c2671fada9)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (a5a29fd7fc017aceeaee43eb640953c2671fada9)
  • Date: Sun, 13 Apr 2008 23:08:41 -0500

GIT changes to devel-xorg-modular grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

xorg-driver/xf86-video-intel/DEPENDS | 2 --
xorg-driver/xf86-video-intel/HISTORY | 3 +++
xorg-lib/libxfont/BUILD | 6 +++++-
xorg-lib/libxfont/HISTORY | 4 ++++
xorg-lib/libxfont/PRE_SUB_DEPENDS | 8 ++++++++
xorg-lib/libxfont/SUB_DEPENDS | 9 +++++++++
xorg-xserver/xorg-server/DEPENDS | 2 +-
xorg-xserver/xorg-server/HISTORY | 1 +
8 files changed, 31 insertions(+), 4 deletions(-)

New commits:
commit a5a29fd7fc017aceeaee43eb640953c2671fada9
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xorg-server requires libxfont built with fontcache support (Bug #13374)

commit 8e3673e9b61c6c4dbee25e67484790bdf389f949
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xf86-video-intel: No more is_depends_enabled.function

diff --git a/xorg-driver/xf86-video-intel/DEPENDS
b/xorg-driver/xf86-video-intel/DEPENDS
index 09c407e..a7ca7ac 100755
--- a/xorg-driver/xf86-video-intel/DEPENDS
+++ b/xorg-driver/xf86-video-intel/DEPENDS
@@ -8,8 +8,6 @@ optional_depends mesalib \
"--disable-dri" \
"Do you want dri support" &&

-. $GRIMOIRE/is_depends_enabled.function
-
if is_depends_enabled $SPELL mesalib ; then
sub_depends mesalib DRI
fi
diff --git a/xorg-driver/xf86-video-intel/HISTORY
b/xorg-driver/xf86-video-intel/HISTORY
index 6e31190..9551698 100644
--- a/xorg-driver/xf86-video-intel/HISTORY
+++ b/xorg-driver/xf86-video-intel/HISTORY
@@ -1,3 +1,6 @@
+2008-04-13 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: No more is_depends_enabled.function
+
2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Auto-conflicts with xorg as well

diff --git a/xorg-lib/libxfont/BUILD b/xorg-lib/libxfont/BUILD
index 2d83a50..c70a3f2 100755
--- a/xorg-lib/libxfont/BUILD
+++ b/xorg-lib/libxfont/BUILD
@@ -1,3 +1,7 @@
-OPTS="$LIBXFONT_OPTS $OPTS" &&
+OPTS="$LIBXFONT_OPTS \
+ $LIBXFONT_OPTS_OVERRIDE \
+ $OPTS" &&
+
+echo "OPTS = $OPTS" >> /tmp/libxfont.opts

default_build
diff --git a/xorg-lib/libxfont/HISTORY b/xorg-lib/libxfont/HISTORY
index 9969290..27eac33 100644
--- a/xorg-lib/libxfont/HISTORY
+++ b/xorg-lib/libxfont/HISTORY
@@ -1,3 +1,7 @@
+2008-04-13 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_SUB_DEPENDS, SUB_DEPENDS: Allow forcing FC
+ * BUILD: Pass our FC override, if wanted
+
2008-03-20 Andraž ruskie Levstik <ruskie AT mages.ath.cx>
* DETAILS: updated spell to 1.3.2
fixed WEB_SITE
diff --git a/xorg-lib/libxfont/PRE_SUB_DEPENDS
b/xorg-lib/libxfont/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..498e08f
--- /dev/null
+++ b/xorg-lib/libxfont/PRE_SUB_DEPENDS
@@ -0,0 +1,8 @@
+echo LIBXFONT_OPTS = $LIBXFONT_OPTS > /tmp/libxfont.opt
+echo THIS_SUB_DEPENDS = $THIS_SUB_DEPENDS >> /tmp/libxfont.opt
+
+case $THIS_SUB_DEPENDS in
+ FC) list_find "$LIBXFONT_OPTS" "--enable-fc" ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac
diff --git a/xorg-lib/libxfont/SUB_DEPENDS b/xorg-lib/libxfont/SUB_DEPENDS
new file mode 100755
index 0000000..5e63996
--- /dev/null
+++ b/xorg-lib/libxfont/SUB_DEPENDS
@@ -0,0 +1,9 @@
+echo LIBXFONT_OPTS_OVERRIDE = $LIBXFONT_OPTS_OVERRIDE >> /tmp/libxfont.opts
+
+persistent_add LIBXFONT_OPTS_OVERRIDE
+
+case "$THIS_SUB_DEPENDS" in
+ FC) list_add LIBXFONT_OPTS_OVERRIDE '--enable-fc' ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac
diff --git a/xorg-xserver/xorg-server/DEPENDS
b/xorg-xserver/xorg-server/DEPENDS
index a86d226..1c439f0 100755
--- a/xorg-xserver/xorg-server/DEPENDS
+++ b/xorg-xserver/xorg-server/DEPENDS
@@ -98,7 +98,7 @@ depends xproto &&
depends xproxymanagementprotocol &&
depends libxaw &&
depends libxkbui &&
-depends libxfont &&
+depends -sub 'FC' libxfont &&
depends xtrans &&
depends libxau &&
depends libxkbfile &&
diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index f448be4..83676ea 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -4,6 +4,7 @@
* CONFIGURE: Remove XWin option, only used for Cygwin anyways
Bug #13476
* DEPENDS: TLS -> Transport Layer Security
+ Depends on libxfont built with fontcache support (Bug #13374)
* BUILD: Disable XWin (Bug #13476)

2008-03-17 Eric Sandall <sandalle AT sourcemage.org>



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (a5a29fd7fc017aceeaee43eb640953c2671fada9), Eric Sandall, 04/14/2008

Archive powered by MHonArc 2.6.24.

Top of Page