Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Juuso Alasuutari <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (190fe0d0b24aa59bc84c50f2526930cd44e297da)
  • Date: Sun, 25 Mar 2007 14:17:18 -0500

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

ChangeLog | 4 +
audio-drivers/jack/CONFIGURE | 13 +++
audio-drivers/jack/HISTORY | 6 +
audio-drivers/jack/PRE_BUILD | 7 ++
audio-drivers/jack/PRE_SUB_DEPENDS | 4 +
audio-drivers/jack/SUB_DEPENDS | 8 ++
audio-drivers/jack/jack_time.patch | 111
+++++++++++++++++++++++++++++++++
audio-drivers/jackmidi_alsaseq/BUILD | 1
audio-drivers/jackmidi_alsaseq/DEPENDS | 4 +
audio-drivers/jackmidi_alsaseq/DETAILS | 14 ++++
audio-drivers/jackmidi_alsaseq/HISTORY | 2
audio-drivers/jackmidi_alsaseq/INSTALL | 1
12 files changed, 174 insertions(+), 1 deletion(-)

New commits:
commit 15a4dfe546842d93fc49eb921b09c4712d5b0887
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

jackmidi_alsaseq: New spell, ALSA Seq < - > JACK MIDI bridge.

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

jack: added optional patch & sub-dependency for jackmidi_alsaseq
compatibility, made temp dir default value depend on SHM setting
(/dev/shm with JACK_SHM and /tmp without it)

diff --git a/ChangeLog b/ChangeLog
index c6a1f2a..e034d1c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-03-25 Juuso Alasuutari <iuso AT sourcemage.org>
+ * audio-drivers/jackmidi_alsaseq: New spell, ALSA Seq < - > JACK
+ MIDI bridge.
+
2007-03-24 Mark Bainter <mbainter-smgl AT lostinagoodbook.org>
* editors/fte: Deleted spell in accordance with bug #12518

diff --git a/audio-drivers/jack/CONFIGURE b/audio-drivers/jack/CONFIGURE
index 4c7510b..ba64ee3 100755
--- a/audio-drivers/jack/CONFIGURE
+++ b/audio-drivers/jack/CONFIGURE
@@ -28,4 +28,15 @@ config_query_option JACK_OPTIMIZE
"--enable-optimize" \
"--disable-optimize" &&

-config_query_string JACK_TMPDIR "Input default JACK temp dir:" /tmp
+config_query JACK_TIME \
+ "Apply time patch (required by jackmidi_alsaseq)?" n &&
+
+local _DEFTMP &&
+if [[ $JACK_SHM == "--enable-posix-shm" ]]
+then
+ _DEFTMP=/dev/shm
+else
+ _DEFTMP=/tmp
+fi &&
+
+config_query_string JACK_TMPDIR "Input default JACK temp dir:" $_DEFTMP
diff --git a/audio-drivers/jack/HISTORY b/audio-drivers/jack/HISTORY
index dd5b7a3..2894ab3 100644
--- a/audio-drivers/jack/HISTORY
+++ b/audio-drivers/jack/HISTORY
@@ -1,5 +1,11 @@
2007-03-25 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: Updated to 0.103.0.
+ * CONFIGURE: Added query for time patch, made temp dir default to
+ /dev/shm instead of /tmp if JACK_SHM is set.
+ * PRE_BUILD: Added, apply time patch if requested.
+ * jack_time.patch: Added.
+ * PRE_SUB_DEPENDS, SUB_DEPENDS: Added, TIMEPATCH sub-dependency
+ for jackmidi_alsaseq.

2007-03-19 Juuso Alasuutari <iuso AT sourcemage.org>
* CONFLICTS: Added conflicts jackdmp.
diff --git a/audio-drivers/jack/PRE_BUILD b/audio-drivers/jack/PRE_BUILD
new file mode 100755
index 0000000..42bda22
--- /dev/null
+++ b/audio-drivers/jack/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+if [[ $JACK_TIME == y ]]
+then
+ patch -p1 < "$SCRIPT_DIRECTORY/jack_time.patch"
+fi
diff --git a/audio-drivers/jack/PRE_SUB_DEPENDS
b/audio-drivers/jack/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..65a4b2a
--- /dev/null
+++ b/audio-drivers/jack/PRE_SUB_DEPENDS
@@ -0,0 +1,4 @@
+case $THIS_SUB_DEPENDS in
+ TIMEPATCH) [[ $JACK_TIME == y ]] && return 0 ;;
+esac
+return 1
diff --git a/audio-drivers/jack/SUB_DEPENDS b/audio-drivers/jack/SUB_DEPENDS
new file mode 100755
index 0000000..849eff0
--- /dev/null
+++ b/audio-drivers/jack/SUB_DEPENDS
@@ -0,0 +1,8 @@
+case $THIS_SUB_DEPENDS in
+ TIMEPATCH) echo "Time patch requested, forcing option JACK_TIME=y." &&
+ JACK_TIME=y && persistent_add JACK_TIME
+ ;;
+ *) echo "Unknown sub-dependency '$THIS_SUB_DEPENDS'"!
+ return 1
+ ;;
+esac
diff --git a/audio-drivers/jack/jack_time.patch
b/audio-drivers/jack/jack_time.patch
new file mode 100644
index 0000000..c70ee25
--- /dev/null
+++ b/audio-drivers/jack/jack_time.patch
@@ -0,0 +1,111 @@
+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
new file mode 100755
index 0000000..8f58e6d
--- /dev/null
+++ b/audio-drivers/jackmidi_alsaseq/BUILD
@@ -0,0 +1 @@
+make
diff --git a/audio-drivers/jackmidi_alsaseq/DEPENDS
b/audio-drivers/jackmidi_alsaseq/DEPENDS
new file mode 100755
index 0000000..e66c165
--- /dev/null
+++ b/audio-drivers/jackmidi_alsaseq/DEPENDS
@@ -0,0 +1,4 @@
+depends alsa-lib &&
+depends jack &&
+
+sub_depends jack TIMEPATCH
diff --git a/audio-drivers/jackmidi_alsaseq/DETAILS
b/audio-drivers/jackmidi_alsaseq/DETAILS
new file mode 100755
index 0000000..d421340
--- /dev/null
+++ b/audio-drivers/jackmidi_alsaseq/DETAILS
@@ -0,0 +1,14 @@
+ 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
+
WEB_SITE=http://www.mail-archive.com/linux-audio-dev%40music.columbia.edu/msg23175.html
+ ENTERED=20070325
+ LICENSE[0]=GPL
+ KEYWORDS="drivers audio"
+ SHORT="ALSA Seq < - > JACK MIDI bridge."
+cat << EOF
+jackmidi_alsaseq acts as a bridge between JACK MIDI and ALSA sequencer.
+EOF
diff --git a/audio-drivers/jackmidi_alsaseq/HISTORY
b/audio-drivers/jackmidi_alsaseq/HISTORY
new file mode 100644
index 0000000..a00361c
--- /dev/null
+++ b/audio-drivers/jackmidi_alsaseq/HISTORY
@@ -0,0 +1,2 @@
+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
new file mode 100755
index 0000000..2726c09
--- /dev/null
+++ b/audio-drivers/jackmidi_alsaseq/INSTALL
@@ -0,0 +1 @@
+cp jackmidi_alsaseq "$INSTALL_ROOT/usr/bin/"



  • [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (190fe0d0b24aa59bc84c50f2526930cd44e297da), Juuso Alasuutari, 03/25/2007

Archive powered by MHonArc 2.6.24.

Top of Page