smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-08 22:55:44 +01:00
Code Issues Projects Releases Wiki Activity

merge -r12436:12545 from 3.0

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12546 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-06-02 16:21:08 +00:00
parent 4f9eb9862c
commit 8e1db53556
131 changed files with 2056 additions and 996 deletions
Download patch file Download diff file Expand all files Collapse all files

14
tools/linux_packaging/build
View file

@ -332,29 +332,25 @@ if test x$WITH_LADSPA != x ; then
fi
# Control Surfaces
cp $BUILD_ROOT/libs/surfaces/*/libardour*.so* $Surfaces
# hack ... move libardour_cp back into Libraries
mv $Surfaces/libardourcp.so* $Libraries
cp $BUILD_ROOT/libs/surfaces/*/libardour_*.so* $Surfaces
cp $BUILD_ROOT/libs/surfaces/control_protocol/libardourcp.so* $Libraries
# MidiMaps
# got to be careful with names here
for x in $BUILD_ROOT/../midi_maps/*.map ; do
cp "$x" $MidiMaps
echo Copied MIDI map $x
done
# MIDNAM Patch Files
# got to be careful with names here
for x in $BUILD_ROOT/../patchfiles/*.midnam ; do
cp "$x" $PatchFiles
echo Copied MIDNAM file "$x"
done
# MackieControl data
# got to be careful with names here
for x in $BUILD_ROOT/../mcp/*.device $BUILD_ROOT/../mcp/*.profile ; do
cp "$x" $MackieControl
echo Copied Mackie Control file $x
done
# Templates
@ -414,6 +410,7 @@ while [ true ] ; do
if test "not" = ${dep}; then
echo ""
echo "!!! ERROR !!! - Missing dependant library for $file."
echo "Searched: " $OURLIBS${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
echo ""
(LD_LIBRARY_PATH=$OURLIBS${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} ldd $file)
echo ""
@ -449,6 +446,11 @@ while [ true ] ; do
echo "Copying dependant lib $dep (required by ${parent})"
cp $dep $Libraries
fi
#
# reset RPATH so that the runtime linker never looks
# in places we don't want it to
#
patchelf --set-rpath $Libraries $Libraries/`basename $dep`
if echo $dep | grep -sq '^/' ; then
# absolute path, candidate for stripping
deplibs="$deplibs $base"