Skip to Content.
Sympa Menu

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

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 (4d8cc8163af96db03ea904884bac50e5a30e87b4)
  • Date: Tue, 6 Apr 2010 21:51:49 -0500

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

dev/null |binary
graphics-libs/mesalib/DEPENDS | 6 -----
graphics-libs/mesalib/HISTORY | 5 ++++
graphics-libs/mesalib/PRE_SUB_DEPENDS | 1
graphics-libs/mesalib/REPAIR^all^PRE_SUB_DEPENDS | 5 ++++
graphics-libs/mesalib/SUB_DEPENDS | 12
++++++++++-
xorg-driver/xf86-video-ati/DEPENDS | 8 +------
xorg-driver/xf86-video-ati/DETAILS | 2 -
xorg-driver/xf86-video-ati/HISTORY | 12
+++++++++++
xorg-driver/xf86-video-ati/xf86-video-ati-6.13.0.tar.bz2.sig |binary
xorg-util/util-macros/DETAILS | 2 -
xorg-util/util-macros/HISTORY | 4 +++
xorg-util/util-macros/util-macros-1.6.1.tar.bz2.sig | 0
xorg-util/util-macros/util-macros-1.7.0.tar.bz2.sig |binary
14 files changed, 43 insertions(+), 14 deletions(-)

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

util-macros: Updated to 1.7.0
SOURCE matches upstream posted SHA1

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

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

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

mesalib: Move sub_depends into a -sub

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

xf86-video-ati: Updated to 6.13.0
SOURCE matches upstream posted SHA1
Depends on non-stable mesalib (7.6+)

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

mesalib: Allow requiring non-stable (e.g. for new
xf86-video-ati which needs the new KMS code)

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

xf86-video-ati: Updated to 6.12.192
SOURCE matches upstream posted SHA1

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

xf86-video-ati: Depends on libdrm built with Radeon KMS API

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

xf86-video-ati: Updated to 6.12.191 (6.13 development version)

diff --git a/graphics-libs/mesalib/DEPENDS b/graphics-libs/mesalib/DEPENDS
index a43eb33..6c75262 100755
--- a/graphics-libs/mesalib/DEPENDS
+++ b/graphics-libs/mesalib/DEPENDS
@@ -16,15 +16,11 @@ depends libxau &&
depends libxfixes &&
depends glproto &&

-optional_depends libxcb \
+optional_depends -sub "XCB" libxcb \
'--enable-xcb' \
'--disable-xcb' \
'Enable XCB support?'

-if is_depends_enabled $SPELL libxcb;then
- sub_depends libx11 XCB
-fi &&
-
if spell_ok libdrm && [[ $(installed_version libdrm|sed 's:\.::g') -lt 243
]]; then
force_depends libdrm
fi &&
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index 6ec69c1..add8be9 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,8 @@
+2010-04-06 Eric Sandall <sandalle AT sourcemage.org>
+ * {PRE_,}SUB_DEPENDS: Allow requiring non-stable (e.g. for new
+ xf86-video-ati which needs the new KMS code)
+ * DEPENDS: Move sub_depends into a -sub
+
2010-04-06 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated MESALIB_VER=developement to 7.8.1

diff --git a/graphics-libs/mesalib/PRE_SUB_DEPENDS
b/graphics-libs/mesalib/PRE_SUB_DEPENDS
index bf78a14..5408815 100755
--- a/graphics-libs/mesalib/PRE_SUB_DEPENDS
+++ b/graphics-libs/mesalib/PRE_SUB_DEPENDS
@@ -1,4 +1,5 @@
case $THIS_SUB_DEPENDS in
+ NONSTABLE) [[ "$MESALIB_VER" != "stable" ]] && return 0 ;;
DRI) [[ $MESALIB_BUILD == dri ]] && return 0 ;;
esac
return 1
diff --git a/graphics-libs/mesalib/REPAIR^all^PRE_SUB_DEPENDS
b/graphics-libs/mesalib/REPAIR^all^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..5408815
--- /dev/null
+++ b/graphics-libs/mesalib/REPAIR^all^PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ NONSTABLE) [[ "$MESALIB_VER" != "stable" ]] && return 0 ;;
+ DRI) [[ $MESALIB_BUILD == dri ]] && return 0 ;;
+esac
+return 1
diff --git a/graphics-libs/mesalib/SUB_DEPENDS
b/graphics-libs/mesalib/SUB_DEPENDS
index 14ed565..f2daf38 100755
--- a/graphics-libs/mesalib/SUB_DEPENDS
+++ b/graphics-libs/mesalib/SUB_DEPENDS
@@ -1,4 +1,14 @@
case $THIS_SUB_DEPENDS in
+ NONSTABLE)
+ if [[ "$MESALIB_VER" == "stable" ]]; then
+ MESALIB_VER="feature" &&
+ persistent_add MESALIB_VER &&
+ message "${MESSAGE_COLOR}Non-stable branch of
${SPELL_COLOR}mesalib${DEFAULT_COLOR}" \
+ "${MESSAGE_COLOR}requested, upgrading to
${SPELL_COLOR}feature${DEFAULT_COLOR}" \
+ "${MESSAGE_COLOR}branch."
+ fi
+ ;;
+
DRI)
MESALIB_BUILD=dri &&
persistent_add MESALIB_BUILD &&
@@ -25,5 +35,5 @@ case $THIS_SUB_DEPENDS in
fi
fi ;;

- *) echo "Unknown sub_depends!"; return 1 ;;
+ *) echo "Unknown sub_depends $THIS_SUB_DEPENDS!"; return 1 ;;
esac
diff --git a/xorg-driver/xf86-video-ati/DEPENDS
b/xorg-driver/xf86-video-ati/DEPENDS
index 53e4e1e..a2f6d3a 100755
--- a/xorg-driver/xf86-video-ati/DEPENDS
+++ b/xorg-driver/xf86-video-ati/DEPENDS
@@ -1,17 +1,13 @@
+depends -sub "RADEON" libdrm &&
depends util-macros &&
depends xineramaproto &&
depends xproto &&
depends xorg-server &&
-optional_depends mesalib \
+optional_depends -sub "NONSTABLE DRI" 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 56bdd1a..6e15758 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.12.7
+ VERSION=6.13.0
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 c80e7c6..a8e92c4 100644
--- a/xorg-driver/xf86-video-ati/HISTORY
+++ b/xorg-driver/xf86-video-ati/HISTORY
@@ -1,10 +1,22 @@
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
+ SOURCE matches upstream posted SHA1

2010-03-24 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 6.12.6
+
+2010-03-03 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 6.12.191
SOURCE matches upstream posted SHA1
+ * DEPENDS: Depends on libdrm built with Radeon KMS API

2010-03-02 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 6.12.5
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
new file mode 100644
index 0000000..dd1337c
Binary files /dev/null and
b/xorg-driver/xf86-video-ati/xf86-video-ati-6.13.0.tar.bz2.sig differ
diff --git a/xorg-util/util-macros/DETAILS b/xorg-util/util-macros/DETAILS
index 18a4993..ee801ed 100755
--- a/xorg-util/util-macros/DETAILS
+++ b/xorg-util/util-macros/DETAILS
@@ -1,5 +1,5 @@
SPELL=util-macros
- VERSION=1.6.1
+ VERSION=1.7.0
SOURCE=$SPELL-$VERSION.tar.bz2

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/util/${SOURCE}
#
SOURCE_HASH=sha512:897b6b1dc500bbaec2e3d63779cdc4002bef8a12fe42f2832e03dfe9101f61ef707fcddcb6bb522599b934dd9cf06f2a0966eb6700ad7c211da2c3d043d9f8d7
diff --git a/xorg-util/util-macros/HISTORY b/xorg-util/util-macros/HISTORY
index 7e1e75c..2a565e8 100644
--- a/xorg-util/util-macros/HISTORY
+++ b/xorg-util/util-macros/HISTORY
@@ -1,3 +1,7 @@
+2010-04-06 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.7.0
+ SOURCE matches upstream posted SHA1
+
2010-03-15 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.6.1
* CONFLICTS: removed
diff --git a/xorg-util/util-macros/util-macros-1.6.1.tar.bz2.sig
b/xorg-util/util-macros/util-macros-1.6.1.tar.bz2.sig
deleted file mode 100644
index ab6ba46..0000000
Binary files a/xorg-util/util-macros/util-macros-1.6.1.tar.bz2.sig and
/dev/null differ
diff --git a/xorg-util/util-macros/util-macros-1.7.0.tar.bz2.sig
b/xorg-util/util-macros/util-macros-1.7.0.tar.bz2.sig
new file mode 100644
index 0000000..ff3dbee
Binary files /dev/null and
b/xorg-util/util-macros/util-macros-1.7.0.tar.bz2.sig differ



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (4d8cc8163af96db03ea904884bac50e5a30e87b4), Eric Sandall, 04/06/2010

Archive powered by MHonArc 2.6.24.

Top of Page