[SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (da7b821069a394038f473e6a0fdb5afe47bbe56b)

Juuso Alasuutari scm at sourcemage.org
Mon May 26 07:59:35 EDT 2008


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

 audio-drivers/jackdmp/DEPENDS |   11 ++++-------
 audio-drivers/jackdmp/DETAILS |   18 ++++++------------
 audio-drivers/jackdmp/HISTORY |    7 +++++++
 audio-drivers/jackdmp/INSTALL |    2 --
 audio-drivers/jackdmp/PREPARE |   13 +++++--------
 5 files changed, 22 insertions(+), 29 deletions(-)

New commits:
commit da7b821069a394038f473e6a0fdb5afe47bbe56b
Author: Juuso Alasuutari <iuso at sourcemage.org>
Commit: Juuso Alasuutari <iuso at sourcemage.org>

    jackdmp: Corrected SOURCE_DIRECTORY to work with svn autoupdate.

commit cfa42dca373c1db26bee300f21cc9b4f4f638871
Author: Juuso Alasuutari <iuso at sourcemage.org>
Commit: Juuso Alasuutari <iuso at sourcemage.org>

    jackdmp: Removed 'control' branch from the svn version options, it has been merged with svn trunk upstream.

diff --git a/audio-drivers/jackdmp/DEPENDS b/audio-drivers/jackdmp/DEPENDS
index 6afcad7..37142c6 100755
--- a/audio-drivers/jackdmp/DEPENDS
+++ b/audio-drivers/jackdmp/DEPENDS
@@ -21,11 +21,8 @@ else
                     "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
+  optional_depends  dbus               \
+                    "ENABLE_DBUS=yes"  \
+                    "ENABLE_DBUS=no"   \
+                    "to enable the D-Bus control interface"
 fi
diff --git a/audio-drivers/jackdmp/DETAILS b/audio-drivers/jackdmp/DETAILS
index 96b33ef..4bc5ebd 100755
--- a/audio-drivers/jackdmp/DETAILS
+++ b/audio-drivers/jackdmp/DETAILS
@@ -1,30 +1,24 @@
            SPELL=jackdmp
 if [[ $JACKDMP_VCS == y ]]
 then
-  if [[ $JACKDMP_VCS_BRANCH == control ]]
-  then
-   SOURCE_URL[0]=svn_http://subversion.jackaudio.org/jack/jack2/branches/control:jackdmp
-          BRANCH=-control
-  else
-   SOURCE_URL[0]=svn_http://subversion.jackaudio.org/jack/jack2/trunk/jackmp:jackdmp
-          BRANCH=
-  fi
   if [[ $JACKDMP_VCS_AUTOUPDATE == y ]]
   then
-         VERSION=$(date +%Y%m%d)${BRANCH}
+         VERSION=$(date +%Y%m%d)
   else
-         VERSION=svn${BRANCH}
+         VERSION=svn
   fi
-          SOURCE=$SPELL-$VERSION.tar.bz2
+          SOURCE=$SPELL-svn.tar.bz2
+   SOURCE_URL[0]=svn_http://subversion.jackaudio.org/jack/jack2/trunk/jackmp:jackdmp
    SOURCE_IGNORE=volatile
   FORCE_DOWNLOAD=on
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
 else
          VERSION=0.70
           SOURCE=${SPELL}_$VERSION.zip
    SOURCE_URL[0]=http://www.grame.fr/~letz/$SOURCE
      SOURCE_HASH=sha512:68c708ef5090e2a4cc9c1fc496e50275acb17555d6ea04642f219c75fb73900127ac0999e293b1852618c47463df85d1093d4d63e60c9a98b6c511c72c8653e9
-fi
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+fi
         WEB_SITE=http://www.grame.fr/~letz/jackdmp.html
          ENTERED=20070319
       LICENSE[0]=GPL
diff --git a/audio-drivers/jackdmp/HISTORY b/audio-drivers/jackdmp/HISTORY
index 5087dd3..341c7b3 100644
--- a/audio-drivers/jackdmp/HISTORY
+++ b/audio-drivers/jackdmp/HISTORY
@@ -1,3 +1,10 @@
+2008-05-26 Juuso Alasuutari <iuso at sourcemage.org>
+	* DETAILS, PREPARE, DEPENDS: Removed 'control' svn branch option,
+	  it is now merged to trunk upstream.
+	* INSTALL: Don't create jackd -> jackdmp symlink for svn version,
+	  /usr/bin/jackd is now installed by default.
+	* DETAILS: Corrected SOURCE_DIRECTORY to work with svn autoupdate.
+
 2008-05-25 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: Updated svn URLs.
 	* CONFIGURE, BUILD, INSTALL: Removed FULL_MIMIC option
diff --git a/audio-drivers/jackdmp/INSTALL b/audio-drivers/jackdmp/INSTALL
index 53761b6..e099b7c 100755
--- a/audio-drivers/jackdmp/INSTALL
+++ b/audio-drivers/jackdmp/INSTALL
@@ -15,8 +15,6 @@ then
 else
   scons  install  &&
 
-  ln -sf  jackdmp  "$INSTALL_ROOT/usr/bin/jackd"  &&
-
   if  is_depends_enabled  $SPELL  doxygen
   then
     mkdir -p  "$INSTALL_ROOT/usr/share/doc/$SPELL"       &&
diff --git a/audio-drivers/jackdmp/PREPARE b/audio-drivers/jackdmp/PREPARE
index da08875..5f39615 100755
--- a/audio-drivers/jackdmp/PREPARE
+++ b/audio-drivers/jackdmp/PREPARE
@@ -2,14 +2,6 @@ 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  &&
@@ -18,3 +10,8 @@ fi  &&
 # Removed in 0.70
 #
 persistent_remove  _SRCDIR
+
+#
+# Removed on 2008-05-26
+#
+persistent_remove JACKDMP_VCS_BRANCH



More information about the SM-Commit mailing list