[SCM] portmidi/master: Refresh patches.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a0cd1af84d75bb26a349e1b1ead8e2b992844be9
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Oct 16 11:40:46 2014 +0100

    Refresh patches.

diff --git a/debian/patches/01_pmlinux.diff b/debian/patches/01_pmlinux.diff
index 3e58b50..db8ac3c 100644
--- a/debian/patches/01_pmlinux.diff
+++ b/debian/patches/01_pmlinux.diff
@@ -1,8 +1,12 @@
---- portmidi-20041117.orig/pm_linux/pmlinux.c
-+++ portmidi-20041117/pm_linux/pmlinux.c
-@@ -20,10 +20,10 @@
- PmError pm_init()
- {
+---
+ pm_linux/pmlinux.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- portmidi.orig/pm_linux/pmlinux.c
++++ portmidi/pm_linux/pmlinux.c
+@@ -34,10 +34,10 @@ void pm_init()
+      * devices.
+      */
      #ifdef PMALSA
 -	pm_linuxalsa_init();
 +	return pm_linuxalsa_init();
@@ -11,5 +15,5 @@
 -        pm_linuxnull_init();
 +        return pm_linuxnull_init();
      #endif
- }
- 
+     // this is set when we return to Pm_Initialize, but we need it
+     // now in order to (successfully) call Pm_CountDevices()
diff --git a/debian/patches/02_pmlinuxalsa.diff b/debian/patches/02_pmlinuxalsa.diff
index dd8d541..a0bac58 100644
--- a/debian/patches/02_pmlinuxalsa.diff
+++ b/debian/patches/02_pmlinuxalsa.diff
@@ -1,6 +1,10 @@
---- portmidi~/pm_linux/pmlinuxalsa.c	2009-09-16 05:41:04.000000000 +0200
-+++ portmidi/pm_linux/pmlinuxalsa.c	2009-09-16 05:45:29.000000000 +0200
-@@ -243,8 +243,8 @@
+---
+ pm_linux/pmlinuxalsa.c |   12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+--- portmidi.orig/pm_linux/pmlinuxalsa.c
++++ portmidi/pm_linux/pmlinuxalsa.c
+@@ -242,8 +242,8 @@ static PmError alsa_out_close(PmInternal
      alsa_descriptor_type desc = (alsa_descriptor_type) midi->descriptor;
      if (!desc) return pmBadPtr;
  
@@ -11,7 +15,7 @@
          // if there's an error, try to delete the port anyway, but don't
          // change the pm_hosterror value so we retain the first error
          snd_seq_delete_port(seq, desc->this_port);
-@@ -333,8 +333,8 @@
+@@ -332,8 +332,8 @@ static PmError alsa_in_close(PmInternal
  {
      alsa_descriptor_type desc = (alsa_descriptor_type) midi->descriptor;
      if (!desc) return pmBadPtr;
@@ -22,7 +26,7 @@
          snd_seq_delete_port(seq, desc->this_port); /* try to close port */
      } else {
          pm_hosterror = snd_seq_delete_port(seq, desc->this_port);
-@@ -421,7 +421,7 @@
+@@ -420,7 +420,7 @@ static PmError alsa_write(PmInternal *mi
      }
      if (desc->error < 0) return pmHostError;
  
@@ -31,7 +35,7 @@
      desc->error = snd_seq_drain_output(seq);
      if (desc->error < 0) return pmHostError;
  
-@@ -607,7 +607,7 @@
+@@ -606,7 +606,7 @@ static void handle_event(snd_seq_event_t
      case SND_SEQ_EVENT_SYSEX: {
          const BYTE *ptr = (const BYTE *) ev->data.ext.ptr;
          /* assume there is one sysex byte to process */

-- 
portmidi packaging