[SCM] toonloop/master: Refresh 0003-rtmidi.patch to extend the fix to configure.ac.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Wed Feb 8 16:25:16 UTC 2012


The following commit has been merged in the master branch:
commit a2cfc9282edd2bc7261937898aad5d33068a84e6
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Feb 8 17:24:49 2012 +0100

    Refresh 0003-rtmidi.patch to extend the fix to configure.ac.

diff --git a/debian/patches/0003-rtmidi.patch b/debian/patches/0003-rtmidi.patch
index 9afca45..d1aecf2 100644
--- a/debian/patches/0003-rtmidi.patch
+++ b/debian/patches/0003-rtmidi.patch
@@ -1,8 +1,9 @@
 Description: Link against rtmidi to avoid FTBFS.
 Author: Alessio Treglia <alessio at debian.org>
 ---
- configure |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ configure    |    4 ++--
+ configure.ac |    4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
 
 --- toonloop.orig/configure
 +++ toonloop/configure
@@ -24,3 +25,19 @@ Author: Alessio Treglia <alessio at debian.org>
  
  else
    as_fn_error $? "libstk is not installed: alsa" "$LINENO" 5
+--- toonloop.orig/configure.ac
++++ toonloop/configure.ac
+@@ -40,11 +40,11 @@ AC_CHECK_LIB([m],[sin],[AC_SUBST([LIBM_C
+ AC_LANG_PUSH(C++)
+ # save original flags
+ SAVED_LIBS=$LIBS
+-LIBS="$LIBS -lstk"
++LIBS="$LIBS -lstk -lrtmidi"
+ AC_LINK_IFELSE(
+         [AC_LANG_PROGRAM([ #include <stk/RtMidi.h> ],
+         [RtMidiIn input])],
+-        [AC_SUBST(STK_LIBS," -lstk -lrt -lm")],
++        [AC_SUBST(STK_LIBS," -lstk -lrtmidi -lrt -lm")],
+         [AC_MSG_ERROR([libstk is not installed: alsa])])
+ LIBS=$SAVED_LIBS # restore them
+ AC_SUBST(STK_CXXFLAGS, "-D__LINUX_ALSA__ -D__UNIX_JACK__ -D__LITTLE_ENDIAN__")

-- 
toonloop packaging



More information about the pkg-multimedia-commits mailing list