[SCM] rtmidi/master: Patches refreshed.

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ca2f5b9a2432663d7d1842a0fb71a980b443c5ec
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Thu Oct 5 21:00:18 2017 +0200

    Patches refreshed.

diff --git a/debian/patches/0001-buildsystem.patch b/debian/patches/0001-buildsystem.patch
index 84bb7cd..8ad9c29 100644
--- a/debian/patches/0001-buildsystem.patch
+++ b/debian/patches/0001-buildsystem.patch
@@ -10,21 +10,21 @@ Index: rtmidi/RtMidi.cpp
 ===================================================================
 --- rtmidi.orig/RtMidi.cpp
 +++ rtmidi/RtMidi.cpp
-@@ -122,7 +122,7 @@ void RtMidiIn :: openMidiApi( RtMidi::Ap
+@@ -124,7 +124,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 )
+-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()
  {
    if ( api != UNSPECIFIED ) {
-@@ -191,7 +191,7 @@ void RtMidiOut :: openMidiApi( RtMidi::A
+@@ -192,7 +192,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 )
+-RtMidiOut :: RtMidiOut( RtMidi::Api api, const std::string &clientName)
++extern RTMIDI_DLL_PUBLIC RtMidiOut :: RtMidiOut( RtMidi::Api api, const std::string &clientName)
  {
    if ( api != UNSPECIFIED ) {
      // Attempt to open the specified API.
@@ -46,10 +46,10 @@ Index: rtmidi/RtMidi.h
 +  #endif
 +#endif
 +
- #define RTMIDI_VERSION "2.1.1"
+ #define RTMIDI_VERSION "3.0.0"
  
  #include <exception>
-@@ -203,7 +213,7 @@ class RtMidi
+@@ -207,7 +217,7 @@ class RtMidi
  //
  // **************************************************************** //
  
@@ -58,7 +58,7 @@ Index: rtmidi/RtMidi.h
  {
   public:
  
-@@ -345,7 +355,7 @@ class RtMidiIn : public RtMidi
+@@ -354,7 +364,7 @@ class RtMidiIn : public RtMidi
  */
  /**********************************************************************/
  
@@ -73,30 +73,30 @@ Index: rtmidi/configure.ac
 +++ rtmidi/configure.ac
 @@ -1,5 +1,6 @@
  # Process this file with autoconf to produce a configure script.
- AC_INIT(RtMidi, 2.1.1, gary at music.mcgill.ca, rtmidi)
-+AC_SUBST(VERSION, [2.1.1])
+ AC_INIT(RtMidi, 3.0.0, gary at music.mcgill.ca, rtmidi)
++AC_SUBST(VERSION, [3.0.0]
  AC_CONFIG_AUX_DIR(config)
  AC_CONFIG_SRCDIR(RtMidi.cpp)
  AC_CONFIG_FILES([rtmidi-config rtmidi.pc Makefile tests/Makefile doc/Makefile doc/doxygen/Doxyfile])
-@@ -102,14 +103,20 @@ AC_CONFIG_LINKS( [doc/images/mcgill.gif:
+@@ -109,14 +110,20 @@ AC_CONFIG_LINKS( [doc/images/mcgill.gif:
  AC_CANONICAL_HOST
  
  AC_SUBST( api, [""] )
 +AC_SUBST( pc_requires, [""] )
  AC_SUBST( req, [""] )
  AC_MSG_CHECKING(for MIDI API)
+ 
+ AC_ARG_WITH(jack, [  --with-jack = choose JACK server support (mac and linux only)])
+ AS_IF([test "x$with_jack" == "xyes"], [
+ api="$api -D__UNIX_JACK__"
++pc_requires="$pc_requires"
+ AC_MSG_RESULT(using JACK)
+-AC_CHECK_LIB(jack, jack_client_open, , AC_MSG_ERROR(JACK support requires the jack library!))])
++AC_CHECK_LIB(jack, jack_client_open, , AC_MSG_ERROR(JACK support requires the jack library!))
++AC_SUBST(PC_FILE, [rtmidi.pc])
++AC_SUBST(pc_requires, [jack])
++AC_SUBST(SONAME, [rtmidi])
++AC_CONFIG_FILES($PC_FILE:rtmidi.pc.in)] , )
+ 
  case $host in
    *-*-linux*)
-   AC_ARG_WITH(jack, [  --with-jack = choose JACK server support (mac and linux only)], [
-   api="$api -D__UNIX_JACK__"
-+  pc_requires="$pc_requires"
-   AC_MSG_RESULT(using JACK)
--  AC_CHECK_LIB(jack, jack_client_open, , AC_MSG_ERROR(JACK support requires the jack library!))], )
-+  AC_CHECK_LIB(jack, jack_client_open, , AC_MSG_ERROR(JACK support requires the jack library!))
-+  AC_SUBST(PC_FILE, [rtmidi.pc])
-+  AC_SUBST(pc_requires, [jack])
-+  AC_SUBST(SONAME, [rtmidi])
-+  AC_CONFIG_FILES($PC_FILE:rtmidi.pc.in)] , )
- 
-   # Look for ALSA flag
-   AC_ARG_WITH(alsa, [  --with-alsa = choose native ALSA sequencer API support (linux only)], [
diff --git a/debian/patches/0004-not-install-doc-images.patch b/debian/patches/0004-not-install-doc-images.patch
index 70fc7dd..765245a 100644
--- a/debian/patches/0004-not-install-doc-images.patch
+++ b/debian/patches/0004-not-install-doc-images.patch
@@ -6,7 +6,7 @@ Index: rtmidi/configure.ac
 ===================================================================
 --- rtmidi.orig/configure.ac
 +++ rtmidi/configure.ac
-@@ -96,8 +96,8 @@ AM_CONDITIONAL( MAKE_DOC, [test "x${DOXY
+@@ -103,8 +103,8 @@ AM_CONDITIONAL( MAKE_DOC, [test "x${DOXY
  AC_CONFIG_LINKS( [doc/doxygen/footer.html:doc/doxygen/footer.html] )
  AC_CONFIG_LINKS( [doc/doxygen/header.html:doc/doxygen/header.html] )
  AC_CONFIG_LINKS( [doc/doxygen/tutorial.txt:doc/doxygen/tutorial.txt] )
diff --git a/debian/patches/0006-hardening.patch b/debian/patches/0006-hardening.patch
index 8ec0062..52331e0 100644
--- a/debian/patches/0006-hardening.patch
+++ b/debian/patches/0006-hardening.patch
@@ -6,7 +6,7 @@ Index: rtmidi/configure.ac
 ===================================================================
 --- rtmidi.orig/configure.ac
 +++ rtmidi/configure.ac
-@@ -78,8 +78,8 @@ fi
+@@ -85,8 +85,8 @@ fi
  CPPFLAGS="$CPPFLAGS $cppflag"
  
  # For debugging and optimization ... overwrite default because it has both -g and -O2

-- 
RtMidi packaging