Skip to Content.
Sympa Menu

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

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 (d03fa4d3d0ba6f93f3e93230a8d2b469a7072d6c)
  • Date: Tue, 22 Jan 2008 08:19:19 -0600

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

ChangeLog | 4 +
audio-drivers/jack/CONFIGURE | 7 +
audio-drivers/jack/CONFLICTS | 3
audio-drivers/jack/DEPENDS | 21 ++++-
audio-drivers/jack/DETAILS | 4 -
audio-drivers/jack/HISTORY | 10 ++
audio-drivers/jack/PRE_BUILD | 6 -
audio-drivers/jack/PRE_SUB_DEPENDS | 1
audio-drivers/jack/SUB_DEPENDS | 6 -
audio-drivers/jack/jack_time.patch | 111
-------------------------------
audio-drivers/jackmidi_alsaseq/BUILD | 2
audio-drivers/jackmidi_alsaseq/DEPENDS | 5 -
audio-drivers/jackmidi_alsaseq/DETAILS | 9 +-
audio-drivers/jackmidi_alsaseq/HISTORY | 3
audio-drivers/jackmidi_alsaseq/INSTALL | 2
audio-drivers/jackmidi_alsaseq/PRE_BUILD | 1
audio-drivers/jackmidi_alsaseq/TRIGGERS | 1
17 files changed, 54 insertions(+), 142 deletions(-)

New commits:
commit 212133b6f8afb0601b6a4c9a6bcd2e839c817d67
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

jack: Added conflict with deprecated jackmidi_alsaseq.

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

jackmidi_alsaseq: Deprecated because JACK now has native ALSA Sequencer
support.

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

jack 0.109.0

diff --git a/ChangeLog b/ChangeLog
index b4e909c..97d9dfd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-22 Juuso Alasuutari <iuso AT sourcemage.org>
+ * audio-drivers/jackmidi_alsaseq: Deprecated because JACK now has
+ native ALSA Sequencer support.
+
2008-01-21 Vlad Glagolev <stealth AT sourcemage.org>
* python-pypi/elementsoap: new spell, light-weight SOAP implementation

diff --git a/audio-drivers/jack/CONFIGURE b/audio-drivers/jack/CONFIGURE
index 9811f96..8f3b36d 100755
--- a/audio-drivers/jack/CONFIGURE
+++ b/audio-drivers/jack/CONFIGURE
@@ -8,6 +8,7 @@ if [[ $MIXSSE ]]; then
local JACK_SIMD="$MIXSSE" &&
persistent_remove MIXSSE
fi &&
+
config_query_option JACK_SIMD \
"Enable dynamic SIMD selection?" n \
"--enable-dynsimd" \
@@ -28,10 +29,10 @@ config_query_option JACK_OPTIMIZE
\
"--enable-optimize" \
"--disable-optimize" &&

-if [[ $JACK_VCS != y ]]
+# Added in 2008-01-22, to be removed ~1 year later.
+if [[ $JACK_TIME ]]
then
- config_query JACK_TIME \
- "Apply time patch (required by jackmidi_alsaseq)?" n
+ persistent_remove JACK_TIME
fi &&

local _DEFTMP &&
diff --git a/audio-drivers/jack/CONFLICTS b/audio-drivers/jack/CONFLICTS
index 1ba2cfc..2be98ca 100755
--- a/audio-drivers/jack/CONFLICTS
+++ b/audio-drivers/jack/CONFLICTS
@@ -1,2 +1,3 @@
-conflicts jack-cvs y &&
+conflicts jack-cvs y &&
+conflicts jackmidi_alsaseq y &&
conflicts jackdmp
diff --git a/audio-drivers/jack/DEPENDS b/audio-drivers/jack/DEPENDS
index 70a8cc3..ae5983c 100755
--- a/audio-drivers/jack/DEPENDS
+++ b/audio-drivers/jack/DEPENDS
@@ -16,10 +16,23 @@ optional_depends portaudio \
"--disable-portaudio" \
"for PortAudio driver support" &&

-optional_depends libcap \
- "--enable-capabilities" \
- "--disable-capabilities" \
- "to gain realtime scheduling priviledges" &&
+optional_depends libsndfile \
+ "" \
+ "" \
+ "to build the jackrec example client" &&
+
+. "$GRIMOIRE/FUNCTIONS" &&
+
+local KVER=$(get_kernel_version) &&
+
+if [[ "${KVER:0:4}" == '2.4.' ]]
+then
+ optional_depends libcap \
+ "--enable-capabilities" \
+ "--disable-capabilities" \
+ "to gain realtime scheduling priviledges \
+(2.4 kernels only)"
+fi &&

optional_depends doxygen \
"" \
diff --git a/audio-drivers/jack/DETAILS b/audio-drivers/jack/DETAILS
index 7aab06c..952c1bc 100755
--- a/audio-drivers/jack/DETAILS
+++ b/audio-drivers/jack/DETAILS
@@ -13,11 +13,11 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
else
- VERSION=0.103.0
+ VERSION=0.109.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
+
SOURCE_HASH=sha512:37256e6ad0b6ce7fbeeda6c833f9d2d3c20ffdcc30163348de7cf1ed63f1b4d29004ac12bc1df26427200f8ec2909a9b0e86154744a1e3f561cbafb39b633ebe
fi
WEB_SITE=http://jackaudio.org/
ENTERED=20030921
diff --git a/audio-drivers/jack/HISTORY b/audio-drivers/jack/HISTORY
index 5a0a71a..43a0b9c 100644
--- a/audio-drivers/jack/HISTORY
+++ b/audio-drivers/jack/HISTORY
@@ -1,3 +1,13 @@
+2008-01-22 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: Updated to 0.109.0.
+ * DEPENDS: Enabled optional_depends libcap only for 2.4. kernels,
+ added optional_depends libsndfile for building the jackrec example
+ client.
+ * PRE_SUB_DEPENDS, SUB_DEPENDS, CONFIGURE, PRE_BUILD: Removed
+ TIMEPATCH sub-dependency, the feature is now included upstream.
+ * jack_time.patch: Deleted.
+ * CONFLICTS: Conflicts with deprecated jackmidi_alsaseq.
+
2007-12-04 Thomas Orgis <sobukus AT sourcemage.org>
* PRE_BUILD: no lib64!

diff --git a/audio-drivers/jack/PRE_BUILD b/audio-drivers/jack/PRE_BUILD
index 11bf72a..636554c 100755
--- a/audio-drivers/jack/PRE_BUILD
+++ b/audio-drivers/jack/PRE_BUILD
@@ -4,8 +4,6 @@ cd "$SOURCE_DIRECTORY" &&
if [[ $JACK_VCS == y ]]
then
./autogen.sh --no-conf
-elif [[ $JACK_TIME == y ]]
-then
- patch -p1 < "$SCRIPT_DIRECTORY/jack_time.patch"
fi &&
-sedit 's/libnn=lib64/libnn=lib/' configure
+
+sed -i 's/libnn=lib64/libnn=lib/' configure
diff --git a/audio-drivers/jack/PRE_SUB_DEPENDS
b/audio-drivers/jack/PRE_SUB_DEPENDS
index 6e8ad3c..80cccbb 100755
--- a/audio-drivers/jack/PRE_SUB_DEPENDS
+++ b/audio-drivers/jack/PRE_SUB_DEPENDS
@@ -1,5 +1,4 @@
case $THIS_SUB_DEPENDS in
- TIMEPATCH) [[ $JACK_VCS == y || $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 75b186f..301f44d 100755
--- a/audio-drivers/jack/SUB_DEPENDS
+++ b/audio-drivers/jack/SUB_DEPENDS
@@ -1,10 +1,4 @@
case $THIS_SUB_DEPENDS in
- TIMEPATCH) if [[ $JACK_VCS != y ]]
- then
- echo "Time patch requested, forcing option JACK_TIME=y." &&
- JACK_TIME=y && persistent_add JACK_TIME
- fi
- ;;
VCS) echo "Development version requested, forcing option
JACK_VCS=y." &&
JACK_VCS=y && persistent_add JACK_VCS
;;
diff --git a/audio-drivers/jack/jack_time.patch
b/audio-drivers/jack/jack_time.patch
deleted file mode 100644
index c70ee25..0000000
--- a/audio-drivers/jack/jack_time.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-diff -r cd93ab53ed18 jack/jack.h
---- a/jack/jack.h Wed Dec 13 07:09:13 2006 +0300
-+++ b/jack/jack.h Mon Jan 08 22:49:38 2007 +0300
-@@ -730,6 +730,13 @@ int jack_engine_takeover_timebase (jack
- int jack_engine_takeover_timebase (jack_client_t *);
-
- /**
-+ * @return current system time in microseconds, using jack clock source.
-+ *
-+ * This function is a client version of jack_get_microseconds().
-+ */
-+jack_time_t jack_get_time();
-+
-+/**
- * @return the time in frames that has passed since the JACK server
- * began the current process cycle.
- */
-@@ -750,6 +757,16 @@ jack_nframes_t jack_frame_time (const ja
- * jack_frame_time() in correlation to the current process cycle.
- */
- jack_nframes_t jack_last_frame_time (const jack_client_t *client);
-+
-+/**
-+ * @return estimated time in microseconds of the specified frame time
-+ */
-+jack_time_t jack_frames_to_time(const jack_client_t *client,
jack_nframes_t);
-+
-+/**
-+ * @return estimated time in frames for the specified system time.
-+ */
-+jack_nframes_t jack_time_to_frames(const jack_client_t *client,
jack_time_t);
-
- /**
- * @return the current CPU load estimated by JACK. This is a running
-diff -r cd93ab53ed18 libjack/transclient.c
---- a/libjack/transclient.c Wed Dec 13 07:09:13 2006 +0300
-+++ b/libjack/transclient.c Mon Jan 08 22:53:39 2007 +0300
-@@ -231,8 +231,14 @@ jack_frames_since_cycle_start (const jac
- / 1000000.0f) * usecs);
- }
-
--jack_nframes_t
--jack_frame_time (const jack_client_t *client)
-+jack_time_t
-+jack_get_time()
-+{
-+ return jack_get_microseconds();
-+}
-+
-+jack_nframes_t
-+jack_time_to_frames(const jack_client_t *client, jack_time_t now)
- {
- jack_frame_timer_t time;
- jack_control_t *ectl = client->engine;
-@@ -240,8 +246,6 @@ jack_frame_time (const jack_client_t *cl
- jack_read_frame_time (client, &time);
-
- if (time.initialized) {
-- jack_time_t now = jack_get_microseconds();
--
- #if 0
- fprintf (stderr, "now = %Lu current wakeup = %Lu next = %Lu
frames = %lu + %f => %lu\n",
- now, time.current_wakeup, time.next_wakeup,
time.frames,
-@@ -250,14 +254,20 @@ jack_frame_time (const jack_client_t *cl
- time.frames +
- (long) rint (((double) (now - time.current_wakeup)/
- (time.next_wakeup -
time.current_wakeup)) * ectl->buffer_size));
--#endif
-+#endif
-
- return time.frames +
- (long) rint (((double) ((long long) (now -
time.current_wakeup))/
- ((long long)
(time.next_wakeup - time.current_wakeup))) * ectl->buffer_size);
-- }
--
-+ }
- return 0;
-+}
-+
-+jack_nframes_t
-+jack_frame_time (const jack_client_t *client)
-+{
-+ jack_time_t now = jack_get_microseconds();
-+ return jack_time_to_frames(client, now);
- }
-
- jack_nframes_t
-@@ -266,6 +276,23 @@ jack_last_frame_time (const jack_client_
- jack_frame_timer_t current;
- jack_read_frame_time (client, &current);
- return current.frames;
-+}
-+
-+jack_time_t
-+jack_frames_to_time(const jack_client_t *client, jack_nframes_t frames)
-+{
-+ jack_frame_timer_t time;
-+ jack_control_t *ectl = client->engine;
-+
-+ jack_read_frame_time (client, &time);
-+
-+ if (time.initialized) {
-+ return time.current_wakeup +
-+ (long) rint (((double) ((long long) (frames -
time.frames)) *
-+ ((long long)
(time.next_wakeup - time.current_wakeup)) / ectl->buffer_size) );
-+ }
-+
-+ return 0;
- }
-
- jack_nframes_t
diff --git a/audio-drivers/jackmidi_alsaseq/BUILD
b/audio-drivers/jackmidi_alsaseq/BUILD
index 8f58e6d..27ba77d 100755
--- a/audio-drivers/jackmidi_alsaseq/BUILD
+++ b/audio-drivers/jackmidi_alsaseq/BUILD
@@ -1 +1 @@
-make
+true
diff --git a/audio-drivers/jackmidi_alsaseq/DEPENDS
b/audio-drivers/jackmidi_alsaseq/DEPENDS
index e66c165..b7e7582 100755
--- a/audio-drivers/jackmidi_alsaseq/DEPENDS
+++ b/audio-drivers/jackmidi_alsaseq/DEPENDS
@@ -1,4 +1 @@
-depends alsa-lib &&
-depends jack &&
-
-sub_depends jack TIMEPATCH
+depends jack
diff --git a/audio-drivers/jackmidi_alsaseq/DETAILS
b/audio-drivers/jackmidi_alsaseq/DETAILS
index d421340..d83ee12 100755
--- a/audio-drivers/jackmidi_alsaseq/DETAILS
+++ b/audio-drivers/jackmidi_alsaseq/DETAILS
@@ -1,11 +1,12 @@
SPELL=jackmidi_alsaseq
VERSION=0.4
- SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-
SOURCE_URL[0]=http://www.mail-archive.com/linux-audio-dev%40music.columbia.edu/msg23175/$SOURCE
-
SOURCE_HASH=sha512:4fb695c5980acbab48ead0143b1b2747bafc5ad12a33f8133703844b687b5bcb10c2e36c22d54774d479c9e0603f5eda5174162d9a946692fa83248049641bc8
+# SOURCE=$SPELL-$VERSION.tar.bz2
+#SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+#
SOURCE_URL[0]=http://www.mail-archive.com/linux-audio-dev%40music.columbia.edu/msg23175/$SOURCE
+#
SOURCE_HASH=sha512:4fb695c5980acbab48ead0143b1b2747bafc5ad12a33f8133703844b687b5bcb10c2e36c22d54774d479c9e0603f5eda5174162d9a946692fa83248049641bc8

WEB_SITE=http://www.mail-archive.com/linux-audio-dev%40music.columbia.edu/msg23175.html
ENTERED=20070325
+ PATCHLEVEL=1
LICENSE[0]=GPL
KEYWORDS="drivers audio"
SHORT="ALSA Seq < - > JACK MIDI bridge."
diff --git a/audio-drivers/jackmidi_alsaseq/HISTORY
b/audio-drivers/jackmidi_alsaseq/HISTORY
index a00361c..8df5e7d 100644
--- a/audio-drivers/jackmidi_alsaseq/HISTORY
+++ b/audio-drivers/jackmidi_alsaseq/HISTORY
@@ -1,2 +1,5 @@
+2008-01-22 Juuso Alasuutari <iuso AT sourcemage.org>
+ * Deprecated because JACK now has native ALSA Sequencer support.
+
2007-03-25 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS, DEPENDS, BUILD, INSTALL: Created spell.
diff --git a/audio-drivers/jackmidi_alsaseq/INSTALL
b/audio-drivers/jackmidi_alsaseq/INSTALL
index 2726c09..27ba77d 100755
--- a/audio-drivers/jackmidi_alsaseq/INSTALL
+++ b/audio-drivers/jackmidi_alsaseq/INSTALL
@@ -1 +1 @@
-cp jackmidi_alsaseq "$INSTALL_ROOT/usr/bin/"
+true
diff --git a/audio-drivers/jackmidi_alsaseq/PRE_BUILD
b/audio-drivers/jackmidi_alsaseq/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/audio-drivers/jackmidi_alsaseq/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/audio-drivers/jackmidi_alsaseq/TRIGGERS
b/audio-drivers/jackmidi_alsaseq/TRIGGERS
new file mode 100755
index 0000000..6088004
--- /dev/null
+++ b/audio-drivers/jackmidi_alsaseq/TRIGGERS
@@ -0,0 +1 @@
+on_cast jackmidi_alsaseq dispel_self



  • [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (d03fa4d3d0ba6f93f3e93230a8d2b469a7072d6c), Juuso Alasuutari, 01/22/2008

Archive powered by MHonArc 2.6.24.

Top of Page