Skip to Content.
Sympa Menu

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

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 (835e4c228bac261d0d8c82ad9bf5b1a3394d0ac2)
  • Date: Sat, 5 Apr 2008 09:57:28 -0500

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

audio-drivers/jackdmp/BUILD | 10 +++++-----
audio-drivers/jackdmp/CONFIGURE | 2 +-
audio-drivers/jackdmp/CONFLICTS | 12 ++----------
audio-drivers/jackdmp/DEPENDS | 14 ++++++++++++--
audio-drivers/jackdmp/HISTORY | 10 ++++++++++
audio-drivers/jackdmp/INSTALL | 6 +-----
6 files changed, 31 insertions(+), 23 deletions(-)

New commits:
commit 58e812f17a50028feafca54ad3154accbbcfb9a7
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

jackdmp: Fixes and updates to the VCS version spell code. The HISTORY
entry shall reveal ye its secrets.

diff --git a/audio-drivers/jackdmp/BUILD b/audio-drivers/jackdmp/BUILD
index 519f0db..7a0ffbc 100755
--- a/audio-drivers/jackdmp/BUILD
+++ b/audio-drivers/jackdmp/BUILD
@@ -1,11 +1,11 @@
if [[ $JACKDMP_VCS != y ]]
then
cd "$SOURCE_DIRECTORY/${SPELL}_$VERSION/src/linux" &&
- make_single &&
- make &&
+ make_single &&
+ make &&
make_normal
else
- cd "$SOURCE_DIRECTORY" &&
- scons $JACKDMP_EXAMPLES $JACKDMP_MIMIC $OPTS \
- BUILD_TESTS=no PREFIX="$INSTALL_ROOT/usr"
+ cd "$SOURCE_DIRECTORY" &&
+ scons PREFIX="/usr" DESTDIR="$INSTALL_ROOT" BUILD_TESTS=no \
+ $JACKDMP_EXAMPLES $JACKDMP_MIMIC $OPTS
fi
diff --git a/audio-drivers/jackdmp/CONFIGURE b/audio-drivers/jackdmp/CONFIGURE
index 14475e6..4030f56 100755
--- a/audio-drivers/jackdmp/CONFIGURE
+++ b/audio-drivers/jackdmp/CONFIGURE
@@ -10,7 +10,7 @@ else
"BUILD_EXAMPLES=no INSTALL_EXAMPLES=no"

config_query_option JACKDMP_MIMIC \
- "Mimic \"normal\" JACK's installation layout?" y \
+ "Mimic \"normal\" JACK's installation layout?" n \
"FULL_MIMIC=yes" \
"FULL_MIMIC=no"
fi
diff --git a/audio-drivers/jackdmp/CONFLICTS b/audio-drivers/jackdmp/CONFLICTS
index 656a5fb..c0c99f8 100755
--- a/audio-drivers/jackdmp/CONFLICTS
+++ b/audio-drivers/jackdmp/CONFLICTS
@@ -1,10 +1,2 @@
-conflicts jack &&
-conflicts jack-cvs &&
-
-#
-# scons build will fail if an existing jackdmp version is found
-#
-if [[ $JACKDMP_VCS == y ]]
-then
- conflicts jackdmp y
-fi
+conflicts jack-cvs y &&
+conflicts jack
diff --git a/audio-drivers/jackdmp/DEPENDS b/audio-drivers/jackdmp/DEPENDS
index 958ad49..6afcad7 100755
--- a/audio-drivers/jackdmp/DEPENDS
+++ b/audio-drivers/jackdmp/DEPENDS
@@ -1,10 +1,20 @@
depends pkgconfig &&
-depends alsa-lib &&
depends g++ &&

-if [[ $JACKDMP_VCS == y ]]
+if [[ $JACKDMP_VCS != y ]]
then
+ depends alsa-lib
+else
depends scons &&
+ depends expat &&
+
+ message "${MESSAGE_COLOR}The ALSA backend is necessary" \
+ "for sound card support.$DEFAULT_COLOR" &&
+
+ optional_depends alsa-lib \
+ "ENABLE_ALSA=yes" \
+ "ENABLE_ALSA=no" \
+ "to build the ALSA backend" &&

optional_depends doxygen \
"BUILD_DOXYGEN_DOCS=yes" \
diff --git a/audio-drivers/jackdmp/HISTORY b/audio-drivers/jackdmp/HISTORY
index 3676832..4dc3464 100644
--- a/audio-drivers/jackdmp/HISTORY
+++ b/audio-drivers/jackdmp/HISTORY
@@ -1,3 +1,13 @@
+2008-04-05 Juuso Alasuutari <iuso AT sourcemage.org>
+ * CONFIGURE: Changed JACKDMP_MIMIC default back to n, it works
+ now and is the intended upstream default setting.
+ * DEPENDS: Added missing dependency on expat, made alsa-lib optional
+ for the VCS version.
+ * CONFLICTS: Doesn't conflict with itself anymore so removed
+ 'conflicts jackdmp', prepended 'y' to 'conflicts jack-cvs'.
+ * BUILD: Use new DESTDIR build option for INSTALL_ROOT.
+ * INSTALL: Removed obsolete symlinking.
+
2008-03-23 Juuso Alasuutari <iuso AT sourcemage.org>
* CONFIGURE: Changed JACKDMP_MIMIC default to y because the
n option doesn't actually yield a jack-compatible install.
diff --git a/audio-drivers/jackdmp/INSTALL b/audio-drivers/jackdmp/INSTALL
index cddbe77..587cf42 100755
--- a/audio-drivers/jackdmp/INSTALL
+++ b/audio-drivers/jackdmp/INSTALL
@@ -17,11 +17,7 @@ else

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"
+ ln -sf jackdmp "$INSTALL_ROOT/usr/bin/jackd"
fi &&

if is_depends_enabled $SPELL doxygen



  • [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (835e4c228bac261d0d8c82ad9bf5b1a3394d0ac2), Juuso Alasuutari, 04/05/2008

Archive powered by MHonArc 2.6.24.

Top of Page