[ardour] Fix Generic MIDI and other control surfaces not working (rhbz#1156179)

[Hans de Goede]

commit 87f2b928e2114fd947205713e553c4c47073d89e
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Fri Oct 24 11:17:23 2014 +0200

    Fix Generic MIDI and other control surfaces not working (rhbz#1156179)

 ...inking-to-tranzport-and-generic-midi-surf.patch |   44 ++++++++++++++++++++
 0002-Add-boost-linking-to-wiimote.patch            |   12 +++++
 ardour.spec                                        |   10 ++++-
 3 files changed, 65 insertions(+), 1 deletions(-)
---
diff --git a/0001-Add-boost-linking-to-tranzport-and-generic-midi-surf.patch b/0001-Add-boost-linking-to-tranzport-and-generic-midi-surf.patch
new file mode 100644
index 0000000..1c5ba07
--- /dev/null
+++ b/0001-Add-boost-linking-to-tranzport-and-generic-midi-surf.patch
@@ -0,0 +1,44 @@
+From ba7881d97f701960b9cea04f9911ba105857c3fa Mon Sep 17 00:00:00 2001
+From: David Henningsson <david.henningsson at canonical.com>
+Date: Thu, 3 Oct 2013 20:26:52 +0200
+Subject: [PATCH] Add boost linking to "tranzport" and "generic midi" surfaces
+
+This fixes the following scary errors, shown at startup:
+ardour: [ERROR]: ControlProtocolManager: cannot load module "/usr/lib/ardour2/surfaces//libardour_genericmidi.so" (/usr/lib/ardour2/surfaces//libardour_genericmidi.so: undefined symbol: _ZN5boost6system15system_categoryEv)
+ardour: [ERROR]: ControlProtocolManager: cannot load module "/usr/lib/ardour2/surfaces//libardour_tranzport.so" (/usr/lib/ardour2/surfaces//libardour_tranzport.so: undefined symbol: _ZN5boost6system15system_categoryEv)
+
+Signed-off-by: David Henningsson <david.henningsson at canonical.com>
+---
+ libs/surfaces/generic_midi/SConscript | 3 ++-
+ libs/surfaces/tranzport/SConscript    | 1 +
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/libs/surfaces/generic_midi/SConscript b/libs/surfaces/generic_midi/SConscript
+index 27f8865..ce37359 100644
+--- a/libs/surfaces/generic_midi/SConscript
++++ b/libs/surfaces/generic_midi/SConscript
+@@ -42,7 +42,8 @@ genericmidi.Merge ([
+ 	libraries['usb'],
+ 	libraries['xml'],
+ 	libraries['glib2'],
+-	libraries['glibmm2']
++	libraries['glibmm2'],
++	libraries['boost']
+ 	])
+ 
+ libardour_genericmidi = genericmidi.SharedLibrary('ardour_genericmidi', genericmidi_files)
+diff --git a/libs/surfaces/tranzport/SConscript b/libs/surfaces/tranzport/SConscript
+index c2ab351..3ea0d4f 100644
+--- a/libs/surfaces/tranzport/SConscript
++++ b/libs/surfaces/tranzport/SConscript
+@@ -64,6 +64,7 @@ tranzport.Merge ([
+     libraries['glib2'],
+     libraries['glibmm2'],
+     libraries['usb'],
++    libraries['boost'],
+     libraries['sndfile']
+     ])
+ 
+-- 
+1.8.3.2
+
diff --git a/0002-Add-boost-linking-to-wiimote.patch b/0002-Add-boost-linking-to-wiimote.patch
new file mode 100644
index 0000000..03beca5
--- /dev/null
+++ b/0002-Add-boost-linking-to-wiimote.patch
@@ -0,0 +1,12 @@
+--- ardour-2.8.16/libs/surfaces/wiimote/SConscript~	2009-10-01 07:56:53.000000000 -0700
++++ ardour-2.8.16/libs/surfaces/wiimote/SConscript	2014-10-23 10:59:30.000000000 -0700
+@@ -42,7 +42,8 @@
+ 	libraries['usb'],
+ 	libraries['xml'],
+ 	libraries['glib2'],
+-	libraries['glibmm2']
++	libraries['glibmm2'],
++	libraries['boost']
+ 	])
+ 
+ libardour_wiimote = wiimote.SharedLibrary('ardour_wiimote', wiimote_files)
diff --git a/ardour.spec b/ardour.spec
index 6b28e44..71fdece 100644
--- a/ardour.spec
+++ b/ardour.spec
@@ -1,7 +1,7 @@
 Summary:       Multichannel Digital Audio Workstation
 Name:          ardour
 Version:       2.8.16
-Release:       11%{?dist}
+Release:       12%{?dist}
 # No more direct links. Download from
 # http://ardour.org/download
 Source:        ardour-%{version}.tar.bz2
@@ -14,6 +14,9 @@ Patch3:        ardour-2.5-HOST_NOT_FOUND.patch
 Patch4:        ardour-fix-mm-includes.patch
 # lilv-0.16 compatibility. Fixed in trunk
 Patch5:        ardour-lilv016fix.patch
+# Need to link various plugins against boost (rhbz#1156179)
+Patch6:        0001-Add-boost-linking-to-tranzport-and-generic-midi-surf.patch
+patch7:        0002-Add-boost-linking-to-wiimote.patch
 URL:           http://ardour.org
 License:       GPLv2+
 Group:         Applications/Multimedia
@@ -72,6 +75,8 @@ digital mixers.
 %patch3 -p0 -b .host.not.found
 %patch4 -p1
 %patch5 -p1 -b .lilv016
+%patch6 -p1
+%patch7 -p1
 
 # Update config.guess for new architectures (ie aarch64) support
 cp /usr/lib/rpm/redhat/config.guess tools
@@ -184,6 +189,9 @@ fi
 %{_mandir}/ru/man1/ardour.1*
 
 %changelog
+* Fri Oct 24 2014 Hans de Goede <hdegoede at redhat.com> - 2.8.16-12
+- Fix Generic MIDI and other control surfaces not working (rhbz#1156179)
+
 * Fri Aug 15 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.16-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild