Miroirs/slackbuilds_ponce
1
0
Fork 0
mirror of https://github.com/Ponce/slackbuilds synced 2024-11-21 19:42:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

audio/ardour: Fix linking issues with boost.

Browse source 
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
Heinz Wiesinger 2014-04-15 00:05:29 +07:00 committed by Willy Sudiarto Raharjo
parent 958dc7e59b
commit 1424839ba0
2 changed files with 44 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
audio/ardour/ardour.SlackBuild
View file

@ -2,7 +2,7 @@
# Slackware build script for ardour # Slackware build script for ardour
# Copyright 2008-2013 Heinz Wiesinger, Amsterdam, The Netherlands # Copyright 2008-2014 Heinz Wiesinger, Amsterdam, The Netherlands
# All rights reserved. # All rights reserved.
# #
# Redistribution and use of this script, with or without modification, is # Redistribution and use of this script, with or without modification, is
@ -24,7 +24,7 @@
PRGNAM=ardour PRGNAM=ardour
VERSION=2.8.16 VERSION=2.8.16
BUILD=${BUILD:-1} BUILD=${BUILD:-2}
TAG=${TAG:-_SBo} TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then if [ -z "$ARCH" ]; then
@ -102,6 +102,10 @@ patch -p1 -i $CWD/SConstruct.diff
# Bugfixes from git # Bugfixes from git
patch -p1 -i $CWD/tempoline_crash.patch patch -p1 -i $CWD/tempoline_crash.patch
patch -p1 -i $CWD/lilv.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 \ scons \
PREFIX=/usr \ PREFIX=/usr \

38
audio/ardour/boost_startup.patch Normal file
View file

@ -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']
])