From 33e8811b6bd54d078a1c83e1940e33ba64cfc39b Mon Sep 17 00:00:00 2001
From: dromer <dreamer@mrtoasted.com>
Date: Mon, 2 Dec 2024 13:47:12 +0100
Subject: [PATCH 1/3] enable jack for all platforms

---
 CMakeLists.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6bcc7f960..d620f792f 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -237,12 +237,13 @@ set(JUCE_COMPILE_DEFINITIONS
     JUCE_SILENCE_XCODE_15_LINKER_WARNING=1
     JUCE_USE_XRENDER=1
     JUCE_COREGRAPHICS_RENDER_WITH_MULTIPLE_PAINT_CALLS=0
+    JUCE_JACK=1
+    JUCE_JACK_CLIENT_NAME="plugdata"
 )
 
 if(LINUX)
- list(APPEND JUCE_COMPILE_DEFINITIONS JUCE_ALSA=1 JUCE_JACK=1 JUCE_JACK_CLIENT_NAME="plugdata")
+ list(APPEND JUCE_COMPILE_DEFINITIONS JUCE_ALSA=1)
 elseif(UNIX AND NOT APPLE) # BSD
-  list(APPEND JUCE_COMPILE_DEFINITIONS JUCE_JACK=1 JUCE_JACK_CLIENT_NAME="plugdata")
   add_compile_definitions(BSD=1 ENABLE_OPUS=0)
 endif()
 

From 706a48fc8aee4bbf94448633890656d9accc2cc5 Mon Sep 17 00:00:00 2001
From: dromer <dreamer@mrtoasted.com>
Date: Mon, 2 Dec 2024 15:42:31 +0100
Subject: [PATCH 2/3] correct gh-artifact name

---
 .github/scripts/package-macOS.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/scripts/package-macOS.sh b/.github/scripts/package-macOS.sh
index dfb1d9b1a..18f988915 100755
--- a/.github/scripts/package-macOS.sh
+++ b/.github/scripts/package-macOS.sh
@@ -155,7 +155,7 @@ rm -r $PKG_DIR
 if [ -z "$AC_USERNAME" ]; then
     echo "No user name, skipping sign/notarize"
     # pretend that we signed the package and bail out
-    mv ${PRODUCT_NAME}.pkg ${PRODUCT_NAME}-MacOS-$1.pkg
+    mv ${PRODUCT_NAME}.pkg $1
     exit 0
 fi
 

From eaac7d81e16ba0a1eb795c3f418603bd66db9418 Mon Sep 17 00:00:00 2001
From: dreamer <1185977+dromer@users.noreply.github.com>
Date: Thu, 5 Dec 2024 15:47:20 +0100
Subject: [PATCH 3/3] Feature/jack4all juce (#6)

* use modded juce

* fix imports

* move JUCE_JACK out of other if tree

* jack4all

* use new JUCE commit; install jack with homebrew

* use proper include path on macOS

* specify different include dirs for macOS

* Feature/jack4all juce winget (#4)

* install winget and jack2 on windews. add MSVC include path

* try windows tricks

* HMODULE

---------

Co-authored-by: dromer <dreamer@mrtoasted.com>
---
 .github/workflows/cmake.yml | 19 ++++++++++++++++++-
 CMakeLists.txt              | 14 ++++++++++++++
 Libraries/JUCE              |  2 +-
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 988169287..f8d0082e8 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -16,12 +16,14 @@ jobs:
         with:
           submodules: recursive
           fetch-depth: 0
-
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2
         with:
           key: macos
 
+      - name: install jack
+        run: brew install jack
+
       - name: Create Build Environment
         run: cmake -E make_directory ${{github.workspace}}/build
 
@@ -99,6 +101,9 @@ jobs:
         with:
           key: macos-legacy
 
+      - name: install jack
+        run: brew install jack
+
       - name: Create Build Environment
         run: cmake -E make_directory ${{github.workspace}}/build
 
@@ -170,6 +175,12 @@ jobs:
           submodules: recursive
           fetch-depth: 0
 
+      - name: Install winget
+        uses: Cyberboss/install-winget@v1
+
+      - name: Install jack
+        run: winget install jack2 --disable-interactivity --accept-source-agreements
+
       - name: Create Build Environment
         run: cmake -E make_directory ${{github.workspace}}/build
 
@@ -225,6 +236,12 @@ jobs:
           submodules: recursive
           fetch-depth: 0
 
+      - name: Install winget
+        uses: Cyberboss/install-winget@v1
+
+      - name: Install jack
+        run: winget install jack2 --disable-interactivity --accept-source-agreements
+
       - name: Create Build Environment
         run: cmake -E make_directory ${{github.workspace}}/build
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d620f792f..5f7dbbcbd 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -331,6 +331,20 @@ include_directories(/usr/local/include)
 link_directories(/usr/local/lib)
 endif()
 
+# macOS includes for jack
+if(APPLE)
+  if(MACOS_LEGACY)
+    include_directories(/usr/local/include)
+  else()
+    include_directories(/opt/homebrew/include)
+  endif()
+endif()
+
+# Windows include for jack
+if(MSVC)
+  include_directories("C:\\Program Files\\JACK2\\include")
+endif()
+
 list(APPEND PLUGDATA_COMPILE_DEFINITIONS JUCE_MODAL_LOOPS_PERMITTED=1)
 
 list(APPEND PLUGDATA_INCLUDE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/Libraries/ELSE/sfont~/")
diff --git a/Libraries/JUCE b/Libraries/JUCE
index d924b5908..60f33c4af 160000
--- a/Libraries/JUCE
+++ b/Libraries/JUCE
@@ -1 +1 @@
-Subproject commit d924b5908ccc6b9f857b0d8d488304c4eaaf1f1d
+Subproject commit 60f33c4afdedf6da2b1fc84720b6cae6cb6eceb6