Don't compress linux bundle, compress installer (with xz)
[ardour.git] / tools / linux_packaging / build
index 5b970acdedbd39b8d3b6df16d0efd778e5065a3e..935f712206ffdb495915c5b32ee6848c904e4a8f 100755 (executable)
@@ -22,6 +22,8 @@ if test -z "$CACHEDIR" -o ! -d "$CACHEDIR"; then
 fi
 
 MIXBUS=
+WITH_HARRISON_LV2=
+WITH_X42_LV2=
 WITH_LADSPA=0
 WITH_HARVID=
 STRIP=all
@@ -29,15 +31,20 @@ PRINT_SYSDEPS=
 WITH_NLS=
 EXTERNAL_JACK=
 VENDOR=Ardour ;
+EXENAME=ardour
+GCC5ABI=false
+USEWINE=false
 BUILDTYPE=""
+NOSTRIP="libsuil|libserd|libsord|liblilv|libsratom|liblrdf|libardour|libpbd|libevoral"
+: ${HARRISONCHANNELSTRIP=harrison_channelstrip}
 
 
 if [ $# -eq 0 ] ; then
-       echo ""  
+       echo ""
        echo "ERROR - Please specify build type"
        echo "    --public"
        echo "    --mixbus"
-       echo ""  
+       echo ""
        exit 1
 fi
 
@@ -50,23 +57,38 @@ 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 ;;
+       --mixbus32c)
+               MIXBUS=1;
+               WITH_HARRISON_LV2=1 ;
+               WITH_X42_LV2=1 ;
+               WITH_NLS=1 ;
+               WITH_LADSPA=;
+               STRIP=all
+               APPNAME=Mixbus32C ;
+               VENDOR=Harrison ;
+               EXENAME=mixbus32c ;
+               major_version=""
                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 ;;
 
@@ -80,6 +102,8 @@ while [ $# -gt 0 ] ; do
        --sysdeps) PRINT_SYSDEPS=1; shift ;;
        --nls) WITH_NLS=1 ; shift ;;
        --harvid) WITH_HARVID=1 ; shift ;;
+       --gcc5abi) GCC5ABI=true ; shift ;;
+       --chanstrip) HARRISONCHANNELSTRIP=$2 ; shift; shift ;;
 
        *)
                #catch all for unknown arguments
@@ -113,6 +137,7 @@ case `uname -m` in
                echo "Architecture is x86"
                ARCH='x86'
                WARCH='i386'
+               HARCH='linux32'
                ARCH_BITS='32-bit'
                MULTIARCH='i386-linux-gnu'
                ;;
@@ -120,6 +145,7 @@ case `uname -m` in
                echo "Architecture is x86_64"
                ARCH='x86_64'
                WARCH='x86_64'
+               HARCH='linux64'
                ARCH_BITS='64-bit'
                MULTIARCH='x86_64-linux-gnu'
                ;;
@@ -160,27 +186,25 @@ Surfaces=$APPLIB/surfaces
 Panners=$APPLIB/panners
 Backends=$APPLIB/backends
 
-Modules=$Libraries/modules
-Loaders=$Libraries/loaders
-
+Themes=$Shared/themes
 Templates=$Shared/templates
 ExportFormats=$Shared/export
 Locale=$Shared/locale
 MidiMaps=$Shared/midi_maps
 PatchFiles=$Shared/patchfiles
+LuaScripts=$Shared/scripts
 MackieControl=$Shared/mcp
-VFork=$Libraries/vfork
 
 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
@@ -196,21 +220,19 @@ 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 $Themes
 mkdir -p $Locale
 mkdir -p $Surfaces
 mkdir -p $MidiMaps
 mkdir -p $PatchFiles
+mkdir -p $LuaScripts
 mkdir -p $MackieControl
 mkdir -p $ExportFormats
 mkdir -p $Panners
 mkdir -p $Backends
 mkdir -p $Templates
 mkdir -p $Shared/doc
-mkdir -p $VFork
 
 # maybe set variables
 ENVIRONMENT=environment
@@ -234,15 +256,27 @@ fi
 echo export 'PATH=/usr/local/bin:/opt/bin:$PATH' >> $ENVIRONMENT
 
 # create startup helper script
+if test -d $BUILD_ROOT/vst; then
+       WINEEXE=wine
+       USEWINE=true
+       echo export INSTALL_DIR >> $ENVIRONMENT
+else
+       WINEEXE=
+fi
 
-sed -e "/^%ENV%/r $ENVIRONMENT" -e '/^%ENV%/d' -e 's/%VER%/'"${release_version}"'/' < ardour.sh.in > $APPBIN/ardour${major_version}
-rm $ENVIRONMENT && chmod 775 $APPBIN/ardour${major_version}
-MAIN_EXECUTABLE=ardour-${release_version}
+sed -e "/^%ENV%/r $ENVIRONMENT" -e '/^%ENV%/d' -e 's/%VER%/'"${release_version}"'/;s/%EXENAME%/'"${EXENAME}"'/;s/%WINE%/'"$WINEEXE"'/' < 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
+if test -d $BUILD_ROOT/vst; then
+       #cp -v $BUILD_ROOT/gtk2_ardour/libgtk2_ardour.so $APPLIB/
+       cp -v $BUILD_ROOT/gtk2_ardour/ardour-${release_version}-vst.exe.so $APPBIN/${EXENAME}-${release_version}
+else
+       cp -v $BUILD_ROOT/gtk2_ardour/ardour-${release_version}* $APPBIN/${EXENAME}-${release_version}
+fi
+
 if test x$STRIP = xall ; then
-       strip $APPBIN/$MAIN_EXECUTABLE
+       strip -s $APPBIN/${EXENAME}-${release_version}
 fi
 
 # copy locale files
@@ -253,7 +287,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"`
 
             #
@@ -270,8 +304,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//'`
@@ -280,7 +314,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
@@ -291,7 +325,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
@@ -309,7 +343,7 @@ fi
 
 #
 # Copy stuff that may be dynamically loaded
-# 
+#
 
 cp -R $GTKSTACK_ROOT/etc/* $Etc
 
@@ -335,6 +369,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
@@ -355,6 +390,12 @@ for x in $BUILD_ROOT/../patchfiles/*.midnam ; do
     cp "$x" $PatchFiles
 done
 
+# Lua Scripts Files
+# got to be careful with names here
+for x in $BUILD_ROOT/../scripts/*.lua ; do
+    cp "$x" $LuaScripts
+done
+
 # MackieControl data
 # got to be careful with names here
 for x in $BUILD_ROOT/../mcp/*.device $BUILD_ROOT/../mcp/*.profile ; do
@@ -362,9 +403,9 @@ for x in $BUILD_ROOT/../mcp/*.device $BUILD_ROOT/../mcp/*.profile ; do
 done
 
 # Templates
-#for f in $BUILD_ROOT/../templates/* ; do 
+#for f in $BUILD_ROOT/../templates/* ; do
 #    if [ -d "$f" ] ; then
-#      echo Template: $f ; cp -r "$f" $Templates ; 
+#      echo Template: $f ; cp -r "$f" $Templates ;
 #    fi
 #done
 
@@ -401,32 +442,49 @@ fi
 #  neither binary nor script exists)
 if test -d $BUILD_ROOT/libs/fst ; then
     cp $BUILD_ROOT/libs/fst/ardour-vst-scanner* $APPLIB || true
+    if test x$STRIP = xall ; then
+        strip -s $APPLIB/ardour-vst-scanner*
+    fi
 fi
 
 # vfork wrapper
 if test -f $BUILD_ROOT/libs/vfork/ardour-exec-wrapper ; then
     cp $BUILD_ROOT/libs/vfork/ardour-exec-wrapper $APPLIB
+    if test x$STRIP = xall ; then
+        strip -s $APPLIB/ardour-exec-wrapper
+    fi
 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
+    if test x$STRIP = xall ; then
+        strip -s $APPLIB/ardour-request-device
+    fi
 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/canvas:$OURLIBDIR/libsndfile:$OURLIBDIR/evoral:$OURLIBDIR/evoral/src/libsmf:$OURLIBDIR/audiographer:$OURLIBDIR/timecode:$OURLIBDIR/taglib:$OURLIBDIR/libltc:$OURLIBDIR/qm-dsp:$OURLIBDIR/ardouralsautil
+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:$BUILD_ROOT/gtk2_ardour
 
 echo $OURLIBS${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 
 checkedIdx=0
-deplibs=
 
-while [ true ] ; do 
+# these are dynamically loaded by NSS
+deplibs="libfreeblpriv3.so libsoftokn3.so libnsspem.so"
+cp -v $GTKSTACK_ROOT/lib/libsoftokn3.so $Libraries/
+cp -v $GTKSTACK_ROOT/lib/libfreeblpriv3.so $Libraries/
+cp -v $GTKSTACK_ROOT/lib/libnsspem.so $Libraries/
+chrpath -r foo $Libraries/libsoftokn3.so
+chrpath -r foo $Libraries/libfreeblpriv3.so
+chrpath -r foo $Libraries/libnsspem.so
+
+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
@@ -442,13 +500,13 @@ while [ true ] ; do
 
                # 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}'`
+
+               # do not include libjack, nor libwine
+               deps=`LD_LIBRARY_PATH=$OURLIBS${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} ldd $file | grep -v libwine.so | 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}
@@ -468,10 +526,10 @@ 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++
@@ -513,38 +571,43 @@ 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
+        if echo "$l" | grep -qE "$NOSTRIP"; then
+            continue
+        fi
         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/mnemonic-us.bindings  $Etc
+cp $BUILD_ROOT/gtk2_ardour/ardour.keys  $Etc
 cp $BUILD_ROOT/gtk2_ardour/ardour.menus $Etc
 cp $BUILD_ROOT/gtk2_ardour/clearlooks.rc $Etc
 cp $BUILD_ROOT/gtk2_ardour/default_ui_config $Etc
 
 # Copied directly from source tree
 
+mkdir ${Shared}/icons
+mkdir ${Shared}/resources
 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
+cp ../../gtk2_ardour/icons/*.png ${Shared}/icons
+cp -r ../../gtk2_ardour/icons/cursor_* ${Shared}/icons/
+cp ../../gtk2_ardour/ArdourMono.ttf $Shared
+cp ../../gtk2_ardour/resources/${APPNAME}-* ${Shared}/resources/
+
+# Themes: only install those named for this app
+lower_case_appname=`echo $APPNAME | tr '[:upper:]' '[:lower:]'`
+cp ../../gtk2_ardour/themes/*-${lower_case_appname}.colors $Themes
 
 #
 # put sooper sekrit ingredients here and they will be copied
@@ -559,9 +622,11 @@ cp -R $BUILD_ROOT/libs/LV2 $APPLIB/
 
 # lv2 core, classifications etc - TODO check if we need the complete LV2 ontology
 if test -d $ARDOURSTACK_ROOT/lib/lv2/lv2core.lv2 ; then
-       cp -R $ARDOURSTACK_ROOT/lib/lv2/lv2core.lv2 $APPLIB/LV2/
+       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
-       cp -R $GTKSTACK_ROOT/lib/lv2/lv2core.lv2 $APPLIB/LV2/
+       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
@@ -572,27 +637,59 @@ 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/beta/harrison-dsp/harrison_lv2s.${HARCH}.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}/${HARRISONCHANNELSTRIP}.${HARCH}.so" \
+               -o "${CACHEDIR}/${HARRISONCHANNELSTRIP}.${HARCH}.so" \
+               "http://www.harrisonconsoles.com/mixbus/mb3/beta/harrison-dsp/${HARRISONCHANNELSTRIP}.${HARCH}.so"
 
+       cp "${CACHEDIR}/${HARRISONCHANNELSTRIP}.${HARCH}.so" \
+               $APPLIB/ladspa/strip/${HARRISONCHANNELSTRIP}.so
+       chmod +x $APPLIB/ladspa/strip/${HARRISONCHANNELSTRIP}.so
+
+       echo "Adding Harrison Vamp Plugins"
+
+       if test "$GCC5ABI" = "true"; then
+               VAMPARCH="${HARCH}gcc5"
+       else
+               VAMPARCH="${HARCH}"
+       fi
+       curl -s -S --fail -# \
+               -z "${CACHEDIR}/harrison_vamp.${VAMPARCH}.so" \
+               -o "${CACHEDIR}/harrison_vamp.${VAMPARCH}.so" \
+               "http://www.harrisonconsoles.com/mixbus/mb3/beta/harrison-dsp/harrison_vamp.${VAMPARCH}.so"
+
+       cp "${CACHEDIR}/harrison_vamp.${VAMPARCH}.so" \
+               $APPLIB/harrison_vamp.so
+       chmod +x $APPLIB/harrison_vamp.so
+fi
+
+if test x$WITH_X42_LV2 != x ; then
        mkdir -p $APPLIB/LV2
-       METERS_VERSION=$(curl -s -S http://gareus.org/x42/linux/x42-meters.latest.txt)
-       rsync -a -q --partial \
-               rsync://gareus.org/x42/linux/x42-meters-lv2-${WARCH}-${METERS_VERSION}.zip \
-               "${SRCDIR}/x42-meters-lv2-linux-${WARCH}-${METERS_VERSION}.zip"
-       unzip -d "$APPLIB/LV2/" "${SRCDIR}/x42-meters-lv2-linux-${WARCH}-${METERS_VERSION}.zip"
-
-       SETBFREE_VERSION=$(curl -s -S http://gareus.org/x42/linux/setBfree.latest.txt)
-       rsync -a -q --partial \
-               rsync://gareus.org/x42/linux/setBfree-lv2-linux-${WARCH}-${SETBFREE_VERSION}.zip \
-               "${SRCDIR}/setBfree-lv2-linux-${WARCH}-${SETBFREE_VERSION}.zip"
-       unzip -d "$APPLIB/LV2/" "${SRCDIR}/setBfree-lv2-linux-${WARCH}-${SETBFREE_VERSION}.zip"
-
-       MIDIFILTER_VERSION=$(curl -s -S http://gareus.org/x42/linux/x42-midifilter.latest.txt)
-       rsync -a -q --partial \
-               rsync://gareus.org/x42/linux/x42-midifilter-lv2-linux-${WARCH}-${MIDIFILTER_VERSION}.zip \
-               "${SRCDIR}/x42-midifilter-lv2-linux-${WARCH}-${MIDIFILTER_VERSION}.zip"
-       unzip -d "$APPLIB/LV2/" "${SRCDIR}/x42-midifilter-lv2-linux-${WARCH}-${MIDIFILTER_VERSION}.zip"
 
+       echo "Adding x42 Plugins"
+
+       for proj in x42-meters x42-midifilter x42-midimap x42-stereoroute x42-eq setBfree; do
+               X42_VERSION=$(curl -s -S http://x42-plugins.com/x42/linux/${proj}.latest.txt)
+               rsync -a -q --partial \
+                       rsync://x42-plugins.com/x42/linux/${proj}-lv2-linux-${WARCH}-${X42_VERSION}.zip \
+                       "${CACHEDIR}/${proj}-lv2-linux-${WARCH}-${X42_VERSION}.zip"
+               unzip -q -d "$APPLIB/LV2/" "${CACHEDIR}/${proj}-lv2-linux-${WARCH}-${X42_VERSION}.zip"
+       done
 fi
 ################################################################################
 
@@ -630,7 +727,7 @@ chmod a+x $APPBIN/${APP_VER_NAME}.uninstall.sh
 #
 # Add the stage2.run script
 #
-sed -e "s/%REPLACE_MAJOR_VERSION%/${major_version}/" < stage2.run.in > stage2.run
+sed -e "s/%REPLACE_MAJOR_VERSION%/${major_version}/;s/%REPLACE_PGM%/${APPNAME}/;s/%REPLACE_VENDOR%/${VENDOR}/;s/%REPLACE_EXE%/${EXENAME}/;s/%REPLACE_GCC5%/${GCC5ABI}/;s/%REPLACE_WINE%/${USEWINE}/" < stage2.run.in > stage2.run
 chmod a+x stage2.run
 
 
@@ -644,8 +741,8 @@ fi
 
 echo "Building tarball ..."
 
-rm -f $APPDIR.tar.bz2
-tar -cjf $APPDIR.tar.bz2 $APPDIR
+rm -f $APPDIR.tar
+tar -cf $APPDIR.tar $APPDIR
 
 echo "Calculating bundle size"
 du -sb $APPDIR/  | awk '{print $1}' > $APPDIR.size