sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] PERFORCE change 79827 by Eric Sandall for review

From: Perforce Review Daemon <p4review AT smee.org>
To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Robin Cook" <rcook AT wyrms.net>, "Seth Woolley" <seth AT swoolley.homeip.net>, "vladimir_marek" <vlmarek AT volny.cz>
Subject: [SM-Commit] PERFORCE change 79827 by Eric Sandall for review
Date: Thu, 25 May 2006 23:55:01 +0100 (BST)

Change 79827 by eric_sandall@sandalle-moby on 2006/05/25 23:53:40

* DEPENDS: Depend on libxinerama if building DRI in
XORG_SERVER_OPTS,
otherwise this is optional.

Affected files ...

... //sgl/grimoires/xorg-modular/xorg-xserver/xorg-server/DEPENDS#11 edit
... //sgl/grimoires/xorg-modular/xorg-xserver/xorg-server/HISTORY#25 edit

Differences ...

==== //sgl/grimoires/xorg-modular/xorg-xserver/xorg-server/DEPENDS#11 (xtext)
====

@@ -1,3 +1,15 @@
+#
+# Check this every release as X.org likes to change things on us...
+#
+if list_find "$XORG_SERVER_OPTS" "--enable-dri"; then
+ depends libxinerama '--enable-xinerama'
+else
+ optional_depends libxinerama \
+ "--enable-xinerama" \
+ "--disable-xinerama" \
+ "Build Xinerama extension"
+fi &&
+
optional_depends libxevie \
"--enable-xevie" \
"--disable-xevie" \
@@ -22,10 +34,6 @@
"--enable-dga" \
"--disable-dga" \
"Build DGA extension" &&
-optional_depends libxinerama \
- "--enable-xinerama" \
- "--disable-xinerama" \
- "Build Xinerama extension" &&
optional_depends libxp \
"--enable-xprint" \
"--disable-xprint" \

==== //sgl/grimoires/xorg-modular/xorg-xserver/xorg-server/HISTORY#25 (text)
====

@@ -1,3 +1,7 @@
+2006-06-25 Eric Sandall <eric AT sandall.us>
+ * DEPENDS: Depend on libxinerama if building DRI in XORG_SERVER_OPTS,
+ otherwise this is optional.
+
2006-05-23 AndraÅ¾ "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: xorg 7.1 update
* PRE_BUILD: two patches less to apply

[SM-Commit] PERFORCE change 79827 by Eric Sandall for review, Perforce Review Daemon, 05/25/2006