Skip to Content.
Sympa Menu

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

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 (21b494cdcb5139037638bc02ba1b0a0eea56afc8)
  • Date: Mon, 19 Sep 2011 20:55:13 -0500

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

xorg-driver/xf86-video-openchrome/DEPENDS | 2 +-
xorg-driver/xf86-video-openchrome/DETAILS | 4 ++--
xorg-driver/xf86-video-openchrome/HISTORY | 3 +++
xorg-driver/xf86-video-openchrome/PREPARE | 8 ++------
xorg-driver/xf86-video-openchrome/PRE_BUILD | 2 +-
5 files changed, 9 insertions(+), 10 deletions(-)

New commits:
commit 21b494cdcb5139037638bc02ba1b0a0eea56afc8
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

xf86-video-openchrome: Use prepare_select_branch

diff --git a/xorg-driver/xf86-video-openchrome/DEPENDS
b/xorg-driver/xf86-video-openchrome/DEPENDS
index 044ff0d..92d51e4 100755
--- a/xorg-driver/xf86-video-openchrome/DEPENDS
+++ b/xorg-driver/xf86-video-openchrome/DEPENDS
@@ -3,7 +3,7 @@ depends xproto &&
depends xorg-server &&
depends libdrm &&
depends libxvmc &&
-if [[ "$OPENCHROME_SVN" == "y" ]]; then
+if [[ "$XF86_VIDEO_OPENCHROME_BRANCH" == "scm" ]]; then
depends subversion
fi &&

diff --git a/xorg-driver/xf86-video-openchrome/DETAILS
b/xorg-driver/xf86-video-openchrome/DETAILS
index 9c2a173..8f79272 100755
--- a/xorg-driver/xf86-video-openchrome/DETAILS
+++ b/xorg-driver/xf86-video-openchrome/DETAILS
@@ -1,6 +1,6 @@
SPELL=xf86-video-openchrome
-if [[ $OPENCHROME_SVN == y ]]; then
- if [[ "$OPENCHROME_SVN_AUTOUPDATE" == "y" ]]; then
+if [[ $XF86_VIDEO_OPENCHROME_BRANCH == scm ]]; then
+ if [[ "$XF86_VIDEO_OPENCHROME_AUTOUPDATE" == "y" ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=svn
diff --git a/xorg-driver/xf86-video-openchrome/HISTORY
b/xorg-driver/xf86-video-openchrome/HISTORY
index 1d7dff0..92492cf 100644
--- a/xorg-driver/xf86-video-openchrome/HISTORY
+++ b/xorg-driver/xf86-video-openchrome/HISTORY
@@ -1,3 +1,6 @@
+2011-09-19 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS, PREPARE, PRE_BUILD: Use prepare_select_branch
+
2008-09-11 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Added release version 0.2.903. Updated svn $SOURCE_URL
* PREPARE: Added query for devel version
diff --git a/xorg-driver/xf86-video-openchrome/PREPARE
b/xorg-driver/xf86-video-openchrome/PREPARE
index e9658e5..98d27e4 100755
--- a/xorg-driver/xf86-video-openchrome/PREPARE
+++ b/xorg-driver/xf86-video-openchrome/PREPARE
@@ -1,6 +1,2 @@
-config_query OPENCHROME_SVN \
- "Use the development (svn) version?" n &&
-if [[ "$OPENCHROME_SVN" == "y" ]]; then
- config_query OPENCHROME_SVN_AUTOUPDATE \
- "Queue for update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/xorg-driver/xf86-video-openchrome/PRE_BUILD
b/xorg-driver/xf86-video-openchrome/PRE_BUILD
index 51c80d7..9281853 100755
--- a/xorg-driver/xf86-video-openchrome/PRE_BUILD
+++ b/xorg-driver/xf86-video-openchrome/PRE_BUILD
@@ -1,6 +1,6 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-if [[ "$OPENCHROME_SVN" == "y" ]]; then
+if [[ "$XF86_VIDEO_OPENCHROME_BRANCH" == "scm" ]]; then
autoreconf -v --install
fi
OPTS="--enable-maintainer-mode ${OPTS}"



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (21b494cdcb5139037638bc02ba1b0a0eea56afc8), Ismael Luceno, 09/19/2011

Archive powered by MHonArc 2.6.24.

Top of Page