Skip to Content.
Sympa Menu

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

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 (48f89c84b799de3157c8596a2cd25d6c757024a3)
  • Date: Mon, 17 Mar 2008 21:30:19 -0500

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

audio-drivers/jackdmp/BUILD | 21 ++++++--------------
audio-drivers/jackdmp/CONFIGURE | 19 +++++++++++++++---
audio-drivers/jackdmp/CONFLICTS | 10 ++++++++-
audio-drivers/jackdmp/DEPENDS | 20 ++++++++++++++++++-
audio-drivers/jackdmp/DETAILS | 13 +++++++++---
audio-drivers/jackdmp/HISTORY | 6 +++++
audio-drivers/jackdmp/INSTALL | 42
+++++++++++++++++++++++++++++-----------
audio-drivers/jackdmp/PREPARE | 8 +++++++
audio-drivers/jackdmp/PRE_BUILD | 24 +++++++---------------
9 files changed, 114 insertions(+), 49 deletions(-)

New commits:
commit 39296f5ac550fd27ba09eb21e42b0d24f3935106
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

jackdmp: Added "control" SVN branch option, switched SVN versions to use
the new scons
build.

diff --git a/audio-drivers/jackdmp/BUILD b/audio-drivers/jackdmp/BUILD
index d260f56..17c2b1d 100755
--- a/audio-drivers/jackdmp/BUILD
+++ b/audio-drivers/jackdmp/BUILD
@@ -1,16 +1,9 @@
-#
-# Account for packaging differences between the stable and devel version
-#
-local _src &&
-
-#
-# Funny stuff needed because the source is a badly built zip archive
-#
if [[ $JACKDMP_VCS != y ]]
then
- cd "$SOURCE_DIRECTORY/${SPELL}_$VERSION" &&
- _src="src/"
-fi &&
-
-cd ${_src}linux &&
-make
+ cd "$SOURCE_DIRECTORY/${SPELL}_$VERSION/src/linux" &&
+ make
+else
+ cd "$SOURCE_DIRECTORY" &&
+ scons $JACKDMP_EXAMPLES $JACKDMP_MIMIC $OPTS \
+ BUILD_TESTS=no PREFIX="$INSTALL_ROOT/usr"
+fi
diff --git a/audio-drivers/jackdmp/CONFIGURE b/audio-drivers/jackdmp/CONFIGURE
index d44c60a..4030f56 100755
--- a/audio-drivers/jackdmp/CONFIGURE
+++ b/audio-drivers/jackdmp/CONFIGURE
@@ -1,6 +1,19 @@
-config_query_string JACKDMP_TMPDIR \
- "Input default jackdmp temp dir:" \
- /dev/shm &&
+if [[ $JACKDMP_VCS != y ]]
+then
+ config_query_string JACKDMP_TMPDIR \
+ "Input default jackdmp temp dir:" \
+ /dev/shm
+else
+ config_query_option JACKDMP_EXAMPLES \
+ "Install example clients?" y \
+ "BUILD_EXAMPLES=yes INSTALL_EXAMPLES=yes" \
+ "BUILD_EXAMPLES=no INSTALL_EXAMPLES=no"
+
+ config_query_option JACKDMP_MIMIC \
+ "Mimic \"normal\" JACK's installation layout?" n \
+ "FULL_MIMIC=yes" \
+ "FULL_MIMIC=no"
+fi

#
# Symlink query removed in 0.68, keep this here for a while
diff --git a/audio-drivers/jackdmp/CONFLICTS b/audio-drivers/jackdmp/CONFLICTS
index a2ac323..656a5fb 100755
--- a/audio-drivers/jackdmp/CONFLICTS
+++ b/audio-drivers/jackdmp/CONFLICTS
@@ -1,2 +1,10 @@
conflicts jack &&
-conflicts jack-cvs
+conflicts jack-cvs &&
+
+#
+# scons build will fail if an existing jackdmp version is found
+#
+if [[ $JACKDMP_VCS == y ]]
+then
+ conflicts jackdmp y
+fi
diff --git a/audio-drivers/jackdmp/DEPENDS b/audio-drivers/jackdmp/DEPENDS
index 8a5b455..958ad49 100755
--- a/audio-drivers/jackdmp/DEPENDS
+++ b/audio-drivers/jackdmp/DEPENDS
@@ -1,3 +1,21 @@
depends pkgconfig &&
depends alsa-lib &&
-depends g++
+depends g++ &&
+
+if [[ $JACKDMP_VCS == y ]]
+then
+ depends scons &&
+
+ optional_depends doxygen \
+ "BUILD_DOXYGEN_DOCS=yes" \
+ "BUILD_DOXYGEN_DOCS=no" \
+ "to build documentation" &&
+
+ if [[ $JACKDMP_VCS_BRANCH == control ]]
+ then
+ optional_depends dbus \
+ "ENABLE_DBUS=yes" \
+ "ENABLE_DBUS=no" \
+ "to enable the D-Bus control interface"
+ fi
+fi
diff --git a/audio-drivers/jackdmp/DETAILS b/audio-drivers/jackdmp/DETAILS
index 7da0848..adcaa5b 100755
--- a/audio-drivers/jackdmp/DETAILS
+++ b/audio-drivers/jackdmp/DETAILS
@@ -1,14 +1,21 @@
SPELL=jackdmp
if [[ $JACKDMP_VCS == y ]]
then
+ if [[ $JACKDMP_VCS_BRANCH == control ]]
+ then
+
SOURCE_URL[0]=svn_http://subversion.jackaudio.org/jackmp/branches/control:jackdmp
+ BRANCH=-control
+ else
+
SOURCE_URL[0]=svn_http://subversion.jackaudio.org/jackmp/trunk/jackmp:jackdmp
+ BRANCH=
+ fi
if [[ $JACKDMP_VCS_AUTOUPDATE == y ]]
then
- VERSION=$(date +%Y%m%d)
+ VERSION=$(date +%Y%m%d)${BRANCH}
else
- VERSION=svn
+ VERSION=svn${BRANCH}
fi
SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_URL[0]=svn_http://subversion.jackaudio.org/jackmp/trunk/jackmp:jackdmp
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
else
diff --git a/audio-drivers/jackdmp/HISTORY b/audio-drivers/jackdmp/HISTORY
index d67d6ca..5380f62 100644
--- a/audio-drivers/jackdmp/HISTORY
+++ b/audio-drivers/jackdmp/HISTORY
@@ -1,3 +1,9 @@
+2008-03-18 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS, PREPARE, CONFIGURE, DEPENDS, CONFLICTS, PRE_BUILD,
+ BUILD, INSTALL: Added a 'control' SVN branch option, switched
+ to using scons for the SVN versions' build (hence the massive
+ amount of changes).
+
2008-02-24 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: Updated stable version to 0.70.
* jack.pc: Changed corresponding jackd version to 0.109.0
diff --git a/audio-drivers/jackdmp/INSTALL b/audio-drivers/jackdmp/INSTALL
index 2f3a91a..cddbe77 100755
--- a/audio-drivers/jackdmp/INSTALL
+++ b/audio-drivers/jackdmp/INSTALL
@@ -1,12 +1,32 @@
-#
-# libs & daemon
-#
-make DESTDIR="$INSTALL_ROOT" install &&
+if [[ $JACKDMP_VCS != y ]]
+then
+ #
+ # libs & daemon
+ #
+ make DESTDIR="$INSTALL_ROOT" install &&

-#
-# pkgconfig file
-#
-message "${MESSAGE_COLOR}Installing pkgconfig file$DEFAULT_COLOR" &&
-mkdir -p "$INSTALL_ROOT/usr/lib/pkgconfig" &&
-cp "$SCRIPT_DIRECTORY/jack.pc" \
- "$INSTALL_ROOT/usr/lib/pkgconfig/"
+ #
+ # pkgconfig file
+ #
+ message "${MESSAGE_COLOR}Installing pkgconfig file$DEFAULT_COLOR" &&
+ mkdir -p "$INSTALL_ROOT/usr/lib/pkgconfig" &&
+ cp "$SCRIPT_DIRECTORY/jack.pc" \
+ "$INSTALL_ROOT/usr/lib/pkgconfig/"
+else
+ scons install &&
+
+ if [[ $JACKDMP_MIMIC != 'FULL_MIMIC=yes' ]]
+ then
+ ln -sf "$(readlink -f "$INSTALL_ROOT/usr/lib/libjackwrapper.so")" \
+ "$INSTALL_ROOT/usr/lib/libjack.so.0.0" &&
+ ln -sf libjack.so.0.0 "$INSTALL_ROOT/usr/lib/libjack.so.0" &&
+ ln -sf libjack.so.0 "$INSTALL_ROOT/usr/lib/libjack.so" &&
+ ln -sf jackdmp "$INSTALL_ROOT/usr/bin/jackd"
+ fi &&
+
+ if is_depends_enabled $SPELL doxygen
+ then
+ mkdir -p "$INSTALL_ROOT/usr/share/doc/$SPELL" &&
+ cp -r html/ "$INSTALL_ROOT/usr/share/doc/$SPELL/"
+ fi
+fi
diff --git a/audio-drivers/jackdmp/PREPARE b/audio-drivers/jackdmp/PREPARE
index 02ef5bb..da08875 100755
--- a/audio-drivers/jackdmp/PREPARE
+++ b/audio-drivers/jackdmp/PREPARE
@@ -2,6 +2,14 @@ config_query JACKDMP_VCS "Build latest version from
development tree?" n &&

if [[ $JACKDMP_VCS == y ]]
then
+ message "${MESSAGE_COLOR}The 'control' branch includes an experimental" \
+ "\nD-Bus control interface for JACK.$DEFAULT_COLOR"
&&
+
+ config_query_list JACKDMP_VCS_BRANCH \
+ "Which branch to pull from?" \
+ trunk \
+ control &&
+
config_query JACKDMP_VCS_AUTOUPDATE \
"Automatically update on every system update?" n
fi &&
diff --git a/audio-drivers/jackdmp/PRE_BUILD b/audio-drivers/jackdmp/PRE_BUILD
index 90ae799..0d978f7 100755
--- a/audio-drivers/jackdmp/PRE_BUILD
+++ b/audio-drivers/jackdmp/PRE_BUILD
@@ -1,26 +1,18 @@
#
-# Account for packaging differences between the stable and devel version
-#
-local _src &&
-
-#
# Funny stuff needed because the source is a badly built zip archive
#
-if [[ $JACKDMP_VCS != 'y' ]]
+if [[ $JACKDMP_VCS != y ]]
then
mkdir -p "$SOURCE_DIRECTORY" &&
cd "$SOURCE_DIRECTORY" &&
unpack_file &&
cd "${SPELL}_$VERSION" &&
- _src="src/"
-else
- default_pre_build &&
- cd "$SOURCE_DIRECTORY"
-fi &&

-sed -i "s|/usr/local|/usr|" ${_src}linux/Makefile &&
-
-if [[ $JACKDMP_TMPDIR && $JACKDMP_TMPDIR != '/dev/shm' ]]
-then
- sed -i "s|/dev/shm|$JACKDMP_TMPDIR|" ${_src}common/JackConstants.h
+ sed -i "s|/usr/local|/usr|" src/linux/Makefile &&
+ if [[ $JACKDMP_TMPDIR && $JACKDMP_TMPDIR != '/dev/shm' ]]
+ then
+ sed -i "s|/dev/shm|$JACKDMP_TMPDIR|" src/common/JackConstants.h
+ fi
+else
+ default_pre_build
fi



  • [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (48f89c84b799de3157c8596a2cd25d6c757024a3), Juuso Alasuutari, 03/17/2008

Archive powered by MHonArc 2.6.24.

Top of Page