diff options
| author | Heinz Wiesinger <pprkut@liwjatan.at> | 2014-04-15 00:05:29 +0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2014-04-15 00:05:29 +0700 |
| commit | 1424839ba04229d29c497035a7cd78be1b98312f (patch) | |
| tree | c629ea56438220837202763a38aa7240cfdd71fc /audio/ardour | |
| parent | 958dc7e59bd3c72840b57a41b6e6f2990d38f113 (diff) | |
audio/ardour: Fix linking issues with boost.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'audio/ardour')
| -rw-r--r-- | audio/ardour/ardour.SlackBuild | 8 | ||||
| -rw-r--r-- | audio/ardour/boost_startup.patch | 38 |
2 files changed, 44 insertions, 2 deletions
diff --git a/audio/ardour/ardour.SlackBuild b/audio/ardour/ardour.SlackBuild index 4c025b8b1f5b0..da8895a67c28c 100644 --- a/audio/ardour/ardour.SlackBuild +++ b/audio/ardour/ardour.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for ardour -# Copyright 2008-2013 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2008-2014 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=ardour VERSION=2.8.16 -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -102,6 +102,10 @@ patch -p1 -i $CWD/SConstruct.diff # Bugfixes from git patch -p1 -i $CWD/tempoline_crash.patch patch -p1 -i $CWD/lilv.patch +patch -p1 -i $CWD/boost_startup.patch + +# Fix linking with boost +sed -i "s|lcwiid|lcwiid -lboost_system|" libs/surfaces/wiimote/SConscript scons \ PREFIX=/usr \ diff --git a/audio/ardour/boost_startup.patch b/audio/ardour/boost_startup.patch new file mode 100644 index 0000000000000..1d332fc4cec28 --- /dev/null +++ b/audio/ardour/boost_startup.patch @@ -0,0 +1,38 @@ +commit 3e7a7df183a3fea024376797dd83e955ef9851c5 +Author: Paul Davis <paul@linuxaudiosystems.com> +Date: Fri Oct 4 17:51:03 2013 -0400 + + fix startup errors with 2.x related to boost linkage on some platforms + + Note: this should not be required because we do not actually link with ANY boost libraries, so the + occurence of this bug in ardour at run time indicates that the wrong version of boost was used and/or + incorrect flags for using boost are in use. + + Fix from David Henningsson <david.henningsson@canonical.com> + +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..dae2ba2 100644 +--- a/libs/surfaces/tranzport/SConscript ++++ b/libs/surfaces/tranzport/SConscript +@@ -63,6 +63,7 @@ tranzport.Merge ([ + libraries['xml'], + libraries['glib2'], + libraries['glibmm2'], ++ libraries['boost'], + libraries['usb'], + libraries['sndfile'] + ]) |