[SCM] rtmidi/master: Refresh 0001-buildsystem.patch.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit fbd393508e4e999b1fc94e5871b9c7471247f425
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat May 3 23:19:27 2014 +0100

    Refresh 0001-buildsystem.patch.

diff --git a/debian/patches/0001-buildsystem.patch b/debian/patches/0001-buildsystem.patch
index 1af71a7..e19f972 100644
--- a/debian/patches/0001-buildsystem.patch
+++ b/debian/patches/0001-buildsystem.patch
@@ -1,10 +1,10 @@
 ---
- Makefile.in  |   14 ++++++--------
+ Makefile.in  |   13 +++++--------
  RtMidi.cpp   |    4 ++--
  RtMidi.h     |   14 ++++++++++++--
- configure.ac |   15 +++++++++++----
+ configure.ac |   13 ++++++++++---
  rtmidi.pc.in |   14 ++++++++++++++
- 5 files changed, 45 insertions(+), 16 deletions(-)
+ 5 files changed, 43 insertions(+), 15 deletions(-)
 
 --- /dev/null
 +++ rtmidi/rtmidi.pc.in
@@ -25,27 +25,27 @@
 +Cflags: @api@
 --- rtmidi.orig/RtMidi.cpp
 +++ rtmidi/RtMidi.cpp
-@@ -123,7 +123,7 @@ void RtMidiIn :: openMidiApi( RtMidi::Ap
+@@ -115,7 +115,7 @@ void RtMidiIn :: openMidiApi( RtMidi::Ap
  #endif
  }
  
 -RtMidiIn :: RtMidiIn( RtMidi::Api api, const std::string clientName, unsigned int queueSizeLimit )
 +extern RTMIDI_DLL_PUBLIC RtMidiIn :: RtMidiIn( RtMidi::Api api, const std::string clientName, unsigned int queueSizeLimit )
+   : RtMidi()
  {
-   rtapi_ = 0;
- 
-@@ -197,7 +197,7 @@ void RtMidiOut :: openMidiApi( RtMidi::A
+   if ( api != UNSPECIFIED ) {
+@@ -184,7 +184,7 @@ void RtMidiOut :: openMidiApi( RtMidi::A
  #endif
  }
  
 -RtMidiOut :: RtMidiOut( RtMidi::Api api, const std::string clientName )
 +extern RTMIDI_DLL_PUBLIC RtMidiOut :: RtMidiOut( RtMidi::Api api, const std::string clientName )
  {
-   rtapi_ = 0;
- 
+   if ( api != UNSPECIFIED ) {
+     // Attempt to open the specified API.
 --- rtmidi.orig/RtMidi.h
 +++ rtmidi/RtMidi.h
-@@ -45,6 +45,16 @@
+@@ -43,6 +43,16 @@
  #ifndef RTMIDI_H
  #define RTMIDI_H
  
@@ -59,19 +59,19 @@
 +  #endif
 +#endif
 +
- #include "RtError.h"
- #include <string>
- #include <vector>
-@@ -131,7 +141,7 @@ class RtMidi
- class MidiInApi;
- class MidiOutApi;
+ #define RTMIDI_VERSION "2.1.0"
+ 
+ #include <exception>
+@@ -203,7 +213,7 @@ class RtMidi
+ //
+ // **************************************************************** //
  
 -class RtMidiIn : public RtMidi
 +class RTMIDI_DLL_PUBLIC RtMidiIn : public RtMidi
  {
   public:
  
-@@ -246,7 +256,7 @@ class RtMidiIn : public RtMidi
+@@ -345,7 +355,7 @@ class RtMidiIn : public RtMidi
  */
  /**********************************************************************/
  
@@ -82,15 +82,14 @@
  
 --- rtmidi.orig/Makefile.in
 +++ rtmidi/Makefile.in
-@@ -6,29 +6,27 @@ LN = /bin/ln
- 
+@@ -7,32 +7,29 @@ LN = /bin/ln
  OBJECTS	= RtMidi.o
  
--STATIC = librtmidi.a
+ LIBNAME = librtmidi
+-STATIC = $(LIBNAME).a
  SHARED = @sharedlib@
--RELEASE = 2.0.0
-+RELEASE = 2.0.1
- MAJOR = 1
+ RELEASE = 2.1.0
+ MAJOR = 2
 -LIBRARIES = $(STATIC) $(SHARED)
 +LIBRARIES = $(SHARED)
  
@@ -102,6 +101,8 @@
 -CFLAGS   = @CXXFLAGS@ -Iinclude -fPIC
 +CFLAGS   += @CXXFLAGS@ -Iinclude -fPIC
  
+ PREFIX   = @prefix@
+ 
  all : $(LIBRARIES)
  
 -tests:
@@ -113,6 +114,7 @@
 -	ranlib $(STATIC)
  	$(CC) -fPIC @libflags@ $(OBJECTS) @LIBS@
 -	$(LN) -sf @sharedname@ $(SHARED)
+-	$(LN) -sf @sharedname@ $(SHARED).$(MAJOR)
 +	$(LN) -s @sharedname at .$(RELEASE) $(SHARED)
 +	$(LN) -s @sharedname at .$(RELEASE) $(SHARED).$(MAJOR)
  
@@ -122,12 +124,12 @@
 +++ rtmidi/configure.ac
 @@ -1,5 +1,6 @@
  # Process this file with autoconf to produce a configure script.
- AC_INIT(RtMidi, 2.0, gary at music.mcgill.ca, rtmidi)
-+AC_SUBST(VERSION, [2.0.1])
+ AC_INIT(RtMidi, 2.1.0, gary at music.mcgill.ca, rtmidi)
++AC_SUBST(VERSION, [2.1.0])
  AC_CONFIG_AUX_DIR(config)
  AC_CONFIG_SRCDIR(RtMidi.cpp)
- AC_CONFIG_FILES(rtmidi-config Makefile tests/Makefile)
-@@ -44,8 +45,8 @@ CXXFLAGS="$CXXFLAGS $cxxflag"
+ AC_CONFIG_FILES([rtmidi-config librtmidi.pc Makefile tests/Makefile])
+@@ -50,8 +51,8 @@ CXXFLAGS="$CXXFLAGS $cxxflag"
  AC_CANONICAL_HOST
  
  AC_SUBST( sharedlib, ["librtmidi.so"] )
@@ -138,11 +140,12 @@
  case $host in
    *-apple*)
    AC_SUBST( sharedlib, ["librtmidi.dylib"] )
-@@ -54,13 +55,19 @@ case $host in
+@@ -60,14 +61,20 @@ case $host in
  esac
  
  AC_SUBST( api, [""] )
 +AC_SUBST( pc_requires, [""] )
+ AC_SUBST( req, [""] )
  AC_MSG_CHECKING(for MIDI API)
  case $host in
    *-*-linux*)
@@ -159,10 +162,3 @@
  
    # Look for ALSA flag
    AC_ARG_WITH(alsa, [  --with-alsa = choose native ALSA sequencer API support (linux only)], [
-@@ -136,4 +143,4 @@ CPPFLAGS="$CPPFLAGS $api"
- 
- AC_OUTPUT
- 
--chmod oug+x rtmidi-config
-\ No newline at end of file
-+chmod oug+x rtmidi-config

-- 
RtMidi packaging