From 466c8d4235a8d3f8e35138813ecb06f2e7c59207 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Sun, 21 May 2023 15:49:06 +0200
Subject: [PATCH] Tweak macOS packaging

Signed-off-by: falkTX <falktx@falktx.com>
---
 .github/workflows/build.yml     |  2 --
 dpf                             |  2 +-
 utils/create-macos-installer.sh |  3 ++-
 utils/macOS/Build_JACK.plist    | 18 ++++++++++++++++++
 utils/macOS/Build_Native.plist  | 18 ++++++++++++++++++
 utils/macOS/package.xml.in      | 18 +++++++++---------
 6 files changed, 48 insertions(+), 13 deletions(-)
 create mode 100644 utils/macOS/Build_JACK.plist
 create mode 100644 utils/macOS/Build_Native.plist

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 84a4521..9bb31dc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -221,8 +221,6 @@ jobs:
           mv jucewrapper/build/*_artefacts/Release/AU/*.component bin/
       - name: Build macOS (packaging)
         if: steps.cache.outputs.cache-hit == 'true'
-        env:
-          MACOS_ARCHS: 'arm64,x86_64'
         run: |
           source deps/PawPaw/local.env macos-${{ matrix.target }}
           ./utils/create-macos-installer.sh
diff --git a/dpf b/dpf
index 802e446..eba5849 160000
--- a/dpf
+++ b/dpf
@@ -1 +1 @@
-Subproject commit 802e4460844b75b4c2a96c5a9f9baa791209f74e
+Subproject commit eba584917cb566cbbdf626cc8736c3d13b65a2e9
diff --git a/utils/create-macos-installer.sh b/utils/create-macos-installer.sh
index a757dd5..c88d2d1 100755
--- a/utils/create-macos-installer.sh
+++ b/utils/create-macos-installer.sh
@@ -34,12 +34,14 @@ pkgbuild \
 
 pkgbuild \
   --identifier "studio.kx.distrho.plugins.cardinal.jack" \
+  --component-plist "../utils/macOS/Build_JACK.plist" \
   --install-location "/Applications/" \
   --root "${PWD}/jack/" \
   ../dpf-cardinal-jack.pkg
 
 pkgbuild \
   --identifier "studio.kx.distrho.plugins.cardinal.native" \
+  --component-plist "../utils/macOS/Build_Native.plist" \
   --install-location "/Applications/" \
   --root "${PWD}/native/" \
   ../dpf-cardinal-native.pkg
@@ -77,7 +79,6 @@ pkgbuild \
 cd ..
 
 sed -e "s|@builddir@|${PWD}/build|" \
-    -e "s|@buildarchs@|${MACOS_ARCHS}|" \
     utils/macOS/package.xml.in > build/package.xml
 
 productbuild \
diff --git a/utils/macOS/Build_JACK.plist b/utils/macOS/Build_JACK.plist
new file mode 100644
index 0000000..d551695
--- /dev/null
+++ b/utils/macOS/Build_JACK.plist
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<array>
+	<dict>
+		<key>BundleHasStrictIdentifier</key>
+		<true/>
+		<key>BundleIsRelocatable</key>
+		<false/>
+		<key>BundleIsVersionChecked</key>
+		<false/>
+		<key>BundleOverwriteAction</key>
+		<string>upgrade</string>
+		<key>RootRelativeBundlePath</key>
+		<string>Cardinal.app</string>
+	</dict>
+</array>
+</plist>
diff --git a/utils/macOS/Build_Native.plist b/utils/macOS/Build_Native.plist
new file mode 100644
index 0000000..a206413
--- /dev/null
+++ b/utils/macOS/Build_Native.plist
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<array>
+	<dict>
+		<key>BundleHasStrictIdentifier</key>
+		<true/>
+		<key>BundleIsRelocatable</key>
+		<false/>
+		<key>BundleIsVersionChecked</key>
+		<false/>
+		<key>BundleOverwriteAction</key>
+		<string>upgrade</string>
+		<key>RootRelativeBundlePath</key>
+		<string>CardinalNative.app</string>
+	</dict>
+</array>
+</plist>
diff --git a/utils/macOS/package.xml.in b/utils/macOS/package.xml.in
index ca2f4da..eae843a 100644
--- a/utils/macOS/package.xml.in
+++ b/utils/macOS/package.xml.in
@@ -3,31 +3,31 @@
     <title>Cardinal</title>
     <domains enable_anywhere="false" enable_currentUserHome="false" enable_localSystem="true" />
     <license file="@builddir@/../LICENSE" mime-type="text/plain" />
-    <options customize="always" hostArchitectures="@buildarchs@" require-scripts="false" rootVolumeOnly="true" />
+    <options customize="always" hostArchitectures="arm64,x86_64" require-scripts="false" rootVolumeOnly="true" />
     <pkg-ref id="studio.kx.distrho.cardinal" />
     <welcome file="@builddir@/../utils/macOS/welcome.txt" mime-type="text/plain" />
-    <choice id="studio.kx.distrho.cardinal-res" title="Resources" description="Install resources" visible="false">
+    <choice id="studio.kx.distrho.cardinal-res" title="Resources" description="Install resources" visible="true" enabled="false" selected="true">
         <pkg-ref id="studio.kx.distrho.cardinal-resources" version="0">dpf-cardinal-resources.pkg</pkg-ref>
     </choice>
-    <choice id="studio.kx.distrho.cardinal-jack" title="Standalone (JACK)" description="Install Standalone for usage with JACK. See https://jackaudio.org/ for details." visible="true">
+    <choice id="studio.kx.distrho.cardinal-jack" title="Standalone (JACK)" description="Install Standalone for usage with JACK. See https://jackaudio.org/ for details." visible="true" start_selected="true">
         <pkg-ref id="studio.kx.distrho.cardinal-jack" version="0">dpf-cardinal-jack.pkg</pkg-ref>
     </choice>
-    <choice id="studio.kx.distrho.cardinal-native" title="Standalone (Native)" description="Install Standalone that uses native Audio and MIDI" visible="true">
+    <choice id="studio.kx.distrho.cardinal-native" title="Standalone (Native)" description="Install Standalone that uses native Audio and MIDI" visible="true" start_selected="true">
         <pkg-ref id="studio.kx.distrho.cardinal-native" version="0">dpf-cardinal-native.pkg</pkg-ref>
     </choice>
-    <choice id="studio.kx.distrho.cardinal-au" title="AU" description="Install AU plugins" visible="true">
+    <choice id="studio.kx.distrho.cardinal-au" title="AU" description="Install AU plugins" visible="true" start_selected="true">
         <pkg-ref id="studio.kx.distrho.cardinal-components" version="0">dpf-cardinal-components.pkg</pkg-ref>
     </choice>
-    <choice id="studio.kx.distrho.cardinal-lv2" title="LV2" description="Install LV2 plugins" visible="true">
+    <choice id="studio.kx.distrho.cardinal-lv2" title="LV2" description="Install LV2 plugins" visible="true" start_selected="true">
         <pkg-ref id="studio.kx.distrho.cardinal-lv2bundles" version="0">dpf-cardinal-lv2bundles.pkg</pkg-ref>
     </choice>
-    <choice id="studio.kx.distrho.cardinal-vst2" title="VST2" description="Install VST2 plugins" visible="true">
+    <choice id="studio.kx.distrho.cardinal-vst2" title="VST2" description="Install VST2 plugins" visible="true" start_selected="true">
         <pkg-ref id="studio.kx.distrho.cardinal-vst2bundles" version="0">dpf-cardinal-vst2bundles.pkg</pkg-ref>
     </choice>
-    <choice id="studio.kx.distrho.cardinal-vst3" title="VST3" description="Install VST3 plugins" visible="true">
+    <choice id="studio.kx.distrho.cardinal-vst3" title="VST3" description="Install VST3 plugins" visible="true" start_selected="true">
         <pkg-ref id="studio.kx.distrho.cardinal-vst3bundles" version="0">dpf-cardinal-vst3bundles.pkg</pkg-ref>
     </choice>
-    <choice id="studio.kx.distrho.cardinal-clap" title="CLAP" description="Install CLAP plugins" visible="true">
+    <choice id="studio.kx.distrho.cardinal-clap" title="CLAP" description="Install CLAP plugins" visible="true" start_selected="true">
         <pkg-ref id="studio.kx.distrho.cardinal-clapbundles" version="0">dpf-cardinal-clapbundles.pkg</pkg-ref>
     </choice>
     <choices-outline>