X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=tools%2Flinux_packaging%2Fbuild;h=80025d1f101e6d2faab51962ce8fdc2d47343d4d;hb=b951448750e1e5f9023467aea26eb631a19e8363;hp=49a0bdfd6ded67c681a647a87292cea1c36306d4;hpb=eb369215ae4564da89b63831f474e094181ec7f0;p=ardour.git

diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index 49a0bdfd6d..80025d1f10 100755
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -14,21 +14,34 @@ ARDOURSTACK_ROOT=$HOME/a3/inst
 # the waf build tree to use when copying built/generated files
 BUILD_ROOT=../../build
 
+. ../define_versions.sh
+
+# where harvid and xjadeo binaries are cached
+if test -z "$CACHEDIR" -o ! -d "$CACHEDIR"; then
+	CACHEDIR=`pwd`
+fi
+
 MIXBUS=
+WITH_HARRISON_LV2=
+WITH_X42_LV2=
 WITH_LADSPA=0
+WITH_HARVID=
 STRIP=all
 PRINT_SYSDEPS=
 WITH_NLS=
 EXTERNAL_JACK=
 VENDOR=Ardour ;
+EXENAME=ardour
+GCC5ABI=false
 BUILDTYPE=""
 
+
 if [ $# -eq 0 ] ; then
-	echo ""	 
+	echo ""
 	echo "ERROR - Please specify build type"
 	echo "	  --public"
 	echo "	  --mixbus"
-	echo ""	 
+	echo ""
 	exit 1
 fi
 
@@ -41,23 +54,26 @@ while [ $# -gt 0 ] ; do
 	#
 
 	--mixbus)
-		MIXBUS=1; 
-		WITH_NLS=1 ; 
-		WITH_LADSPA=; 
+		MIXBUS=1;
+		WITH_HARRISON_LV2=1 ;
+		WITH_X42_LV2=1 ;
+		WITH_NLS=1 ;
+		WITH_LADSPA=;
 		STRIP=all
 		APPNAME=Mixbus ;
-                VENDOR=Harrison ;
+		VENDOR=Harrison ;
+		EXENAME=mixbus ;
 		shift ;;
 	--public)
-		WITH_NLS=1 ; 
-		WITH_LADSPA=; 
-		STRIP=all ; 
+		WITH_NLS=1 ;
+		WITH_LADSPA=;
+		STRIP=all ;
 		APPNAME=Ardour ;
 		shift ;;
 	--allinone)
-		WITH_NLS= ; 
-		WITH_LADSPA=1; 
-		STRIP=all; 
+		WITH_NLS= ;
+		WITH_LADSPA=1;
+		STRIP=all;
 		shift ;;
 	--test) WITH_LADSPA=; STRIP= ; shift ;;
 
@@ -70,6 +86,8 @@ while [ $# -gt 0 ] ; do
 	--strip) STRIP=$2 ; shift ; shift ;;
 	--sysdeps) PRINT_SYSDEPS=1; shift ;;
 	--nls) WITH_NLS=1 ; shift ;;
+	--harvid) WITH_HARVID=1 ; shift ;;
+	--gcc5abi) GCC5ABI=true ; shift ;;
 
 	*)
 		#catch all for unknown arguments
@@ -87,10 +105,14 @@ if test x$STRIP != xall -a x$STRIP != xnone -a x$STRIP != xsome ; then
     exit 1
 fi
 
-release_version=`grep -m 1 '^VERSION' ../../wscript | awk '{print $3}' | sed "s/'//g"`
-svn_version=`grep -m 1 'svn_revision =' ../../libs/ardour/svn_revision.cc | cut -d'"' -f 2`
-echo "Version is $release_version / $svn_version"
-info_string="$release_version/$svn_version built on `hostname` by `whoami` on `date`"
+. ../define_versions.sh
+
+echo "Version is $release_version"
+if [ "x$commit" != "x" ] ; then
+    info_string="$release_version ($commit) built on `hostname` by `whoami` on `date`"
+else
+    info_string="$release_version built on `hostname` by `whoami` on `date`"
+fi
 echo "Info string is $info_string"
 
 # Figure out our CPU type
@@ -98,12 +120,18 @@ case `uname -m` in
 	i[3456789]86|x86|i86pc)
 		echo "Architecture is x86"
 		ARCH='x86'
+		WARCH='i386'
+		HARCH='linux32'
 		ARCH_BITS='32-bit'
+		MULTIARCH='i386-linux-gnu'
 		;;
 	x86_64|amd64|AMD64)
 		echo "Architecture is x86_64"
 		ARCH='x86_64'
+		WARCH='x86_64'
+		HARCH='linux64'
 		ARCH_BITS='64-bit'
+		MULTIARCH='x86_64-linux-gnu'
 		;;
 	*)
 		echo ""
@@ -113,13 +141,6 @@ case `uname -m` in
 		;;
 esac
 
-# Figure out the Build Type
-if grep -q "DEBUG = True" ../../build/c4che/default.cache.py; then
-	DEBUG="T"
-else
-	DEBUG="F"
-fi
-
 if [ x$DEBUG = xT ]; then
     BUILDTYPE="dbg"
     if [ x$STRIP = xall ] ; then
@@ -131,11 +152,11 @@ fi
 # setup directory structure
 
 if [ -z "${BUILDTYPE}" ]; then
-	APPDIR=${APPNAME}_${ARCH}-${release_version}_${svn_version}
-	APP_VER_NAME=${APPNAME}-${release_version}_${svn_version}
+	APPDIR=${APPNAME}_${ARCH}-${release_version}
+	APP_VER_NAME=${APPNAME}-${release_version}
 else
-	APPDIR=${APPNAME}_${ARCH}-${release_version}_${svn_version}-${BUILDTYPE}
-	APP_VER_NAME=${APPNAME}-${release_version}_${svn_version}-${BUILDTYPE}
+	APPDIR=${APPNAME}_${ARCH}-${release_version}-${BUILDTYPE}
+	APP_VER_NAME=${APPNAME}-${release_version}-${BUILDTYPE}
 fi
 
 APPBIN=$APPDIR/bin
@@ -147,9 +168,7 @@ Shared=$APPDIR/share
 Plugins=$APPLIB/plugins
 Surfaces=$APPLIB/surfaces
 Panners=$APPLIB/panners
-
-Modules=$Libraries/modules
-Loaders=$Libraries/loaders
+Backends=$APPLIB/backends
 
 Templates=$Shared/templates
 ExportFormats=$Shared/export
@@ -163,11 +182,11 @@ if [ x$PRINT_SYSDEPS != x ] ; then
 # print system dependencies
 #
 
-	for file in $APPBIN/* $Libraries/* $Modules/* $Plugins/*.so ; do 
+	for file in $APPBIN/* $Libraries/* $Plugins/*.so ; do
 		if ! file $file | grep -qs Mach-O ; then
 			continue
 		fi
-		otool -L $file | awk '{print $1}' | egrep -v "(^@executable_path|^Ardour[0-9][.0-9]*.app)" 
+		otool -L $file | awk '{print $1}' | egrep -v "(^@executable_path|^Ardour[0-9][.0-9]*.app)"
 	done | sort | uniq
 	exit 0
 fi
@@ -183,9 +202,6 @@ mkdir -p $APPDIR
 mkdir -p $APPBIN
 mkdir -p $APPLIB
 mkdir -p $Etc
-mkdir -p $Plugins
-mkdir -p $Modules
-mkdir -p $Loaders
 mkdir -p $Shared
 mkdir -p $Locale
 mkdir -p $Surfaces
@@ -194,8 +210,8 @@ mkdir -p $PatchFiles
 mkdir -p $MackieControl
 mkdir -p $ExportFormats
 mkdir -p $Panners
+mkdir -p $Backends
 mkdir -p $Templates
-mkdir -p $Shared/templates
 mkdir -p $Shared/doc
 
 # maybe set variables
@@ -210,7 +226,6 @@ if test x$MIXBUS != x ; then
 	#
 	echo export ARDOUR_KEYBOARD_LAYOUT=us-nokeypad >> $ENVIRONMENT
 	echo export ARDOUR_UI_CONF=ardour3_ui.conf >> $ENVIRONMENT
-	echo export ARDOUR3_UI_RC=ardour3_ui_dark.rc >> $ENVIRONMENT
 fi
 
 #
@@ -222,15 +237,13 @@ echo export 'PATH=/usr/local/bin:/opt/bin:$PATH' >> $ENVIRONMENT
 
 # create startup helper script
 
-sed -e "/^%ENV%/r $ENVIRONMENT" -e '/^%ENV%/d' -e 's/%VER%/'"${release_version}"'/' < ardour.sh.in > $APPBIN/ardour3
-rm $ENVIRONMENT && chmod 775 $APPBIN/ardour3
-# the 3.0 here is not the same as "release-version" because the latter may include "-betaN" etc.
-MAIN_EXECUTABLE=ardour-3.0
+sed -e "/^%ENV%/r $ENVIRONMENT" -e '/^%ENV%/d' -e 's/%VER%/'"${release_version}"'/;s/%EXENAME%/'"${EXENAME}"'/' < ardour.sh.in > $APPBIN/${EXENAME}${major_version}
+rm $ENVIRONMENT && chmod 775 $APPBIN/${EXENAME}${major_version}
 
 echo "Copying ardour executable ...."
-cp $BUILD_ROOT/gtk2_ardour/$MAIN_EXECUTABLE $APPBIN
+cp -v $BUILD_ROOT/gtk2_ardour/ardour-${release_version} $APPBIN/${EXENAME}-${release_version}
 if test x$STRIP = xall ; then
-	strip $APPBIN/$MAIN_EXECUTABLE
+	strip $APPBIN/${EXENAME}-${release_version}
 fi
 
 # copy locale files
@@ -241,7 +254,7 @@ if test x$WITH_NLS != x ; then
 	echo "I hope you remembered to run scons msgupdate!"
 	LINGUAS=
 
-        for pkg in gtk2_ardour libs/ardour libs/gtkmm2ext ; do 
+        for pkg in gtk2_ardour libs/ardour libs/gtkmm2ext ; do
 	    files=`find ../../$pkg -name "*.mo"`
 
             #
@@ -258,8 +271,8 @@ if test x$WITH_NLS != x ; then
 		echo "!!!! WARNING !!!! - Did not find any .mo files in ../../$pkg"
 		echo ""
 	    fi
- 
-	    for file in $files 
+
+	    for file in $files
 	    do
 		echo $file
 		lang=`basename $file | sed 's/\.mo//'`
@@ -268,7 +281,7 @@ if test x$WITH_NLS != x ; then
 		echo copy $file to $Locale/$lang/LC_MESSAGES/`basename $pkg`$vsuffix.mo
                 if echo $LINGUAS | grep $lang >/dev/null 2>&1 ; then
                     :
-                else 
+                else
 		    LINGUAS="$LINGUAS $lang"
                 fi
 	    done
@@ -279,7 +292,7 @@ if test x$WITH_NLS != x ; then
 
 	for l in $LINGUAS ; do
 		echo "Copying GTK i18n files for $l..."
-		for MO in $GTK_MESSAGES ; do 
+		for MO in $GTK_MESSAGES ; do
 			if [ -f $LOCALEROOT/$l/LC_MESSAGES/$MO ] ; then
 				cp $LOCALEROOT/$l/LC_MESSAGES/$MO $Locale/$l/LC_MESSAGES
 			else
@@ -297,33 +310,22 @@ fi
 
 #
 # Copy stuff that may be dynamically loaded
-# 
+#
 
 cp -R $GTKSTACK_ROOT/etc/* $Etc
-echo "Copying all Pango modules ..."
-cp -R $GTKSTACK_ROOT/lib/pango/1.6.0/modules/*.so $Modules
-echo "Copying all GDK Pixbuf loaders ..."
-cp -R $GTKSTACK_ROOT/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.so $Loaders
-
-# Generate a pango module file using the actual Pango that we're going to bundle
-
-cat > pangorc <<EOF 
-[Pango]
-ModulesPath=$GTKSTACK_ROOT/lib/pango/1.6.0/modules
-EOF
-env PANGO_RC_FILE=pangorc $GTKSTACK_ROOT/bin/pango-querymodules | sed "s?$GTKSTACK_ROOT/lib/pango/1.6.0/?@ROOTDIR@/?" > $Etc/pango.modules.in
-rm pangorc
-
-# Ditto for gdk-pixbuf loaders
-gdk-pixbuf-query-loaders | sed "s?$GTKSTACK_ROOT/lib/gdk-pixbuf-2.0/2.10.0/?@ROOTDIR@/?" > $Etc/gdk-pixbuf.loaders.in
 
 # We rely on clearlooks, so include a version from our own build tree
-# this one is special - we will set GTK_PATH to $Libraries/clearlooks
+# this one is special - we will set GTK_PATH to $Libraries/gtkengines
 
-echo "Copying clearlooks ..."
+GTK_ENGINE_DIR=$Libraries/gtkengines/engines
+mkdir -p $GTK_ENGINE_DIR
+
+echo "Copying GTK engines ..."
 cp $BUILD_ROOT/libs/clearlooks-newer/libclearlooks.so $Libraries
-mkdir -p $Libraries/clearlooks/engines
-(cd $Libraries/clearlooks/engines && ln -s ../../libclearlooks.so . )
+(cd $GTK_ENGINE_DIR && ln -s ../../libclearlooks.so . )
+
+cp $GTKSTACK_ROOT/lib/gtk-2.0/2.10.0/engines/libpixmap.so $Libraries
+(cd $GTK_ENGINE_DIR && ln -s ../../libpixmap.so . )
 
 # LADSPA
 if test x$WITH_LADSPA != x ; then
@@ -334,6 +336,7 @@ if test x$WITH_LADSPA != x ; then
 	fi
 	echo "Copying `ls $plugdir | wc -l` plugins ..."
 	if [ -d $plugdir ] ; then
+		mkdir -p $Plugins
 		cp -r $plugdir/* $Plugins
 	fi
 fi
@@ -361,11 +364,11 @@ for x in $BUILD_ROOT/../mcp/*.device $BUILD_ROOT/../mcp/*.profile ; do
 done
 
 # Templates
-for f in $BUILD_ROOT/../templates/* ; do 
-    if [ -d "$f" ] ; then
-	echo Template: $f ; cp -r "$f" $Templates ; 
-    fi
-done
+#for f in $BUILD_ROOT/../templates/* ; do
+#    if [ -d "$f" ] ; then
+#	echo Template: $f ; cp -r "$f" $Templates ;
+#    fi
+#done
 
 # ExportFormats
 # got to be careful with names here
@@ -376,26 +379,56 @@ done
 # Panners
 cp $BUILD_ROOT/libs/panners/*/lib*.so* $Panners
 
+# Backends
+for backend in jack alsa dummy wavesaudio ; do
+    cp $BUILD_ROOT/libs/backends/$backend/lib*.so* $Backends
+done
+
 # VAMP plugins that we use
 cp $BUILD_ROOT/libs/vamp-plugins/libardourvampplugins.so* $Libraries
 
-# Suil modules
-cp $ARDOURSTACK_ROOT/lib/suil-0/lib* $Libraries
+# Suil modules (new dir 'build-stack')
+if test -d $GTKSTACK_ROOT/lib/suil-0/ ; then
+    cp $GTKSTACK_ROOT/lib/suil-0/lib* $Libraries
+fi
+
+# Suil modules (old dir 'build-ardour-stack')
+if test -d $ARDOURSTACK_ROOT/lib/suil-0/ ; then
+    cp $ARDOURSTACK_ROOT/lib/suil-0/lib* $Libraries
+fi
+
+# VST scanner app (both LXVST as well as WIN-VST, 2in1)
+# (if build with wine: ardour-vst-scanner is a wrapper
+#  script for ardour-vst-scanner.exe.so, if VST is disabled
+#  neither binary nor script exists)
+if test -d $BUILD_ROOT/libs/fst ; then
+    cp $BUILD_ROOT/libs/fst/ardour-vst-scanner* $APPLIB || true
+fi
+
+# vfork wrapper
+if test -f $BUILD_ROOT/libs/vfork/ardour-exec-wrapper ; then
+    cp $BUILD_ROOT/libs/vfork/ardour-exec-wrapper $APPLIB
+fi
+
+# ALSA device reservation tool (if available)
+if test -f $BUILD_ROOT/libs/ardouralsautil/ardour-request-device; then
+    cp $BUILD_ROOT/libs/ardouralsautil/ardour-request-device $APPLIB/ || true
+fi
 
 OURLIBDIR=$BUILD_ROOT/libs
-OURLIBS=$OURLIBDIR/vamp-sdk:$OURLIBDIR/surfaces/control_protocol:$OURLIBDIR/ardour:$OURLIBDIR/midi++2:$OURLIBDIR/pbd:$OURLIBDIR/rubberband:$OURLIBDIR/soundtouch:$OURLIBDIR/gtkmm2ext:$OURLIBDIR/sigc++2:$OURLIBDIR/glibmm2:$OURLIBDIR/gtkmm2/atk:$OURLIBDIR/gtkmm2/pango:$OURLIBDIR/gtkmm2/gdk:$OURLIBDIR/gtkmm2/gtk:$OURLIBDIR/libgnomecanvasmm:$OURLIBDIR/libsndfile:$OURLIBDIR/evoral:$OURLIBDIR/evoral/src/libsmf:$OURLIBDIR/audiographer:$OURLIBDIR/timecode:$OURLIBDIR/taglib:$OURLIBDIR/libltc:$OURLIBDIR/qm-dsp
+OURLIBS=$OURLIBDIR/vamp-sdk:$OURLIBDIR/surfaces/control_protocol:$OURLIBDIR/ardour:$OURLIBDIR/midi++2:$OURLIBDIR/pbd:$OURLIBDIR/rubberband:$OURLIBDIR/soundtouch:$OURLIBDIR/gtkmm2ext:$OURLIBDIR/sigc++2:$OURLIBDIR/glibmm2:$OURLIBDIR/gtkmm2/atk:$OURLIBDIR/gtkmm2/pango:$OURLIBDIR/gtkmm2/gdk:$OURLIBDIR/gtkmm2/gtk:$OURLIBDIR/canvas:$OURLIBDIR/libsndfile:$OURLIBDIR/evoral:$OURLIBDIR/evoral/src/libsmf:$OURLIBDIR/audiographer:$OURLIBDIR/timecode:$OURLIBDIR/taglib:$OURLIBDIR/libltc:$OURLIBDIR/qm-dsp:$OURLIBDIR/ardouralsautil:$OURLIBDIR/ptformat
 
 echo $OURLIBS${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 
 checkedIdx=0
 deplibs=
 
-while [ true ] ; do 
+while [ true ] ; do
 	missing=false
 	filelist=`find $APPLIB/ -type f`
-	filelist="$APPBIN/$MAIN_EXECUTABLE $filelist"
+	filelist="$APPBIN/${EXENAME}-${release_version} $filelist"
 
-	for file in $filelist  ; do 
+	for file in $filelist  ; do
 		if ! file $file | grep -qs ELF ; then
 			continue
 		fi
@@ -408,13 +441,16 @@ while [ true ] ; do
 		done
 		depCheckedList[$checkIdx]=$file
 		checkIdx=$(($checkIdx + 1))
-		
+
+		# ignore suil/qt wrappers - the plugin will pull in QT4.
+		if echo $file | grep -qs 'libsuil_.*qt4' ; then continue; fi
+
 		# do not include libjack
 		deps=`LD_LIBRARY_PATH=$OURLIBS${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} ldd $file | awk '{print $3}'`
 
 		echo -n "."
 		for dep in $deps ; do
-			if test "not" = ${dep}; then 
+			if test "not" = ${dep}; then
 				echo ""
 				echo "!!! ERROR !!! - Missing dependant library for $file."
 				echo "Searched: " $OURLIBS${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
@@ -434,14 +470,16 @@ while [ true ] ; do
 			# don't include ALSA
 			if echo $dep | grep -qs libasound ; then continue; fi
 			# don't include any X Window libraries
-			if echo $dep | grep -qs libX\. ; then continue; fi  
-			if echo $dep | grep -qs libxcb ; then continue; fi  
-			if echo $dep | grep -qs libICE\. ; then continue; fi  
-			if echo $dep | grep -qs libSM\. ; then continue; fi  
+			if echo $dep | grep -qs libX\. ; then continue; fi
+			if echo $dep | grep -qs libxcb ; then continue; fi
+			if echo $dep | grep -qs libICE\. ; then continue; fi
+			if echo $dep | grep -qs libSM\. ; then continue; fi
 			# don't include libc
 			if echo $dep | grep -qs 'libc\.' ; then continue; fi
 			# don't include libstdc++
 			if echo $dep | grep -qs libstdc++ ; then continue; fi
+                        # don't include libdbus
+			if echo $dep | grep -qs libdbus ; then continue; fi
 
 			base=`basename $dep`
 			if ! test -f $Libraries/$base; then
@@ -477,37 +515,38 @@ echo
 if test x$STRIP = xall ; then
     echo Stripping all libraries
     # Must be writable so that we can strip
-    find $APPLIB/ -name "*.so*" | xargs chmod u+w
+    find $APPLIB/ -name "*.so*" -print0 | xargs -0 chmod u+w
     # and strip ...
-    find $APPLIB/ -name "*.so*" | xargs strip
+    find $APPLIB/ -name "*.so*" -print0 | xargs -0 strip -s
 elif test x$STRIP = xsome ; then
     echo Stripping dependent libraries
     for l in $deplibs ; do
         chmod u+w $APPLIB/$l
-        strip $APPLIB/$l
+        strip -s $APPLIB/$l
     done
 fi
-find $APPLIB/ -name "*.so*" | xargs chmod a+rx
+find $APPLIB/ -name "*.so*" -print0 | xargs -0 chmod a+rx
 
 echo "Copying other stuff to $APPDIR  ..."
 
 # these are all generated by waf
-#cp $BUILD_ROOT/gtk2_ardour/ergonomic-us.bindings	$Etc
 cp $BUILD_ROOT/gtk2_ardour/mnemonic-us.bindings  $Etc
 cp $BUILD_ROOT/gtk2_ardour/ardour.menus $Etc
-cp ../../ardour_system.rc $Etc/ardour_system.rc
-cp $BUILD_ROOT/gtk2_ardour/ardour3_ui_*.rc $Etc
+cp $BUILD_ROOT/gtk2_ardour/clearlooks.rc $Etc
+cp $BUILD_ROOT/gtk2_ardour/default_ui_config $Etc
 
-# these are copied straight from the source tree
+# Copied directly from source tree
 
-cp ../../gtk2_ardour/ardour3_ui_default.conf $Etc/ardour3_ui_default.conf
-cp ../../gtk2_ardour/ardour3_ui_default.conf $Etc/ardour3_ui.conf
-cp ../../instant.xml $Etc/instant.xml
+cp ../../system_config $Etc/system_config
+cp ../../gtk2_ardour/dark.colors $Etc
+cp ../../instant.xml $Shared/instant.xml
 cp ../../gtk2_ardour/step_editing.bindings $Etc
 cp ../../gtk2_ardour/mixer.bindings $Etc
 cp -r ../../gtk2_ardour/icons $Shared
 cp -r ../../gtk2_ardour/pixmaps $Shared
-
+cp -r ../../gtk2_ardour/splash.png $Shared
+cp -r ../../gtk2_ardour/small-splash.png $Shared
+cp -r ../../gtk2_ardour/ArdourMono.ttf $Shared
 
 #
 # put sooper sekrit ingredients here and they will be copied
@@ -517,22 +556,119 @@ if [ -d specialSauce ] ; then
 	cp -r specialSauce $Etc
 fi
 
-# share stuff
+# install bundled LV2s to <app>/lib/LV2/
+cp -R $BUILD_ROOT/libs/LV2 $APPLIB/
 
-cp -R ../../gtk2_ardour/splash.png $Shared
-cp -R ../../gtk2_ardour/ArdourMono.ttf $Shared
+# lv2 core, classifications etc - TODO check if we need the complete LV2 ontology
+if test -d $ARDOURSTACK_ROOT/lib/lv2/lv2core.lv2 ; then
+	mkdir -p $APPLIB/LV2/lv2core.lv2
+	cp -R $ARDOURSTACK_ROOT/lib/lv2/lv2core.lv2/*.ttl $APPLIB/LV2/lv2core.lv2/
+elif test -d $GTKSTACK_ROOT/lib/lv2/lv2core.lv2 ; then
+	mkdir -p $APPLIB/LV2/lv2core.lv2
+	cp -R $GTKSTACK_ROOT/lib/lv2/lv2core.lv2/*.ttl $APPLIB/LV2/lv2core.lv2/
+fi
 
 # go through and recursively remove any .svn dirs in the bundle
 for svndir in `find $APPDIR -name .svn -type d`; do
 	rm -rf $svndir
 done
 
+
+################################################################################
+### Mixbus plugins, etc
+if test x$WITH_HARRISON_LV2 != x ; then
+	echo "Adding Harrison LV2s"
+	mkdir -p $APPLIB/LV2
+
+	curl -s -S --fail -# \
+		-z "${CACHEDIR}/harrison_lv2s.${HARCH}.zip" \
+		-o "${CACHEDIR}/harrison_lv2s.${HARCH}.zip" \
+		http://www.harrisonconsoles.com/mixbus/mb3/${HARCH}/harrison_lv2s.zip
+	unzip -q -d "$APPLIB/LV2/" "${CACHEDIR}/harrison_lv2s.${HARCH}.zip"
+fi
+
+if test -n "$MIXBUS"; then
+	echo "Adding Mixbus Channelstrip"
+
+	mkdir -p $APPLIB/ladspa/strip/
+	curl -s -S --fail -# \
+		-z "${CACHEDIR}/harrison_channelstrip.${HARCH}.so" \
+		-o "${CACHEDIR}/harrison_channelstrip.${HARCH}.so" \
+		http://www.harrisonconsoles.com/mixbus/mb3/${HARCH}/harrison_channelstrip.so
+
+	cp "${CACHEDIR}/harrison_channelstrip.${HARCH}.so" \
+		$APPLIB/ladspa/strip/harrison_channelstrip.so
+	chmod +x $APPLIB/ladspa/strip/harrison_channelstrip.so
+fi
+
+if test x$WITH_X42_LV2 != x ; then
+	METERS_VERSION=$(curl -s -S http://x42-plugins.com/x42/linux/x42-meters.latest.txt)
+	rsync -a -q --partial \
+		rsync://x42-plugins.com/x42/linux/x42-meters-lv2-linux-${WARCH}-${METERS_VERSION}.zip \
+		"${CACHEDIR}/x42-meters-lv2-linux-${WARCH}-${METERS_VERSION}.zip"
+	unzip -q -d "$APPLIB/LV2/" "${CACHEDIR}/x42-meters-lv2-linux-${WARCH}-${METERS_VERSION}.zip"
+
+	SETBFREE_VERSION=$(curl -s -S http://x42-plugins.com/x42/linux/setBfree.latest.txt)
+	rsync -a -q --partial \
+		rsync://x42-plugins.com/x42/linux/setBfree-lv2-linux-${WARCH}-${SETBFREE_VERSION}.zip \
+		"${CACHEDIR}/setBfree-lv2-linux-${WARCH}-${SETBFREE_VERSION}.zip"
+	unzip -q -d "$APPLIB/LV2/" "${CACHEDIR}/setBfree-lv2-linux-${WARCH}-${SETBFREE_VERSION}.zip"
+
+	MIDIFILTER_VERSION=$(curl -s -S http://x42-plugins.com/x42/linux/x42-midifilter.latest.txt)
+	rsync -a -q --partial \
+		rsync://x42-plugins.com/x42/linux/x42-midifilter-lv2-linux-${WARCH}-${MIDIFILTER_VERSION}.zip \
+		"${CACHEDIR}/x42-midifilter-lv2-linux-${WARCH}-${MIDIFILTER_VERSION}.zip"
+	unzip -q -d "$APPLIB/LV2/" "${CACHEDIR}/x42-midifilter-lv2-linux-${WARCH}-${MIDIFILTER_VERSION}.zip"
+
+fi
+################################################################################
+
+
+if test x$WITH_HARVID != x ; then
+	cd $APPBIN
+	HARVID_VERSION=$(curl -s -S http://ardour.org/files/video-tools/harvid_version.txt)
+	XJADEO_VERSION=$(curl -s -S http://ardour.org/files/video-tools/xjadeo_version.txt)
+
+	rsync -Pa \
+		rsync://ardour.org/video-tools/harvid-${MULTIARCH}-${HARVID_VERSION}.tgz \
+		"$CACHEDIR/harvid-${MULTIARCH}-${HARVID_VERSION}.tgz"
+
+	rsync -Pa \
+		rsync://ardour.org/video-tools/xjadeo-${MULTIARCH}-${XJADEO_VERSION}.tgz \
+		"$CACHEDIR/xjadeo-${MULTIARCH}-${XJADEO_VERSION}.tgz"
+
+	tar -x -z \
+		--exclude=README --exclude=harvid.1 --strip-components=1 \
+		-f "$CACHEDIR/harvid-${MULTIARCH}-${HARVID_VERSION}.tgz" || exit 1
+
+	tar -x -z \
+		--exclude=README --exclude=xjadeo.1 --strip-components=1 \
+		-f "$CACHEDIR/xjadeo-${MULTIARCH}-${XJADEO_VERSION}.tgz" || exit 1
+	mv xjadeo xjremote
+	cd -
+fi
+
 #
 # Add the uninstaller
 #
-sed -e "s/%REPLACE_PGM%/${APPNAME}/" -e "s/%REPLACE_VENDOR%/${VENDOR}/" -e "s/%REPLACE_VERSION%/${release_version}/" -e "s/%REPLACE_BUILD%/${svn_version}/" -e "s/%REPLACE_TYPE%/${BUILDTYPE}/" < uninstall.sh.in > $APPBIN/${APP_VER_NAME}.uninstall.sh
+sed -e "s/%REPLACE_PGM%/${APPNAME}/" -e "s/%REPLACE_VENDOR%/${VENDOR}/" -e "s/%REPLACE_MAJOR_VERSION%/${major_version}/" -e "s/%REPLACE_VERSION%/${release_version}/" -e "s/%REPLACE_TYPE%/${BUILDTYPE}/" < uninstall.sh.in > $APPBIN/${APP_VER_NAME}.uninstall.sh
 chmod a+x $APPBIN/${APP_VER_NAME}.uninstall.sh
 
+#
+# Add the stage2.run script
+#
+sed -e "s/%REPLACE_MAJOR_VERSION%/${major_version}/;s/%REPLACE_PGM%/${APPNAME}/;s/%REPLACE_VENDOR%/${VENDOR}/;s/%REPLACE_EXE%/${EXENAME}/;s/%REPLACE_GCC5%/${GCC5ABI}/" < stage2.run.in > stage2.run
+chmod a+x stage2.run
+
+
+# gcc4/5 ABI test tool
+if [ -e $BUILD_ROOT/tools/gccabicheck/gcc-glibmm-abi-check ]; then
+	cp $BUILD_ROOT/tools/gccabicheck/gcc-glibmm-abi-check $APPBIN
+else
+	echo "!!!ERROR !!! gcc-glibmm-abi-check program is missing. packager will exit without being complete"
+	exit 1
+fi
+
 #Sanity Check file
 if [ -e $BUILD_ROOT/tools/sanity_check/sanityCheck ]; then
 	cp $BUILD_ROOT/tools/sanity_check/sanityCheck $APPBIN
@@ -549,6 +685,8 @@ tar -cjf $APPDIR.tar.bz2 $APPDIR
 echo "Calculating bundle size"
 du -sb $APPDIR/  | awk '{print $1}' > $APPDIR.size
 
+( cd $APPDIR ; find . ) > file_list.txt
+
 rm -rf $APPDIR/
 
 echo "Done."