[SCM] rtmidi/master: Fix FTCBS (Closes: #877386).

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Tue Oct 3 07:27:22 UTC 2017


The following commit has been merged in the master branch:
commit 6fe85495a4526a225fc7e85482b7271e354cfade
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Oct 3 09:23:33 2017 +0200

    Fix FTCBS (Closes: #877386).

diff --git a/debian/patches/0007-cross.patch b/debian/patches/0007-cross.patch
new file mode 100644
index 0000000..932fab6
--- /dev/null
+++ b/debian/patches/0007-cross.patch
@@ -0,0 +1,24 @@
+Description: Fix cross building
+Author: Helmut Grohne <helmut at subdivi.de>
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=877386
+Forwarded: no
+
+Index: rtmidi-2.1.1~ds0/configure.ac
+===================================================================
+--- rtmidi-2.1.1~ds0.orig/configure.ac
++++ rtmidi-2.1.1~ds0/configure.ac
+@@ -31,11 +31,9 @@
+ 
+ # Check version number coherency between RtMidi.h and configure.ac
+ AC_MSG_CHECKING([that version numbers are coherent])
+-AC_RUN_IFELSE(
+-   [AC_LANG_PROGRAM([#include <string.h>
+-                     `grep "define RTMIDI_VERSION" $srcdir/RtMidi.h`],
+-                    [return strcmp(RTMIDI_VERSION, PACKAGE_VERSION);])],
+-   [AC_MSG_RESULT([yes])],
++RTMIDI_VERSION=`sed -n 's/#define RTMIDI_VERSION "\(.*\)"/\1/p' $srcdir/RtMidi.h`
++AS_IF(
++   [test "x$RTMIDI_VERSION" != "x$PACKAGE_VERSION"],
+    [AC_MSG_FAILURE([testing RTMIDI_VERSION==PACKAGE_VERSION failed, check that RtMidi.h defines RTMIDI_VERSION as "$PACKAGE_VERSION" or that the first line of configure.ac has been updated.])])
+ 
+ # Enable some nice automake features if they are available
diff --git a/debian/patches/series b/debian/patches/series
index ac9296e..c860f58 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0004-not-install-doc-images.patch
 0005-fix_pkg-config.patch
 0006-hardening.patch
+0007-cross.patch

-- 
RtMidi packaging



More information about the pkg-multimedia-commits mailing list