Skip to Content.
Sympa Menu

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

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 (682ccaf365a21bacb5b1cac326d673c15a8133ed)
  • Date: Sun, 13 Apr 2008 06:46:38 -0500

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

compiz-fusion/emerald/DEPENDS | 40
++++++++++++++++---------------
compiz-fusion/emerald/HISTORY | 7 ++++-
xorg-app/compiz/DEPENDS | 20 +++++++--------
xorg-app/compiz/HISTORY | 4 +++
xorg-xserver/xorg-server/HISTORY | 5 +++
xorg-xserver/xorg-server/PRE_SUB_DEPENDS | 5 +++
xorg-xserver/xorg-server/SUB_DEPENDS | 5 +++
7 files changed, 55 insertions(+), 31 deletions(-)

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

compiz and emerald depend on xorg-server being built with composite
support (Bug #13360)

diff --git a/compiz-fusion/emerald/DEPENDS b/compiz-fusion/emerald/DEPENDS
index 0a7dffb..8384a7b 100755
--- a/compiz-fusion/emerald/DEPENDS
+++ b/compiz-fusion/emerald/DEPENDS
@@ -1,24 +1,26 @@
if [ "EMERALD_TRUNK" == "y" ]; then
-depends "subversion"
+ depends "subversion"
fi &&
-depends gtk+2 &&
-depends cairo &&
-depends dbus &&
-depends OPENGL &&
-depends libice &&
-depends pango &&
-depends libpng &&
-depends libsm &&
-depends libwnck &&
-depends libxdamage &&
-depends libxcomposite &&
-depends libxfixes &&
-depends libxrandr &&
-depends libxinerama &&
-depends libxrender &&
-depends libdrm &&
-depends compiz &&
-depends startup-notification &&
+
+depends cairo &&
+depends compiz &&
+depends dbus &&
+depends gtk+2 &&
+depends libdrm &&
+depends libice &&
+depends libpng &&
+depends libsm &&
+depends libwnck &&
+depends libxdamage &&
+depends libxcomposite &&
+depends libxfixes &&
+depends libxrandr &&
+depends libxinerama &&
+depends libxrender &&
+depends OPENGL &&
+depends pango &&
+depends startup-notification &&
+depends -sub 'XCOMPOSITE' xorg-server &&

# For the mime database update in FINAL
depends shared-mime-info &&
diff --git a/compiz-fusion/emerald/HISTORY b/compiz-fusion/emerald/HISTORY
index ff10366..2e9bdaa 100644
--- a/compiz-fusion/emerald/HISTORY
+++ b/compiz-fusion/emerald/HISTORY
@@ -1,3 +1,7 @@
+2008-04-13 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on xorg-server built with composite support
+ Bug #13360
+
2008-03-31 Lalo Martins <lalo AT sourcemage.org>
* DETAILS: update to 0.7.2

@@ -9,7 +13,7 @@
* DETAILS: update to 0.2

2007-03-14 Bearcat M. Sandor <sourcemage AT feline-soul.com>
- * DEPENDS: updated 0.1.9999.2
+ * DEPENDS: updated 0.1.9999.2

2007-03-10 Lalo Martins <lalo AT sourcemage.org>
* DEPENDS: making subversion dependency optional
@@ -69,3 +73,4 @@

2006-05-26 Lalo Martins <lalo.martins AT gmail.com>
DEPENDS, DETAILS, HISTORY: created this spell
+
diff --git a/xorg-app/compiz/DEPENDS b/xorg-app/compiz/DEPENDS
index 6787afc..9d3c027 100755
--- a/xorg-app/compiz/DEPENDS
+++ b/xorg-app/compiz/DEPENDS
@@ -1,12 +1,13 @@
-depends startup-notification &&
-depends libpng &&
-depends libxcomposite &&
-depends libxfixes &&
-depends libxdamage &&
-depends libxrandr &&
-depends libxinerama &&
-depends libice &&
-depends libsm &&
+depends startup-notification &&
+depends libpng &&
+depends libxcomposite &&
+depends libxfixes &&
+depends libxdamage &&
+depends libxrandr &&
+depends libxinerama &&
+depends libice &&
+depends libsm &&
+depends -sub 'XCOMPOSITE' xorg-server &&

# XXX: that's hardly all, but those are the ones that
# I reckon people are most likely to *not* want -- Lalo
@@ -20,4 +21,3 @@ optional_depends gtk+2 \
"--enable-gtk" \
"--disable-gtk" \
"Build GTK+ window decorator"
-
diff --git a/xorg-app/compiz/HISTORY b/xorg-app/compiz/HISTORY
index 0a0b911..a049aba 100644
--- a/xorg-app/compiz/HISTORY
+++ b/xorg-app/compiz/HISTORY
@@ -1,3 +1,7 @@
+2008-04-13 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on xorg-server built with composite support
+ Bug #13360
+
2008-03-31 Lalo Martins <lalo AT sourcemage.org>
* DEPENDS: made gtk and kde depends optional

diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index 58977c5..0291f31 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,7 @@
+2008-04-13 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_SUB_DEPENDS, SUB_DEPENDS: Allow forcing composite support
+ Bug #13360
+
2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Auto-conflicts with xorg as well

@@ -199,4 +203,3 @@
2005-11-25 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS, HISTORY: created spell

-
diff --git a/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
b/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..8af592e
--- /dev/null
+++ b/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ XCOMPOSITE) is_depends_enabled $SPELL libxcomposite ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac
diff --git a/xorg-xserver/xorg-server/SUB_DEPENDS
b/xorg-xserver/xorg-server/SUB_DEPENDS
new file mode 100755
index 0000000..ed7a3b0
--- /dev/null
+++ b/xorg-xserver/xorg-server/SUB_DEPENDS
@@ -0,0 +1,5 @@
+case "$THIS_SUB_DEPENDS" in
+ XCOMPOSITE) depends libxcomposite "--enable-composite" ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac



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

Archive powered by MHonArc 2.6.24.

Top of Page