[SCM] rtmidi/master: Patches refreshed/removed.

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Tue Jun 21 20:39:15 UTC 2016 

The following commit has been merged in the master branch:
commit c0ed916788303a22351c4600ede8cfff184a5643
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Jun 21 21:25:37 2016 +0200

    Patches refreshed/removed.

diff --git a/debian/patches/0001-buildsystem.patch b/debian/patches/0001-buildsystem.patch
index 4ad4d32..84bb7cd 100644
--- a/debian/patches/0001-buildsystem.patch
+++ b/debian/patches/0001-buildsystem.patch
@@ -6,26 +6,11 @@
  rtmidi.pc.in |   14 ++++++++++++++
  5 files changed, 43 insertions(+), 15 deletions(-)
 
---- /dev/null
-+++ b/rtmidi.pc.in
-@@ -0,0 +1,14 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: rtmidi
-+Description: Library for realtime MIDI input/output
-+Version: @VERSION@
-+URL: http://www.music.mcgill.ca/~gary/rtmidi/index.html
-+Requires: @pc_requires@
-+Conflicts:
-+Libs: -L${libdir} -l at SONAME@
-+Libs.private:
-+Cflags: @api@
---- a/RtMidi.cpp
-+++ b/RtMidi.cpp
-@@ -115,7 +115,7 @@
+Index: rtmidi/RtMidi.cpp
+===================================================================
+--- rtmidi.orig/RtMidi.cpp
++++ rtmidi/RtMidi.cpp
+@@ -122,7 +122,7 @@ void RtMidiIn :: openMidiApi( RtMidi::Ap
  #endif
  }
  
@@ -34,7 +19,7 @@
    : RtMidi()
  {
    if ( api != UNSPECIFIED ) {
-@@ -184,7 +184,7 @@
+@@ -191,7 +191,7 @@ void RtMidiOut :: openMidiApi( RtMidi::A
  #endif
  }
  
@@ -43,8 +28,10 @@
  {
    if ( api != UNSPECIFIED ) {
      // Attempt to open the specified API.
---- a/RtMidi.h
-+++ b/RtMidi.h
+Index: rtmidi/RtMidi.h
+===================================================================
+--- rtmidi.orig/RtMidi.h
++++ rtmidi/RtMidi.h
 @@ -43,6 +43,16 @@
  #ifndef RTMIDI_H
  #define RTMIDI_H
@@ -59,10 +46,10 @@
 +  #endif
 +#endif
 +
- #define RTMIDI_VERSION "2.1.0"
+ #define RTMIDI_VERSION "2.1.1"
  
  #include <exception>
-@@ -203,7 +213,7 @@
+@@ -203,7 +213,7 @@ class RtMidi
  //
  // **************************************************************** //
  
@@ -71,7 +58,7 @@
  {
   public:
  
-@@ -345,7 +355,7 @@
+@@ -345,7 +355,7 @@ class RtMidiIn : public RtMidi
  */
  /**********************************************************************/
  
@@ -80,59 +67,19 @@
  {
   public:
  
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -7,32 +7,30 @@
- OBJECTS	= RtMidi.o
- 
- LIBNAME = librtmidi
--STATIC = $(LIBNAME).a
- SHARED = @sharedlib@
- RELEASE = 2.1.0
- MAJOR = 2
--LIBRARIES = $(STATIC) $(SHARED)
-+LIBRARIES = $(SHARED)
- 
- CC       = @CXX@
- AR       = @AR@
- RANLIB   = @RANLIB@
- 
- DEFS     = @CPPFLAGS@
--CFLAGS   = @CXXFLAGS@ -Iinclude -fPIC
-+CFLAGS   += @CXXFLAGS@ -Iinclude -fPIC
-+LDFLAGS  = @LDFLAGS@
- 
- PREFIX   = @prefix@
- 
- all : $(LIBRARIES)
- 
--tests:
-+check:
- 	cd tests && $(MAKE) all
- 
- $(LIBRARIES): $(OBJECTS)
--	$(AR) ruv $(STATIC) $(OBJECTS)
--	ranlib $(STATIC)
--	$(CC) -fPIC @libflags@ $(OBJECTS) @LIBS@
--	$(LN) -sf @sharedname@ $(SHARED)
--	$(LN) -sf @sharedname@ $(SHARED).$(MAJOR)
-+	$(CC) -fPIC @libflags@ $(LDFLAGS) $(OBJECTS) @LIBS@
-+	$(LN) -s @sharedname@ $(SHARED)
-+	$(LN) -s @sharedname@ $(SHARED).$(MAJOR)
- 
- #	$(CC) -shared $(OBJECTS) -o $(SHARED) @LIBS@
- 
---- a/configure.ac
-+++ b/configure.ac
+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, 2.1.0, gary at music.mcgill.ca, rtmidi)
-+AC_SUBST(VERSION, [2.1.0])
+ AC_INIT(RtMidi, 2.1.1, gary at music.mcgill.ca, rtmidi)
++AC_SUBST(VERSION, [2.1.1])
  AC_CONFIG_AUX_DIR(config)
  AC_CONFIG_SRCDIR(RtMidi.cpp)
- AC_CONFIG_FILES([rtmidi-config librtmidi.pc Makefile tests/Makefile])
-@@ -60,14 +61,20 @@
- esac
+ 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:
+ AC_CANONICAL_HOST
  
  AC_SUBST( api, [""] )
 +AC_SUBST( pc_requires, [""] )
diff --git a/debian/patches/0002-ppc64_support.patch b/debian/patches/0002-ppc64_support.patch
index a54c60c..62b83d1 100644
--- a/debian/patches/0002-ppc64_support.patch
+++ b/debian/patches/0002-ppc64_support.patch
@@ -5,29 +5,13 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=693592
  config/config.sub |    8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
 
+Index: rtmidi/config/config.sub
+===================================================================
 --- rtmidi.orig/config/config.sub
 +++ rtmidi/config/config.sub
-@@ -225,7 +225,7 @@ case $basic_machine in
- 		| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
- 		| alphaev6[78] \
- 		| we32k | ns16k | clipper | i370 | sh | sh[34] \
--		| powerpc | powerpcle \
-+		| powerpc | powerpc64 | powerpcle \
- 		| 1750a | dsp16xx | pdp10 | pdp11 \
- 		| mips16 | mips64 | mipsel | mips64el \
- 		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
-@@ -271,7 +271,7 @@ case $basic_machine in
- 	      | alphaev6[78]-* \
- 	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
- 	      | clipper-* | orion-* \
--	      | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
-+	      | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpc64-* | powerpcle-* \
- 	      | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \
- 	      | mips16-* | mips64-* | mipsel-* \
- 	      | mips64el-* | mips64orion-* | mips64orionel-* \
-@@ -721,6 +721,10 @@ case $basic_machine in
- 	        ;;
- 	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+@@ -1017,6 +1017,10 @@ case $basic_machine in
+ 	ppc-* | ppcbe-*)
+ 		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
 +	ppc64)	basic_machine=powerpc64-unknown
 +		;;
@@ -35,4 +19,4 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=693592
 +		;;
  	ppcle | powerpclittle | ppc-le | powerpc-little)
  		basic_machine=powerpcle-unknown
- 	        ;;
+ 		;;
diff --git a/debian/patches/series b/debian/patches/series
index 165efbb..34584a8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-buildsystem.patch
 0002-ppc64_support.patch
-0003-gcc-5.patch
+#0003-gcc-5.patch
+0004-not-install-doc-images.patch

-- 
RtMidi packaging

More information about the pkg-multimedia-commits mailing list