From bb211564a801f5dd730c54a85463a33e920c73b1 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Mon, 9 Oct 2023 20:42:27 +0200
Subject: [PATCH] The return of the -x86_64 suffix for macOS DMG

We previously dropped it when we discontinued 32bit builds.
But now that we have -arm64, it is only consistent.
---
 tools/osx_packaging/osx_build | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index 32d54bd1f8..57a7085bb9 100755
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -655,29 +655,33 @@ if file ${PRODUCT_PKG_DIR}/$APPROOT/MacOS/$MAIN_EXECUTABLE | grep -q x86_64; the
 	OSX_X42URI=x42-plugins.com/x42/osx
 	OSX_X42ID=osx
 	OSX_BENSID=osx64
-	TXZ_ARCH="osx"   # harvid
-	DMG_ARCH=""      # Jadeo
+	HARVID_ARCH="osx"
+	XJADEO_ARCH=""
+	ARDOUR_ARCH="-x86_64"
 elif file ${PRODUCT_PKG_DIR}/$APPROOT/MacOS/$MAIN_EXECUTABLE | grep -q ppc; then
 	OSX_ARCH=ppc
 	OSX_X42URI=x42-plugins.com/x42/osx
 	OSX_X42ID=osx
 	OSX_BENSID=osxppc
-	TXZ_ARCH="osx"
-	DMG_ARCH=""
+	HARVID_ARCH="osx"
+	XJADEO_ARCH=""
+	ARDOUR_ARCH=""
 elif file ${PRODUCT_PKG_DIR}/$APPROOT/MacOS/$MAIN_EXECUTABLE | grep -q arm64; then
 	OSX_ARCH=arm64
 	OSX_X42URI=x42-plugins.com/x42/mac
 	OSX_X42ID="macOS"
 	OSX_BENSID=macarm64
-	TXZ_ARCH="macOS-arm64"
-	DMG_ARCH="-arm64"
+	HARVID_ARCH="macOS-arm64"
+	XJADEO_ARCH="-arm64"
+	ARDOUR_ARCH="-arm64"
 else
 	OSX_ARCH=i386
 	OSX_X42URI=x42-plugins.com/x42/osx
 	OSX_X42ID=osx
 	OSX_BENSID=osx32
-	TXZ_ARCH="osx"
-	DMG_ARCH=""
+	HARVID_ARCH="osx"
+	XJADEO_ARCH=""
+	ARDOUR_ARCH="-i386"
 fi
 
 if test x$WITH_HARRISON_LV2 != x ; then
@@ -705,18 +709,18 @@ if test x$WITH_HARVID != x ; then
 	echo "copying harvid and xjadeo ..."
 
 	rsync -Pa \
-		rsync://ardour.org/video-tools/harvid-${TXZ_ARCH}-${HARVID_VERSION}.tgz \
-		"$CACHEDIR/harvid-${TXZ_ARCH}-${HARVID_VERSION}.tgz"
+		rsync://ardour.org/video-tools/harvid-${HARVID_ARCH}-${HARVID_VERSION}.tgz \
+		"$CACHEDIR/harvid-${HARVID_ARCH}-${HARVID_VERSION}.tgz"
 
 	rsync -Pa \
-		rsync://ardour.org/video-tools/jadeo${DMG_ARCH}-${XJADEO_VERSION:1}.dmg \
-		"$CACHEDIR/jadeo${DMG_ARCH}-${XJADEO_VERSION:1}.dmg"
+		rsync://ardour.org/video-tools/jadeo${XJADEO_ARCH}-${XJADEO_VERSION:1}.dmg \
+		"$CACHEDIR/jadeo${XJADEO_ARCH}-${XJADEO_VERSION:1}.dmg"
 
 	tar -x -z \
 		-C $PRODUCT_PKG_DIR/$APPROOT \
-		-f "$CACHEDIR/harvid-${TXZ_ARCH}-${HARVID_VERSION}.tgz" || exit 1
+		-f "$CACHEDIR/harvid-${HARVID_ARCH}-${HARVID_VERSION}.tgz" || exit 1
 
-	JADEO=$(hdiutil attach "$CACHEDIR/jadeo${DMG_ARCH}-${XJADEO_VERSION:1}.dmg" | grep Apple_HFS | grep dev/ | cut -f 3)
+	JADEO=$(hdiutil attach "$CACHEDIR/jadeo${XJADEO_ARCH}-${XJADEO_VERSION:1}.dmg" | grep Apple_HFS | grep dev/ | cut -f 3)
 	cp -r "${JADEO}/Jadeo.app" "$PRODUCT_PKG_DIR/"
 	hdiutil detach "${JADEO}"
 
@@ -1030,7 +1034,7 @@ if [ x$DEBUG$FREEBI = xTT ]; then
   BUILDTYPE="-demo-dbg"
 fi
 
-UC_DMG=$APPNAME-$release_version${BUILDTYPE}${DMG_ARCH}.dmg
+UC_DMG=$APPNAME-$release_version${BUILDTYPE}${ARDOUR_ARCH}.dmg
 
 VOLNAME=$APPNAME-$release_version