Skip to Content.
Sympa Menu

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

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 (b552f539f8a2b25507735bf7af9587f2043a36cc)
  • Date: Sun, 2 Aug 2009 13:19:11 -0500

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

xorg-driver/xf86-video-ati/DEPENDS | 2 +-
xorg-driver/xf86-video-ati/HISTORY | 3 ---
xorg-driver/xf86-video-nv/DEPENDS | 2 +-
xorg-driver/xf86-video-nv/HISTORY | 3 ---
xorg-xserver/xorg-server/HISTORY | 4 ----
xorg-xserver/xorg-server/PRE_SUB_DEPENDS | 1 -
xorg-xserver/xorg-server/SUB_DEPENDS | 1 -
7 files changed, 2 insertions(+), 14 deletions(-)

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

Revert "xorg-server: Allow forcing libxf86config (Bug #15299)"

This reverts commit 04437dd55fc3c190a812ba682bd5f35341e93541.

This was fixed in xorg-server 1.6.3 RC release a.k.a. 1.6.2.901,
See http://lists.freedesktop.org/archives/xorg-devel/2009-July/001338.html

Conflicts:

xorg-xserver/xorg-server/HISTORY

commit 3ad4d71a1488215207461765131cda7689c967c7
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert "xf86-video-nv: Requires libxf86config in xorg-server (Bug #15299)"

This reverts commit b2c56880b22d5e26759a5a48f35401dece98c99d.

This was fixed in xorg-server 1.6.3 RC release a.k.a. 1.6.2.901,
See http://lists.freedesktop.org/archives/xorg-devel/2009-July/001338.html

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

Revert "xf86-video-ati: Requires libxf86config in xorg-server (Bug
#15299)"

This reverts commit 2d85eadadd71e156c2f6a97ce6b5cfd4d8ddbe77.

This was fixed in xorg-server 1.6.3 RC release a.k.a. 1.6.2.901,
See http://lists.freedesktop.org/archives/xorg-devel/2009-July/001338.html

diff --git a/xorg-driver/xf86-video-ati/DEPENDS
b/xorg-driver/xf86-video-ati/DEPENDS
index 919d342..b644994 100755
--- a/xorg-driver/xf86-video-ati/DEPENDS
+++ b/xorg-driver/xf86-video-ati/DEPENDS
@@ -1,6 +1,6 @@
depends util-macros &&
depends xproto &&
-depends -sub "XF86CONFIG" xorg-server &&
+depends xorg-server &&
optional_depends mesalib \
"--enable-dri" \
"--disable-dri" \
diff --git a/xorg-driver/xf86-video-ati/HISTORY
b/xorg-driver/xf86-video-ati/HISTORY
index dbec205..31b54a5 100644
--- a/xorg-driver/xf86-video-ati/HISTORY
+++ b/xorg-driver/xf86-video-ati/HISTORY
@@ -1,6 +1,3 @@
-2009-07-20 Eric Sandall <sandalle AT sourcemage.org>
- * DEPENDS: Depends on libxf86config in xorg-server (Bug #15299)
-
2009-04-19 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* DETAILS: improve the overall SCM version

diff --git a/xorg-driver/xf86-video-nv/DEPENDS
b/xorg-driver/xf86-video-nv/DEPENDS
index d3a2067..3decf7f 100755
--- a/xorg-driver/xf86-video-nv/DEPENDS
+++ b/xorg-driver/xf86-video-nv/DEPENDS
@@ -1,3 +1,3 @@
depends util-macros &&
depends xproto &&
-depends -sub "XF86CONFIG" xorg-server
+depends xorg-server
diff --git a/xorg-driver/xf86-video-nv/HISTORY
b/xorg-driver/xf86-video-nv/HISTORY
index fc55390..0477a32 100644
--- a/xorg-driver/xf86-video-nv/HISTORY
+++ b/xorg-driver/xf86-video-nv/HISTORY
@@ -1,6 +1,3 @@
-2009-07-20 Eric Sandall <sandalle AT sourcemage.org>
- * DEPENDS: Depends on libxf86config in xorg-server (Bug #15299)
-
2009-07-02 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 2.1.14
SOURCE matches upstream posted MD5
diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index dd0761e..bde1de2 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -2,10 +2,6 @@
* DETAILS: Updated to 1.6.3
SOURCE matches upstream posted MD5

-2009-07-20 Eric Sandall <sandalle AT sourcemage.org>
- * PRE_SUB_DEPENDS, SUB_DEPENDS: Allow forcing libxf86config if
- required (Bug #15299)
-
2009-07-09 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* DETAILS: updated spell to 1.6.2
* BUILD: updated
diff --git a/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
b/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
index 9d29ca3..5de1740 100755
--- a/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
+++ b/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
@@ -1,5 +1,4 @@
case $THIS_SUB_DEPENDS in
- XF86CONFIG) list_find XORG_SERVER_OPTS "--enable-install-libxf86config" ;;
XCOMPOSITE) is_depends_enabled $SPELL libxcomposite ;;
DPMS) list_find XORG_SERVER_OPTS "--enable-dpms" ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
diff --git a/xorg-xserver/xorg-server/SUB_DEPENDS
b/xorg-xserver/xorg-server/SUB_DEPENDS
index c27c0c4..8125f11 100755
--- a/xorg-xserver/xorg-server/SUB_DEPENDS
+++ b/xorg-xserver/xorg-server/SUB_DEPENDS
@@ -1,5 +1,4 @@
case "$THIS_SUB_DEPENDS" in
- XF86CONFIG) list_add XORG_SERVER_OPTS "--enable-install-libxf86config" ;;
XCOMPOSITE) depends libxcomposite "--enable-composite" ;;
DPMS) list_add XORG_SERVER_OPTS "--enable-dpms" ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (b552f539f8a2b25507735bf7af9587f2043a36cc), Eric Sandall, 08/02/2009

Archive powered by MHonArc 2.6.24.

Top of Page