From 98491b9eb2ce3d6e4e271a189ca8af6b6e7869fe Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Thu, 15 Sep 2016 13:05:31 +0200
Subject: [PATCH] bundle embeddable/nativeUI Harrison plugins

---
 tools/linux_packaging/build   | 10 +++++-----
 tools/osx_packaging/osx_build |  9 +++++----
 tools/x-win/package.sh        | 10 ++++++----
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index 31995c5ea5..67d3abaef6 100755
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -37,7 +37,7 @@ BUILDTYPE=""
 NOSTRIP="libsuil|libserd|libsord|liblilv|libsratom|liblrdf|libardour|libpbd|libevoral"
 
 : ${HARRISONCHANNELSTRIP=harrison_channelstrip}
-
+: ${HARRISONLV2=harrison_lv2s-n}
 
 if [ $# -eq 0 ] ; then
 	echo ""
@@ -628,10 +628,10 @@ if test x$WITH_HARRISON_LV2 != x ; then
 	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"
+		-z "${CACHEDIR}/${HARRISONLV2}.${HARCH}.zip" \
+		-o "${CACHEDIR}/${HARRISONLV2}.${HARCH}.zip" \
+		"http://www.harrisonconsoles.com/mixbus/mb3/beta/harrison-dsp/${HARRISONLV2}.${HARCH}.zip"
+	unzip -q -d "$APPLIB/LV2/" "${CACHEDIR}/${HARRISONLV2}.${HARCH}.zip"
 fi
 
 if test -n "$MIXBUS"; then
diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index 7c7020dd52..144516ace9 100755
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -25,6 +25,7 @@ PRINT_SYSDEPS=
 WITH_NLS=
 
 : ${HARRISONCHANNELSTRIP=harrison_channelstrip}
+: ${HARRISONLV2=harrison_lv2s-n}
 
 . ../define_versions.sh
 
@@ -606,13 +607,13 @@ fi
 
 if test x$WITH_HARRISON_LV2 != x ; then
 	curl -s -S --fail -#  \
-		-z "${CACHEDIR}/harrison_lv2s.${OSX_BENSID}.zip" \
-		-o "${CACHEDIR}/harrison_lv2s.${OSX_BENSID}.zip" \
-		"http://www.harrisonconsoles.com/mixbus/mb3/beta/harrison-dsp/harrison_lv2s.${OSX_BENSID}.zip"
+		-z "${CACHEDIR}/${HARRISONLV2}.${OSX_BENSID}.zip" \
+		-o "${CACHEDIR}/${HARRISONLV2}.${OSX_BENSID}.zip" \
+		"http://www.harrisonconsoles.com/mixbus/mb3/beta/harrison-dsp/${HARRISONLV2}.${OSX_BENSID}.zip"
 
 	mkdir -p "${PRODUCT_PKG_DIR}/${APPROOT}/lib/LV2"
 	bsdtar -C "${PRODUCT_PKG_DIR}/${APPROOT}/lib/LV2/" -xf \
-		"${CACHEDIR}/harrison_lv2s.${OSX_BENSID}.zip"
+		"${CACHEDIR}/${HARRISONLV2}.${OSX_BENSID}.zip"
 fi
 
 if test x$WITH_HARVID != x ; then
diff --git a/tools/x-win/package.sh b/tools/x-win/package.sh
index 9d878dcf2c..45144616e4 100755
--- a/tools/x-win/package.sh
+++ b/tools/x-win/package.sh
@@ -16,7 +16,9 @@ test -f gtk2_ardour/wscript || exit 1
 : ${MAKEFLAGS=-j4}
 : ${TMPDIR=/var/tmp}
 : ${SRCCACHE=/var/tmp/winsrc}  # source-code tgz cache
+
 : ${HARRISONCHANNELSTRIP=harrison_channelstrip}
+: ${HARRISONLV2=harrison_lv2s-n}
 
 # see also wscript, video_tool_paths.cc, bundle_env_mingw.cc
 # registry keys based on this are used there
@@ -265,10 +267,10 @@ if test x$WITH_HARRISON_LV2 != x ; then
 	echo "Including Harrison LV2s"
 
 	curl -s -S --fail -# \
-		-z "${SRCCACHE}/harrison_lv2s.${WARCH}.zip" \
-		-o "${SRCCACHE}/harrison_lv2s.${WARCH}.zip" \
-		"http://www.harrisonconsoles.com/mixbus/mb3/beta/harrison-dsp/harrison_lv2s.${WARCH}.zip"
-	unzip -q -d "$ALIBDIR/LV2/" "${SRCCACHE}/harrison_lv2s.${WARCH}.zip"
+		-z "${SRCCACHE}/${HARRISONLV2}.${WARCH}.zip" \
+		-o "${SRCCACHE}/${HARRISONLV2}.${WARCH}.zip" \
+		"http://www.harrisonconsoles.com/mixbus/mb3/beta/harrison-dsp/${HARRISONLV2}.${WARCH}.zip"
+	unzip -q -d "$ALIBDIR/LV2/" "${SRCCACHE}/${HARRISONLV2}.${WARCH}.zip"
 fi
 
 if test -n "$MIXBUS"; then