Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (d143cc8f8a2b38213fac038f36ce43124c4d77ac)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (d143cc8f8a2b38213fac038f36ce43124c4d77ac)
  • Date: Sat, 1 Feb 2014 04:42:35 -0600

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

ChangeLog | 3 +++
FUNCTIONS | 7 ++++---
audio-drivers/jack2/BUILD | 6 +++---
audio-drivers/jack2/DETAILS | 10 +++++-----
audio-drivers/jack2/HISTORY | 4 ++++
audio-drivers/jack2/INSTALL | 2 +-
6 files changed, 20 insertions(+), 12 deletions(-)

New commits:
commit d143cc8f8a2b38213fac038f36ce43124c4d77ac
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

waf_build(): include missing configdir option

commit 1c6ffbb044a86798421141ca524ff0e28e2bccce
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

jack2: post-update fixes

diff --git a/ChangeLog b/ChangeLog
index d54b059..8f4e137 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2014-02-01 Vlad Glagolev <stealth AT sourcemage.org>
+ * FUNCTIONS: include missing configdir option in waf_build()
+
2014-01-30 Ladislav Hagara <hgr AT vabo.cz>
* djm.gpg: 0x6D920D30 added, Damien Miller <djm AT mindrot.org>

diff --git a/FUNCTIONS b/FUNCTIONS
index 7da8ec0..46a8493 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -521,15 +521,16 @@ function note_config_files() {
# Disabled caching as this has GREAT potential for borkage
# and waf is fast without it as well

-function waf_build(){
+function waf_build() {
./waf configure \
--nocache \
--prefix=${INSTALL_ROOT}/usr \
- $OPTS &&
+ --configdir=${INSTALL_ROOT}/etc \
+ $OPTS &&
./waf build
}

-function waf_install(){
+function waf_install() {
./waf install
}

diff --git a/audio-drivers/jack2/BUILD b/audio-drivers/jack2/BUILD
index 0401eea..1340246 100755
--- a/audio-drivers/jack2/BUILD
+++ b/audio-drivers/jack2/BUILD
@@ -1,3 +1,3 @@
-./waf configure --prefix=/usr --destdir="$INSTALL_ROOT" \
- --enable-pkg-config-dbus-service-dir $OPTS &&
-./waf build
+OPTS="--enable-pkg-config-dbus-service-dir $OPTS" &&
+
+waf_build
diff --git a/audio-drivers/jack2/DETAILS b/audio-drivers/jack2/DETAILS
index 678eb2b..74371ef 100755
--- a/audio-drivers/jack2/DETAILS
+++ b/audio-drivers/jack2/DETAILS
@@ -1,4 +1,5 @@
SPELL=jack2
+ SPELLX=jack
WEB_SITE=http://jackaudio.org/
if [[ $JACK2_BRANCH == scm ]]; then
if [[ $JACK2_AUTOUPDATE == y ]]; then
@@ -13,11 +14,10 @@ if [[ $JACK2_BRANCH == scm ]]; then
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
else
VERSION=1.9.9.5 # Officially, it is called 1.9.9, but the tarball
says 1.9.9.5 .
- SOURCE=jack-$VERSION.tar.bz2
- SOURCE_URL[0]=https://dl.dropbox.com/u/28869550/$SOURCE
-
-SOURCE_HASH=sha512:173a10943c98cb17f0041216cc24ce03d5e147f27be121fdf66c4e9d21ba8bf125a1749b985cacffb075618d92025231eb047c754d33d777275373d010a85e27
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/jack-$VERSION"
+ SOURCE=$SPELLX-$VERSION.tar.bz2
+ SOURCE_URL[0]=http://jackaudio.org/downloads/$SOURCE
+
SOURCE_HASH=sha512:173a10943c98cb17f0041216cc24ce03d5e147f27be121fdf66c4e9d21ba8bf125a1749b985cacffb075618d92025231eb047c754d33d777275373d010a85e27
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
fi
WEB_SITE=http://jackaudio.org/
ENTERED=20080707
diff --git a/audio-drivers/jack2/HISTORY b/audio-drivers/jack2/HISTORY
index 6a96f96..9610118 100644
--- a/audio-drivers/jack2/HISTORY
+++ b/audio-drivers/jack2/HISTORY
@@ -1,3 +1,7 @@
+2014-02-01 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: use official url instead of dropbox
+ * BUILD, INSTALL: switch to waf_build/waf_install functions
+
2013-02-12 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: add website, update to 1.9.9.5
Note: SCM option is outdated, jack2 is using git
diff --git a/audio-drivers/jack2/INSTALL b/audio-drivers/jack2/INSTALL
index 6d035e0..0ea15cc 100755
--- a/audio-drivers/jack2/INSTALL
+++ b/audio-drivers/jack2/INSTALL
@@ -1 +1 @@
-./waf install
+waf_install



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (d143cc8f8a2b38213fac038f36ce43124c4d77ac), Vlad Glagolev, 02/01/2014

Archive powered by MHonArc 2.6.24.

Top of Page