Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (1868f7c9c533f76ed7d6f63dd2028747da3c49b9)

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 master grimoire by Eric Sandall (1868f7c9c533f76ed7d6f63dd2028747da3c49b9)
  • Date: Wed, 7 Apr 2010 13:31:54 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

dev/null |binary
xorg-driver/xf86-video-ati/DEPENDS | 7 ++++++-
xorg-driver/xf86-video-ati/DETAILS | 2 +-
xorg-driver/xf86-video-ati/HISTORY | 3 ---
xorg-driver/xf86-video-ati/xf86-video-ati-6.13.0.tar.bz2.sig | 0
5 files changed, 7 insertions(+), 5 deletions(-)

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

Revert "xf86-video-ati: Updated to 6.13.0"

This reverts commit 9bf7e4bf1de0daa7dc8ca0b7d4fd2124abe1ba9d.

Requires non-stable mesalib, remove from master. Kept in
devel-xorg-modular.

Conflicts:

xorg-driver/xf86-video-ati/HISTORY

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

Revert "xf86-video-ati: Combine NONSTABLE and DRI sub-depends into one
-sub"

This reverts commit ac06a246db43147c8e652efa67a8c78c29bad9e9.

Requires non-stable mesalib, remove from master. Kept in
devel-xorg-modular.

diff --git a/xorg-driver/xf86-video-ati/DEPENDS
b/xorg-driver/xf86-video-ati/DEPENDS
index a2f6d3a..136be16 100755
--- a/xorg-driver/xf86-video-ati/DEPENDS
+++ b/xorg-driver/xf86-video-ati/DEPENDS
@@ -3,11 +3,16 @@ depends util-macros &&
depends xineramaproto &&
depends xproto &&
depends xorg-server &&
-optional_depends -sub "NONSTABLE DRI" mesalib \
+optional_depends mesalib \
"--enable-dri" \
"--disable-dri" \
"Do you want dri support" &&

if [[ "$ATI_SCM" = y ]]; then
depends git
+fi &&
+
+if is_depends_enabled $SPELL mesalib ; then
+sub_depends mesalib DRI
fi
+
diff --git a/xorg-driver/xf86-video-ati/DETAILS
b/xorg-driver/xf86-video-ati/DETAILS
index 6e15758..56bdd1a 100755
--- a/xorg-driver/xf86-video-ati/DETAILS
+++ b/xorg-driver/xf86-video-ati/DETAILS
@@ -11,7 +11,7 @@ if [[ $ATI_SCM == y ]]; then
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-scm
else
- VERSION=6.13.0
+ VERSION=6.12.7
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/driver/${SOURCE}
diff --git a/xorg-driver/xf86-video-ati/HISTORY
b/xorg-driver/xf86-video-ati/HISTORY
index a8e92c4..36a5a67 100644
--- a/xorg-driver/xf86-video-ati/HISTORY
+++ b/xorg-driver/xf86-video-ati/HISTORY
@@ -1,10 +1,7 @@
2010-04-06 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 6.12.7
SOURCE matches upstream posted SHA1
- * DETAILS: Updated to 6.13.0
- SOURCE matches upstream posted SHA1
* DEPENDS: Depends on non-stable mesalib
- Combine NONSTABLE and DRI sub-depends into one -sub

2010-03-03 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 6.12.192
diff --git a/xorg-driver/xf86-video-ati/xf86-video-ati-6.13.0.tar.bz2.sig
b/xorg-driver/xf86-video-ati/xf86-video-ati-6.13.0.tar.bz2.sig
deleted file mode 100644
index dd1337c..0000000
Binary files a/xorg-driver/xf86-video-ati/xf86-video-ati-6.13.0.tar.bz2.sig
and /dev/null differ



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (1868f7c9c533f76ed7d6f63dd2028747da3c49b9), Eric Sandall, 04/07/2010

Archive powered by MHonArc 2.6.24.

Top of Page