Skip to Content.
Sympa Menu

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

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 (7007ced1f14b5e9da0058e412bf15e276fa00e99)
  • Date: Wed, 11 Apr 2007 08:58:59 -0500

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

audio-drivers/jack-cvs/BUILD | 3 +--
audio-drivers/jack-cvs/CONFLICTS | 2 --
audio-drivers/jack-cvs/DEPENDS | 6 +++---
audio-drivers/jack-cvs/DETAILS | 6 +-----
audio-drivers/jack-cvs/HISTORY | 3 +++
audio-drivers/jack-cvs/INSTALL | 1 +
audio-drivers/jack-cvs/PRE_BUILD | 4 +---
audio-drivers/jack-cvs/TRIGGERS | 1 +
audio-drivers/jack/CONFLICTS | 2 +-
audio-drivers/jack/DEPENDS | 8 ++++++++
audio-drivers/jack/DETAILS | 14 ++++++++++++++
audio-drivers/jack/HISTORY | 6 ++++++
audio-drivers/jack/PREPARE | 7 +++++++
audio-drivers/jack/PRE_BUILD | 5 +++++
audio-drivers/jack/PRE_SUB_DEPENDS | 1 +
audio-drivers/jack/SUB_DEPENDS | 3 +++
16 files changed, 56 insertions(+), 16 deletions(-)

New commits:
commit 7007ced1f14b5e9da0058e412bf15e276fa00e99
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

jack-cvs: removed CONFLICTS

commit d0804ab6de13812a8e041a02f1d0e51a7d78cf28
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

jack-cvs: deprecated, main jack spell now has SVN option

commit 3e48e49257214b6b7f3033972a8eb6eedfbfff8b
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

jack: duh, forgot depends subversion from VCS option

commit 63e7a7c04d69f96974d34dd4f88e967fa8bc8721
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

jack: conflicts jack-cvs y

commit 34963ef4127f86a21632b28886a4b218934328f4
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

jack: added sub-dependency for devel version

commit 155fc579b87d029fe7344005284b5b6dc1cf2e02
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

jack: added SVN support (merging devel version feature from broken
jack-cvs)

diff --git a/audio-drivers/jack-cvs/BUILD b/audio-drivers/jack-cvs/BUILD
index f99fbc5..27ba77d 100755
--- a/audio-drivers/jack-cvs/BUILD
+++ b/audio-drivers/jack-cvs/BUILD
@@ -1,2 +1 @@
-OPTS="$OPTS --disable-portaudio" &&
-default_build
+true
diff --git a/audio-drivers/jack-cvs/CONFLICTS
b/audio-drivers/jack-cvs/CONFLICTS
deleted file mode 100755
index 8ea0aaf..0000000
--- a/audio-drivers/jack-cvs/CONFLICTS
+++ /dev/null
@@ -1,2 +0,0 @@
-conflicts jack &&
-conflicts jackdmp
diff --git a/audio-drivers/jack-cvs/DEPENDS b/audio-drivers/jack-cvs/DEPENDS
index cc6601a..e50d74e 100755
--- a/audio-drivers/jack-cvs/DEPENDS
+++ b/audio-drivers/jack-cvs/DEPENDS
@@ -1,3 +1,3 @@
-depends cvs &&
-depends alsa-lib &&
-depends libtool
+depends jack &&
+
+sub_depends jack VCS
diff --git a/audio-drivers/jack-cvs/DETAILS b/audio-drivers/jack-cvs/DETAILS
index 3748dc3..436d075 100755
--- a/audio-drivers/jack-cvs/DETAILS
+++ b/audio-drivers/jack-cvs/DETAILS
@@ -1,13 +1,9 @@
SPELL=jack-cvs
VERSION=head
- SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-
SOURCE_URL[0]=cvs://:pserver:anonymous AT cvs.jackit.sourceforge.net:/cvsroot/jackit:jack
WEB_SITE=http://jackit.sf.net
ENTERED=20031207
- SOURCE_IGNORE=volatile
+ PATCHLEVEL=1
LICENSE[0]=GPL
- FORCE_DOWNLOAD=on
KEYWORDS="jack drivers audio"
SHORT="Jack is a low latency audio server."
cat << EOF
diff --git a/audio-drivers/jack-cvs/HISTORY b/audio-drivers/jack-cvs/HISTORY
index 66e4f72..01d7593 100644
--- a/audio-drivers/jack-cvs/HISTORY
+++ b/audio-drivers/jack-cvs/HISTORY
@@ -1,3 +1,6 @@
+2007-04-11 Juuso Alasuutari <iuso AT sourcemage.org>
+ * Deprecated, SVN support now in main jack spell.
+
2007-03-19 Juuso Alasuutari <iuso AT sourcemage.org>
* CONFLICTS: Added conflicts jackdmp.

diff --git a/audio-drivers/jack-cvs/INSTALL b/audio-drivers/jack-cvs/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/audio-drivers/jack-cvs/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/audio-drivers/jack-cvs/PRE_BUILD
b/audio-drivers/jack-cvs/PRE_BUILD
index 2a4e7d0..27ba77d 100755
--- a/audio-drivers/jack-cvs/PRE_BUILD
+++ b/audio-drivers/jack-cvs/PRE_BUILD
@@ -1,3 +1 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-NOCONFIGURE=Y ./autogen.sh
+true
diff --git a/audio-drivers/jack-cvs/TRIGGERS b/audio-drivers/jack-cvs/TRIGGERS
new file mode 100755
index 0000000..ca8bbb1
--- /dev/null
+++ b/audio-drivers/jack-cvs/TRIGGERS
@@ -0,0 +1 @@
+on_cast jack-cvs dispel_self
diff --git a/audio-drivers/jack/CONFLICTS b/audio-drivers/jack/CONFLICTS
index f4ef0e9..1ba2cfc 100755
--- a/audio-drivers/jack/CONFLICTS
+++ b/audio-drivers/jack/CONFLICTS
@@ -1,2 +1,2 @@
-conflicts jack-cvs &&
+conflicts jack-cvs y &&
conflicts jackdmp
diff --git a/audio-drivers/jack/DEPENDS b/audio-drivers/jack/DEPENDS
index c4de145..70a8cc3 100755
--- a/audio-drivers/jack/DEPENDS
+++ b/audio-drivers/jack/DEPENDS
@@ -1,3 +1,11 @@
+if [[ $JACK_VCS == y ]]
+then
+ depends subversion &&
+ depends libtool &&
+ depends autoconf &&
+ depends automake
+fi &&
+
optional_depends alsa-lib \
"--enable-alsa" \
"--disable-alsa" \
diff --git a/audio-drivers/jack/DETAILS b/audio-drivers/jack/DETAILS
index e092e6d..6a993e2 100755
--- a/audio-drivers/jack/DETAILS
+++ b/audio-drivers/jack/DETAILS
@@ -1,9 +1,23 @@
SPELL=jack
+if [[ $JACK_VCS == y ]]
+then
+ if [[ $JACK_VCS_AUTOUPDATE == y ]]
+ then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=svn
+ fi
+ SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ SOURCE_URL[0]=svn_http://subversion.jackaudio.org/jack/trunk/jack:jack
+ SOURCE_IGNORE=volatile
+else
VERSION=0.103.0
SOURCE=jack-audio-connection-kit-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/jack-audio-connection-kit-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/jackit/$SOURCE

SOURCE_HASH=sha512:8b84bae1bbc1656b3dd962a70d54238bb07d9d2aa3ddf6eb071ba59195fc1c69dcdca99c7cd4e7e97fb7a2942ac5eefc476fa2a2a2c764e2aed9d854d3b5444a
+fi
WEB_SITE=http://jackaudio.org/
ENTERED=20030921
LICENSE[0]=GPL
diff --git a/audio-drivers/jack/HISTORY b/audio-drivers/jack/HISTORY
index 2894ab3..469bcb0 100644
--- a/audio-drivers/jack/HISTORY
+++ b/audio-drivers/jack/HISTORY
@@ -1,3 +1,9 @@
+2007-04-11 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS, DEPENDS, PRE_BUILD: Added SVN version support.
+ * PREPARE: Added, query about SVN.
+ * PRE_SUB_DEPENDS, SUB_DEPENDS: Added sub-dependency VCS for
+ devel version.
+
2007-03-25 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: Updated to 0.103.0.
* CONFIGURE: Added query for time patch, made temp dir default to
diff --git a/audio-drivers/jack/PREPARE b/audio-drivers/jack/PREPARE
new file mode 100755
index 0000000..e272094
--- /dev/null
+++ b/audio-drivers/jack/PREPARE
@@ -0,0 +1,7 @@
+config_query JACK_VCS "Build latest version from development tree?" n &&
+
+if [[ $JACK_VCS == y ]]
+then
+ config_query JACK_VCS_AUTOUPDATE \
+ "Automatically update on every system update?" n
+fi
diff --git a/audio-drivers/jack/PRE_BUILD b/audio-drivers/jack/PRE_BUILD
index 42bda22..6b15833 100755
--- a/audio-drivers/jack/PRE_BUILD
+++ b/audio-drivers/jack/PRE_BUILD
@@ -1,6 +1,11 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

+if [[ $JACK_VCS == y ]]
+then
+ ./autogen.sh --no-conf
+fi &&
+
if [[ $JACK_TIME == y ]]
then
patch -p1 < "$SCRIPT_DIRECTORY/jack_time.patch"
diff --git a/audio-drivers/jack/PRE_SUB_DEPENDS
b/audio-drivers/jack/PRE_SUB_DEPENDS
index 65a4b2a..63ee4b0 100755
--- a/audio-drivers/jack/PRE_SUB_DEPENDS
+++ b/audio-drivers/jack/PRE_SUB_DEPENDS
@@ -1,4 +1,5 @@
case $THIS_SUB_DEPENDS in
TIMEPATCH) [[ $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 849eff0..184d1ea 100755
--- a/audio-drivers/jack/SUB_DEPENDS
+++ b/audio-drivers/jack/SUB_DEPENDS
@@ -2,6 +2,9 @@ case $THIS_SUB_DEPENDS in
TIMEPATCH) echo "Time patch requested, forcing option JACK_TIME=y." &&
JACK_TIME=y && persistent_add JACK_TIME
;;
+ VCS) echo "Development version requested, forcing option
JACK_VCS=y." &&
+ JACK_VCS=y && persistent_add JACK_VCS
+ ;;
*) echo "Unknown sub-dependency '$THIS_SUB_DEPENDS'"!
return 1
;;



  • [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (7007ced1f14b5e9da0058e412bf15e276fa00e99), Juuso Alasuutari, 04/11/2007

Archive powered by MHonArc 2.6.24.

Top of Page