[SM-Commit] GIT changes to master grimoire by Eric Sandall (5e0ccd0c378b5be13d38d847493bdbadf35b7356)

Eric Sandall scm at sourcemage.org
Mon Jul 19 03:00:50 EDT 2010


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

 audio-libs/gsm/BUILD       |    6 ++++++
 audio-libs/gsm/HISTORY     |    3 +++
 audio-soft/mangler/DEPENDS |    4 ++++
 audio-soft/mangler/DETAILS |   12 ++++++++++++
 audio-soft/mangler/HISTORY |    3 +++
 audio-soft/mangler/PREPARE |    5 +++++
 6 files changed, 33 insertions(+)

New commits:
commit 5e0ccd0c378b5be13d38d847493bdbadf35b7356
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    mangler: Add SCM (Subversion) option

commit 0c187f7c3060aaffd469625d0b06eec94573da27
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    gsm: Build with '-fPIC -DPIC' in CFLAGS for x86_64/alpha

diff --git a/audio-libs/gsm/BUILD b/audio-libs/gsm/BUILD
index 8f58e6d..18858a7 100755
--- a/audio-libs/gsm/BUILD
+++ b/audio-libs/gsm/BUILD
@@ -1 +1,7 @@
+if [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]] ||
+   [[ "${SMGL_COMPAT_ARCHS[1]}" == "alpha"  ]]
+then
+  sed -i 's:-O2:-fPIC -DPIC &:' $SOURCE_DIRECTORY/Makefile
+fi  &&
+
 make
diff --git a/audio-libs/gsm/HISTORY b/audio-libs/gsm/HISTORY
index 0240e86..6e07875 100644
--- a/audio-libs/gsm/HISTORY
+++ b/audio-libs/gsm/HISTORY
@@ -1,3 +1,6 @@
+2010-07-18 Eric Sandall <sandalle at sourcemage.org>
+	* BUILD: Build with '-fPIC -DPIC' in CFLAGS for x86_64/alpha
+
 2010-07-03 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS, PRE_BUILD, BUILD, INSTALL: Created
 
diff --git a/audio-soft/mangler/DEPENDS b/audio-soft/mangler/DEPENDS
index 001db70..6ceaa8e 100755
--- a/audio-soft/mangler/DEPENDS
+++ b/audio-soft/mangler/DEPENDS
@@ -3,6 +3,10 @@ depends automake &&
 depends gtkmm2 &&
 depends librsvg2 &&
 
+if [[ "$MANGLER_SCM" == "y" ]]; then
+  depends subversion
+fi &&
+
 optional_depends  'alsa-lib'  \
                   '--with-alsa'  \
                   '--without-alsa'  \
diff --git a/audio-soft/mangler/DETAILS b/audio-soft/mangler/DETAILS
index f0ed1dc..6868004 100755
--- a/audio-soft/mangler/DETAILS
+++ b/audio-soft/mangler/DETAILS
@@ -1,9 +1,21 @@
            SPELL=mangler
+if [[ "$MANGLER_SCM" == "y" ]] && [[ ! -z $MANGLER_SCM ]]; then
+  if [[ "$MANGLER_SCM_AUTOUPDATE" == "y" ]]; then
+         VERSION=$(date +%Y%m%d)
+  else
+         VERSION=svn
+  fi
+          SOURCE=$SPELL-svn.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
+   SOURCE_URL[0]=svn_http://svn.mangler.org/mangler/trunk:mangler
+   SOURCE_IGNORE=volatile
+else
          VERSION=1.2.0
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://www.mangler.org/downloads/$SOURCE
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+fi
       LICENSE[0]=GPL
         WEB_SITE=http://www.mangler.org/
          ENTERED=20100703
diff --git a/audio-soft/mangler/HISTORY b/audio-soft/mangler/HISTORY
index 8075ccc..fc91388 100644
--- a/audio-soft/mangler/HISTORY
+++ b/audio-soft/mangler/HISTORY
@@ -1,3 +1,6 @@
+2010-07-18 Eric Sandall <sandalle at sourcemage.org>
+	* PREPARE, DETAILS, DEPENDS: Add SCM (Subversion) option
+
 2010-07-03 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS, CONFIGURE, DEPENDS, PRE_BUILD, BUILD: Created
 	* 00-libxi.patch: Fixes http://www.mangler.org/trac/ticket/194
diff --git a/audio-soft/mangler/PREPARE b/audio-soft/mangler/PREPARE
new file mode 100755
index 0000000..a555f2e
--- /dev/null
+++ b/audio-soft/mangler/PREPARE
@@ -0,0 +1,5 @@
+config_query MANGLER_SCM "Checkout and build latest development code?" n &&
+
+if [[ "$MANGLER_SCM" == "y" ]]; then
+  config_query MANGLER_SCM_AUTOUPDATE "Automatically update on every system update?"  n
+fi



More information about the SM-Commit mailing list