[SCM] phasex/master: remove 11-fix_portamento.patch, applied upstream.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 3ec39ba654e3b7fc430c2c0fccd463e3b2ee7e22
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Jan 12 20:11:44 2013 +0000

    remove 11-fix_portamento.patch, applied upstream.

diff --git a/debian/patches/11-fix_portamento.patch b/debian/patches/11-fix_portamento.patch
deleted file mode 100644
index 13e0d3d..0000000
--- a/debian/patches/11-fix_portamento.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Description: Fixed portamento calculation with Osc's 'off' state & in
- 'MonoRetrig' mode.
-Origin: upstream, https://github.com/disabled/phasex-dev/commit/300fc5e99102a7
-Applied-Upstream: yes
----
- src/engine.c |    7 +++++--
- src/midi.c   |    2 +-
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
---- phasex.orig/src/engine.c
-+++ phasex/src/engine.c
-@@ -658,10 +658,8 @@ engine_thread(void *arg) {
- 		switch (patch->osc_freq_base[osc]) {
- 
- 		case FREQ_BASE_MIDI_KEY:
--		    /* handle portamento if necessary */
- 		    if (voice[v].portamento_sample > 0) {
- 			voice[v].osc_freq[osc] += voice[v].osc_portamento[osc];
--			voice[v].portamento_sample--;
- 		    }
- 		    /* otherwise set frequency directly */
- 		    else {
-@@ -818,6 +816,11 @@ engine_thread(void *arg) {
- 
- 	    }
- 
-+		/* handle portamento if necessary */
-+		if (voice[v].portamento_sample > 0) {
-+		    voice[v].portamento_sample -= 4;
-+		}
-+
- 	    /* oscs are mixed.  now apply AM oscs. */ 
- 	    for (osc = 0; osc < NUM_OSCS; osc++) {
- 		if (patch->osc_modulation[osc] == MOD_TYPE_AM) {
---- phasex.orig/src/midi.c
-+++ phasex/src/midi.c
-@@ -918,7 +918,7 @@ midi_thread(void *arg) {
- 				/* note: patch->osc_transpose[osc] is taken into account every sample in the engine */
- 				if ((patch->portamento > 0)) {
- 				    /* in poly, portamento always starts from previous key hit, no matter which voice */
--				    if (patch->keymode == KEYMODE_POLY) {
-+				    if ((patch->keymode == KEYMODE_POLY) || (patch->keymode == KEYMODE_MONO_RETRIGGER)) {
- 					if (part.prev_key == -1) {
- 					    voice[v].osc_freq[osc] = freq_table[patch->master_tune_cc][256 + part.last_key + patch->transpose];
- 					}
diff --git a/debian/patches/series b/debian/patches/series
index e22b9d6..66a149f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 02-gcc_flags.patch
 03-binutils_gold.patch
-11-fix_portamento.patch
 12-drop_lash.patch

-- 
phasex packaging