[SM-Commit] GIT changes to master grimoire by George Sherwood (1752f278efa123038831bd69350169b54c71752f)

George Sherwood scm at sourcemage.org
Thu Sep 11 17:20:53 EDT 2008


GIT changes to master grimoire by George Sherwood <gsherwood at sourcemage.org>:

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

New commits:
commit 1752f278efa123038831bd69350169b54c71752f
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    xf86-video-openchrome: Added release version 0.2.903

diff --git a/xorg-driver/xf86-video-openchrome/DEPENDS b/xorg-driver/xf86-video-openchrome/DEPENDS
index b740d59..044ff0d 100755
--- a/xorg-driver/xf86-video-openchrome/DEPENDS
+++ b/xorg-driver/xf86-video-openchrome/DEPENDS
@@ -3,7 +3,9 @@ depends  xproto                                &&
 depends  xorg-server                           &&
 depends  libdrm                                &&
 depends  libxvmc                               &&
-depends  subversion                            &&
+if [[ "$OPENCHROME_SVN" == "y" ]]; then
+depends  subversion
+fi &&
 
 optional_depends  mesalib                      \
                   "--enable-dri"               \
diff --git a/xorg-driver/xf86-video-openchrome/DETAILS b/xorg-driver/xf86-video-openchrome/DETAILS
index 1a52668..9c2a173 100755
--- a/xorg-driver/xf86-video-openchrome/DETAILS
+++ b/xorg-driver/xf86-video-openchrome/DETAILS
@@ -1,4 +1,5 @@
            SPELL=xf86-video-openchrome
+if [[ $OPENCHROME_SVN == y ]];  then
   if  [[  "$OPENCHROME_SVN_AUTOUPDATE"  ==  "y"  ]];  then
          VERSION=$(date +%Y%m%d)
   else
@@ -6,9 +7,16 @@
   fi
           SOURCE=${SPELL}-svn.tar.bz2
     SOURCE_HINTS=old_svn_compat
-   SOURCE_URL[0]=svn://svn.openchrome.org/svn/trunk:$SPELL-svn
+   SOURCE_URL[0]=svn://svn.openchrome.org/svn/trunk:$SPELL
    SOURCE_IGNORE='volatile'
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-svn
+else
+         VERSION=0.2.903
+          SOURCE=${SPELL}-${VERSION}.tar.gz
+   SOURCE_URL[0]=http://www.openchrome.org/releases/${SOURCE}
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
+     SOURCE_HASH=sha512:71c6b281ef0e1931cf211d07ed7ebe2ed71881feca5853832f4a8843afdf3f4638b9f9f5f07db41b03fb2e08e14ec196eac1054c888ccfacceea4c48c7663a72
+fi
         WEB_SITE=http:/openchrome.org/
          ENTERED=20070713
       LICENSE[0]=XCL
diff --git a/xorg-driver/xf86-video-openchrome/HISTORY b/xorg-driver/xf86-video-openchrome/HISTORY
index 8efa6cb..1d7dff0 100644
--- a/xorg-driver/xf86-video-openchrome/HISTORY
+++ b/xorg-driver/xf86-video-openchrome/HISTORY
@@ -1,3 +1,9 @@
+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
+	* PRE_BUILD: Don't run autogen.sh for release
+	* DEPENDS: Only depends subversion for devel version
+
 2008-03-17 Eric Sandall <sandalle at sourcemage.org>
 	* CONFLICTS: Auto-conflicts with xorg as well
 
diff --git a/xorg-driver/xf86-video-openchrome/PREPARE b/xorg-driver/xf86-video-openchrome/PREPARE
index af73a9f..e9658e5 100755
--- a/xorg-driver/xf86-video-openchrome/PREPARE
+++ b/xorg-driver/xf86-video-openchrome/PREPARE
@@ -1,2 +1,6 @@
-config_query  OPENCHROME_SVN_AUTOUPDATE                      \
+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
diff --git a/xorg-driver/xf86-video-openchrome/PRE_BUILD b/xorg-driver/xf86-video-openchrome/PRE_BUILD
index 070d8d5..51c80d7 100755
--- a/xorg-driver/xf86-video-openchrome/PRE_BUILD
+++ b/xorg-driver/xf86-video-openchrome/PRE_BUILD
@@ -1,4 +1,6 @@
 default_pre_build        &&
 cd  ${SOURCE_DIRECTORY}  &&
-autoreconf -v --install  &&
+if [[ "$OPENCHROME_SVN" == "y" ]]; then
+    autoreconf -v --install
+fi
 OPTS="--enable-maintainer-mode ${OPTS}"



More information about the SM-Commit mailing list