Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (4cdc2dacd763ec312e029033b0e0673146aa42e9)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Juuso Alasuutari <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (4cdc2dacd763ec312e029033b0e0673146aa42e9)
  • Date: Sun, 1 Jul 2007 14:39:52 -0500

GIT changes to master grimoire by Juuso Alasuutari <iuso AT sourcemage.org>:

audio-drivers/jack/CONFIGURE | 7 +++++--
audio-drivers/jack/DETAILS | 1 +
audio-drivers/jack/HISTORY | 6 ++++++
audio-drivers/jack/PRE_BUILD | 4 +---
audio-drivers/jack/PRE_SUB_DEPENDS | 2 +-
audio-drivers/jack/SUB_DEPENDS | 7 +++++--
6 files changed, 19 insertions(+), 8 deletions(-)

New commits:
commit 4cdc2dacd763ec312e029033b0e0673146aa42e9
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

jack: Changed the time patch option to only apply to the stable version
because the code is already in the SVN branch.

diff --git a/audio-drivers/jack/CONFIGURE b/audio-drivers/jack/CONFIGURE
index ba64ee3..9811f96 100755
--- a/audio-drivers/jack/CONFIGURE
+++ b/audio-drivers/jack/CONFIGURE
@@ -28,8 +28,11 @@ config_query_option JACK_OPTIMIZE
\
"--enable-optimize" \
"--disable-optimize" &&

-config_query JACK_TIME \
- "Apply time patch (required by jackmidi_alsaseq)?" n &&
+if [[ $JACK_VCS != y ]]
+then
+ config_query JACK_TIME \
+ "Apply time patch (required by jackmidi_alsaseq)?" n
+fi &&

local _DEFTMP &&
if [[ $JACK_SHM == "--enable-posix-shm" ]]
diff --git a/audio-drivers/jack/DETAILS b/audio-drivers/jack/DETAILS
index 6a993e2..7aab06c 100755
--- a/audio-drivers/jack/DETAILS
+++ b/audio-drivers/jack/DETAILS
@@ -11,6 +11,7 @@ then
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=svn_http://subversion.jackaudio.org/jack/trunk/jack:jack
SOURCE_IGNORE=volatile
+ FORCE_DOWNLOAD=on
else
VERSION=0.103.0
SOURCE=jack-audio-connection-kit-$VERSION.tar.gz
diff --git a/audio-drivers/jack/HISTORY b/audio-drivers/jack/HISTORY
index 51003b4..ef43953 100644
--- a/audio-drivers/jack/HISTORY
+++ b/audio-drivers/jack/HISTORY
@@ -1,3 +1,9 @@
+2007-07-01 Juuso Alasuutari <iuso AT sourcemage.org>
+ * CONFIGURE, PRE_BUILD, PRE_SUB_DEPENDS, SUB_DEPENDS: Changed
+ the time patch option to only apply to the stable version
+ because the code is already in the SVN branch.
+ * DETAILS: Added FORCE_DOWNLOAD=on for VCS option.
+
2007-04-11 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS, DEPENDS, PRE_BUILD: Added SVN version support.
* PREPARE: Added, query about SVN.
diff --git a/audio-drivers/jack/PRE_BUILD b/audio-drivers/jack/PRE_BUILD
index 6b15833..7522f85 100755
--- a/audio-drivers/jack/PRE_BUILD
+++ b/audio-drivers/jack/PRE_BUILD
@@ -4,9 +4,7 @@ cd "$SOURCE_DIRECTORY" &&
if [[ $JACK_VCS == y ]]
then
./autogen.sh --no-conf
-fi &&
-
-if [[ $JACK_TIME == y ]]
+elif [[ $JACK_TIME == y ]]
then
patch -p1 < "$SCRIPT_DIRECTORY/jack_time.patch"
fi
diff --git a/audio-drivers/jack/PRE_SUB_DEPENDS
b/audio-drivers/jack/PRE_SUB_DEPENDS
index 63ee4b0..6e8ad3c 100755
--- a/audio-drivers/jack/PRE_SUB_DEPENDS
+++ b/audio-drivers/jack/PRE_SUB_DEPENDS
@@ -1,5 +1,5 @@
case $THIS_SUB_DEPENDS in
- TIMEPATCH) [[ $JACK_TIME == y ]] && return 0 ;;
+ TIMEPATCH) [[ $JACK_VCS == y || $JACK_TIME == y ]] && return 0 ;;
VCS) [[ $JACK_VCS == y ]] && return 0 ;;
esac
return 1
diff --git a/audio-drivers/jack/SUB_DEPENDS b/audio-drivers/jack/SUB_DEPENDS
index 184d1ea..75b186f 100755
--- a/audio-drivers/jack/SUB_DEPENDS
+++ b/audio-drivers/jack/SUB_DEPENDS
@@ -1,6 +1,9 @@
case $THIS_SUB_DEPENDS in
- TIMEPATCH) echo "Time patch requested, forcing option JACK_TIME=y." &&
- JACK_TIME=y && persistent_add JACK_TIME
+ TIMEPATCH) if [[ $JACK_VCS != y ]]
+ then
+ echo "Time patch requested, forcing option JACK_TIME=y." &&
+ JACK_TIME=y && persistent_add JACK_TIME
+ fi
;;
VCS) echo "Development version requested, forcing option
JACK_VCS=y." &&
JACK_VCS=y && persistent_add JACK_VCS



  • [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (4cdc2dacd763ec312e029033b0e0673146aa42e9), Juuso Alasuutari, 07/01/2007

Archive powered by MHonArc 2.6.24.

Top of Page