[SCM] rtmidi/master: Fixed configure.ac patch

umlaeute at users.alioth.debian.org umlaeute at users.alioth.debian.org
Thu Oct 5 22:05:16 UTC 2017


The following commit has been merged in the master branch:
commit cb80092d35b08aaf5ef80cc2203a2d51867dd166
Author: IOhannes m zmölnig (Debian/GNU) <umlaeute at debian.org>
Date:   Fri Oct 6 00:04:37 2017 +0200

    Fixed configure.ac patch

diff --git a/debian/patches/0001-buildsystem.patch b/debian/patches/0001-buildsystem.patch
index 8ad9c29..31781ab 100644
--- a/debian/patches/0001-buildsystem.patch
+++ b/debian/patches/0001-buildsystem.patch
@@ -6,11 +6,9 @@
  rtmidi.pc.in |   14 ++++++++++++++
  5 files changed, 43 insertions(+), 15 deletions(-)
 
-Index: rtmidi/RtMidi.cpp
-===================================================================
 --- rtmidi.orig/RtMidi.cpp
 +++ rtmidi/RtMidi.cpp
-@@ -124,7 +124,7 @@ void RtMidiIn :: openMidiApi( RtMidi::Ap
+@@ -124,7 +124,7 @@
  #endif
  }
  
@@ -19,7 +17,7 @@ Index: rtmidi/RtMidi.cpp
    : RtMidi()
  {
    if ( api != UNSPECIFIED ) {
-@@ -192,7 +192,7 @@ void RtMidiOut :: openMidiApi( RtMidi::A
+@@ -192,7 +192,7 @@
  #endif
  }
  
@@ -28,8 +26,6 @@ Index: rtmidi/RtMidi.cpp
  {
    if ( api != UNSPECIFIED ) {
      // Attempt to open the specified API.
-Index: rtmidi/RtMidi.h
-===================================================================
 --- rtmidi.orig/RtMidi.h
 +++ rtmidi/RtMidi.h
 @@ -43,6 +43,16 @@
@@ -49,7 +45,7 @@ Index: rtmidi/RtMidi.h
  #define RTMIDI_VERSION "3.0.0"
  
  #include <exception>
-@@ -207,7 +217,7 @@ class RtMidi
+@@ -207,7 +217,7 @@
  //
  // **************************************************************** //
  
@@ -58,7 +54,7 @@ Index: rtmidi/RtMidi.h
  {
   public:
  
-@@ -354,7 +364,7 @@ class RtMidiIn : public RtMidi
+@@ -354,7 +364,7 @@
  */
  /**********************************************************************/
  
@@ -67,18 +63,9 @@ Index: rtmidi/RtMidi.h
  {
   public:
  
-Index: rtmidi/configure.ac
-===================================================================
 --- rtmidi.orig/configure.ac
 +++ rtmidi/configure.ac
-@@ -1,5 +1,6 @@
- # Process this file with autoconf to produce a configure script.
- 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])
-@@ -109,14 +110,20 @@ AC_CONFIG_LINKS( [doc/images/mcgill.gif:
+@@ -109,14 +109,20 @@
  AC_CANONICAL_HOST
  
  AC_SUBST( api, [""] )

-- 
RtMidi packaging



More information about the pkg-multimedia-commits mailing list