Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (3b88f7808ba26e0ffdc4f6a4930a5ce5f3b58386)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (3b88f7808ba26e0ffdc4f6a4930a5ce5f3b58386)
  • Date: Fri, 23 May 2014 19:38:48 -0500

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

xorg-driver/xf86-video-ati/DEPENDS | 2 +-
xorg-driver/xf86-video-ati/DETAILS | 4 ++--
xorg-driver/xf86-video-ati/HISTORY | 1 +
xorg-driver/xf86-video-ati/PREPARE | 7 ++-----
xorg-driver/xf86-video-ati/PRE_BUILD | 2 +-
5 files changed, 7 insertions(+), 9 deletions(-)

New commits:
commit 3b88f7808ba26e0ffdc4f6a4930a5ce5f3b58386
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

xf86-video-ati: Use prepare_select_branch

diff --git a/xorg-driver/xf86-video-ati/DEPENDS
b/xorg-driver/xf86-video-ati/DEPENDS
index c304006..34ecdf5 100755
--- a/xorg-driver/xf86-video-ati/DEPENDS
+++ b/xorg-driver/xf86-video-ati/DEPENDS
@@ -8,7 +8,7 @@ optional_depends MESALIB \
"--disable-dri" \
"Do you want dri support" &&

-if [[ "$ATI_SCM" = y ]]; then
+if [[ $XF86_VIDEO_ATI_BRANCH == scm ]]; then
depends glamor &&
depends git
fi &&
diff --git a/xorg-driver/xf86-video-ati/DETAILS
b/xorg-driver/xf86-video-ati/DETAILS
index 30dba9f..1c0f81d 100755
--- a/xorg-driver/xf86-video-ati/DETAILS
+++ b/xorg-driver/xf86-video-ati/DETAILS
@@ -1,6 +1,6 @@
SPELL=xf86-video-ati
-if [[ $ATI_SCM == y ]]; then
- if [[ $ATI_AUTO == y ]]; then
+if [[ $XF86_VIDEO_ATI_BRANCH == scm ]]; then
+ if [[ $XF86_VIDEO_ATI_AUTOUPDATE == y ]]; then
VERSION=$(date +%Y%m%d)
FORCE_DOWNLOAD=on
else
diff --git a/xorg-driver/xf86-video-ati/HISTORY
b/xorg-driver/xf86-video-ati/HISTORY
index edd9097..f839851 100644
--- a/xorg-driver/xf86-video-ati/HISTORY
+++ b/xorg-driver/xf86-video-ati/HISTORY
@@ -1,5 +1,6 @@
2014-05-23 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: SCM branch depends on glamor
+ * DEPENDS, DETAILS, PREPARE, PRE_BUILD: Use prepare_select_branch

2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: mesalib => MESALIB
diff --git a/xorg-driver/xf86-video-ati/PREPARE
b/xorg-driver/xf86-video-ati/PREPARE
index 52b01af..ba63470 100755
--- a/xorg-driver/xf86-video-ati/PREPARE
+++ b/xorg-driver/xf86-video-ati/PREPARE
@@ -1,5 +1,2 @@
-config_query ATI_SCM "Do you want SCM version" n &&
-if [[ $ATI_SCM == y ]]; then
- config_query ATI_AUTO \
- "Automaticaly update the spell on sorcery queue/system-update?"
n
-fi
+. "$GRIMOIRE/FUNCTIONS" &&
+prepare_select_branch stable scm
diff --git a/xorg-driver/xf86-video-ati/PRE_BUILD
b/xorg-driver/xf86-video-ati/PRE_BUILD
index aad493a..faba109 100755
--- a/xorg-driver/xf86-video-ati/PRE_BUILD
+++ b/xorg-driver/xf86-video-ati/PRE_BUILD
@@ -1,5 +1,5 @@
default_pre_build &&
-if [[ $ATI_SCM == y ]] ; then
+if [[ $XF86_VIDEO_ATI_BRANCH == scm ]]; then
cd "$SOURCE_DIRECTORY" &&
NOCONFIGURE=1 ./autogen.sh
fi



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (3b88f7808ba26e0ffdc4f6a4930a5ce5f3b58386), Ismael Luceno, 05/23/2014

Archive powered by MHonArc 2.6.24.

Top of Page