[SCM] midisnoop/master: Use pkg-config to link against rtmidi
jcowgill at users.alioth.debian.org
jcowgill at users.alioth.debian.org
Mon Jul 18 15:40:59 UTC 2016
The following commit has been merged in the master branch:
commit 6feb9a43a2dfbb5c583b7b8978a13a1a6e1119b3
Author: James Cowgill <jcowgill at debian.org>
Date: Mon Jul 18 16:35:54 2016 +0100
Use pkg-config to link against rtmidi
diff --git a/debian/patches/04-rtmidi-pkgconfig.patch b/debian/patches/04-rtmidi-pkgconfig.patch
new file mode 100644
index 0000000..17490c6
--- /dev/null
+++ b/debian/patches/04-rtmidi-pkgconfig.patch
@@ -0,0 +1,26 @@
+Description: Use pkg-config to link against rtmidi
+ This fixes the FTBFS with new versions of RtMidi where the include directory
+ has moved and a -I flag is now needed.
+Author: James Cowgill <jcowgill at debian.org>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -63,7 +63,7 @@ isEmpty(DATADIR) {
+ MIDISNOOP_DATA_INSTALL_PATH = $${DATADIR}
+ }
+
+-CONFIG += console uitools warn_on
++CONFIG += console link_pkgconfig uitools warn_on
+ DEFINES += MIDISNOOP_MAJOR_VERSION=$${MAJOR_VERSION} \
+ MIDISNOOP_MINOR_VERSION=$${MINOR_VERSION} \
+ MIDISNOOP_REVISION=$${REVISION}
+@@ -83,7 +83,7 @@ HEADERS += aboutview.h \
+ messageview.h \
+ util.h \
+ view.h
+-LIBS += -lrtmidi
++PKGCONFIG += rtmidi
+ MOC_DIR = $${MAKEDIR}
+ OBJECTS_DIR = $${MAKEDIR}
+ RCC_DIR = $${MAKEDIR}
diff --git a/debian/patches/series b/debian/patches/series
index 37986d3..9f58998 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
01-destop_file.patch
03-fix_build_with_rtmidi_2_1.patch
+04-rtmidi-pkgconfig.patch
--
midisnoop packaging
More information about the pkg-multimedia-commits
mailing list