- Update to version 0.9.4

PR:		170134
Submitted by:	Ports Fury

8 files changed, 134 insertions, 10 deletions

diff --git a/audio/denemo/files/patch-src__alsabackend.h b/audio/denemo/files/patch-src__alsabackend.h
new file mode 100644
index 000000000000..1e48eb4c289b
--- /dev/null
+++ b/audio/denemo/files/patch-src__alsabackend.h
@@ -0,0 +1,26 @@
+--- src/alsabackend.h
++++ src/alsabackend.h
+@@ -0,0 +1,23 @@
++/*
++ * alsabackend.h
++ * ALSA sequencer MIDI backend.
++ *
++ * for Denemo, a gtk+ frontend to GNU Lilypond
++ * Copyright (C) 2011  Dominic Sacré
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation, either version 3 of the License, or
++ * (at your option) any later version.
++ */
++
++#ifndef ALSABACKEND_H
++#define ALSABACKEND_H
++
++#include "audiointerface.h"
++
++extern backend_t alsa_seq_midi_backend;
++
++
++#endif // ALSABACKEND_H
++
diff --git a/audio/denemo/files/patch-src__audiointerface.c b/audio/denemo/files/patch-src__audiointerface.c
new file mode 100644
index 000000000000..8866c0d34af3
--- /dev/null
+++ b/audio/denemo/files/patch-src__audiointerface.c
@@ -0,0 +1,10 @@
+--- src/audiointerface.c.orig	2012-09-20 22:44:28.771017000 +0900
++++ src/audiointerface.c	2012-10-05 06:05:30.000000000 +0900
+@@ -14,6 +14,7 @@
+ #include "audiointerface.h"
+ #include "eventqueue.h"
+ #include "dummybackend.h"
++#include "sourceaudio.h"
+ 
+ #ifdef _HAVE_JACK_
+   #include "jackbackend.h"
diff --git a/audio/denemo/files/patch-src__audiointerface.h b/audio/denemo/files/patch-src__audiointerface.h
new file mode 100644
index 000000000000..2c43223e7b04
--- /dev/null
+++ b/audio/denemo/files/patch-src__audiointerface.h
@@ -0,0 +1,12 @@
+--- src/audiointerface.h.orig	2012-09-20 22:44:28.775017000 +0900
++++ src/audiointerface.h	2012-10-05 06:05:30.000000000 +0900
+@@ -228,6 +228,9 @@
+ gboolean read_event_from_queue(backend_type_t backend, unsigned char *event_buffer, size_t *event_length,
+                                double *event_time, double until_time);
+ 
++gboolean read_event_from_mixer_queue(backend_type_t backend, unsigned char *event_buffer, size_t *event_length,
++                               double *event_time, double until_time);
++
+ /**
+  * Called by a backend to notify the audio subsystem that the current playback
+  * time changed. Usually this is called once per period during playback.
diff --git a/audio/denemo/files/patch-src__eventqueue.c b/audio/denemo/files/patch-src__eventqueue.c
new file mode 100644
index 000000000000..4edf51e5652d
--- /dev/null
+++ b/audio/denemo/files/patch-src__eventqueue.c
@@ -0,0 +1,10 @@
+--- src/eventqueue.c.orig	2012-09-20 22:44:28.795017000 +0900
++++ src/eventqueue.c	2012-10-05 06:05:30.000000000 +0900
+@@ -13,6 +13,7 @@
+ 
+ #include "eventqueue.h"
+ #include "midi.h"
++#include "moveviewport.h"
+ 
+ #include <glib.h>
+ #include <string.h>
diff --git a/audio/denemo/files/patch-src__jackbackend.h b/audio/denemo/files/patch-src__jackbackend.h
new file mode 100644
index 000000000000..55f2336841c8
--- /dev/null
+++ b/audio/denemo/files/patch-src__jackbackend.h
@@ -0,0 +1,26 @@
+--- src/jackbackend.h
++++ src/jackbackend.h
+@@ -0,0 +1,23 @@
++/*
++ * jackbackend.h
++ * JACK audio and MIDI backends.
++ *
++ * for Denemo, a gtk+ frontend to GNU Lilypond
++ * Copyright (C) 2011  Dominic Sacré
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation, either version 3 of the License, or
++ * (at your option) any later version.
++ */
++
++#ifndef JACKBACKEND_H
++#define JACKBACKEND_H
++
++#include "audiointerface.h"
++
++extern backend_t jack_audio_backend;
++extern backend_t jack_midi_backend;
++
++
++#endif // JACKBACKEND_H
diff --git a/audio/denemo/files/patch-src__jackmidi.c b/audio/denemo/files/patch-src__jackmidi.c
deleted file mode 100644
index e1bd8f92d4b8..000000000000
--- a/audio/denemo/files/patch-src__jackmidi.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/jackmidi.c.orig	2011-04-27 19:59:45.083923000 +0200
-+++ src/jackmidi.c	2011-05-07 10:44:07.000000000 +0200
-@@ -7,6 +7,7 @@
- #include <math.h>
- #include <string.h>
- #include <assert.h>
-+#include <sys/time.h>
- #include "exportmidi.h"
- #include "jackmidi.h"
- #include "pitchentry.h"
diff --git a/audio/denemo/files/patch-src__jackutil.h b/audio/denemo/files/patch-src__jackutil.h
new file mode 100644
index 000000000000..75de1aaa15c1
--- /dev/null
+++ b/audio/denemo/files/patch-src__jackutil.h
@@ -0,0 +1,40 @@
+--- src/jackutil.h
++++ src/jackutil.h
+@@ -0,0 +1,37 @@
++/*
++ * jackutil.h
++ * JACK utility functions.
++ *
++ * for Denemo, a gtk+ frontend to GNU Lilypond
++ * Copyright (C) 2011  Dominic Sacré
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation, either version 3 of the License, or
++ * (at your option) any later version.
++ */
++
++#ifndef JACKUTIL_H
++#define JACKUTIL_H
++
++#include <glib.h>
++
++/**
++ * Returns a list of available JACK port names, that is, ports to which our
++ * own input/output ports can be connected.
++ *
++ * If the JACK server is not running or there are no available ports, this
++ * function returns NULL.
++ *
++ * @param midi    if TRUE returns MIDI ports, otherwise audio ports.
++ * @param output  if TRUE returns output ports, otherwise input ports.
++ */
++GList *get_jack_ports(gboolean midi, gboolean output);
++
++/**
++ * Frees a list returned by get_jack_ports()
++ */
++void free_jack_ports(GList *list);
++
++
++#endif // JACKUTIL_H
diff --git a/audio/denemo/files/patch-src__portaudiobackend.c b/audio/denemo/files/patch-src__portaudiobackend.c
new file mode 100644
index 000000000000..c30f1d6c9412
--- /dev/null
+++ b/audio/denemo/files/patch-src__portaudiobackend.c
@@ -0,0 +1,10 @@
+--- src/portaudiobackend.c.orig	2012-09-20 22:44:28.823018000 +0900
++++ src/portaudiobackend.c	2012-10-05 06:05:30.000000000 +0900
+@@ -16,6 +16,7 @@
+ #include "portaudioutil.h"
+ #include "midi.h"
+ #include "fluid.h"
++#include "audiointerface.h"
+ 
+ #include <portaudio.h>
+ #include <glib.h>