Fixup CI

Signed-off-by: falkTX <falktx@falktx.com>
DISTRHO · Dec 14, 2024 · 77aee25 · 77aee25
1 parent c1ef624
commit 77aee25
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 24 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,10 +13,9 @@ jobs:
     strategy:
       matrix:
         os:
-          # wrong use of AU MIDIPacket
-          # - macos-12
-          # - macos-13
-          # - macos-14
+          - macos-13
+          - macos-14
+          - macos-15
           # webgui failure
           # - ubuntu-20.04
           - ubuntu-22.04

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -42,49 +42,49 @@ jobs:
           suffix: _24_04
           target: ${{ matrix.target }}
 
-  macos-12:
+  macos-13:
     strategy:
       matrix:
         target: [macos-intel, macos-universal, macos-10.15]
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
       - uses: distrho/dpf-cmake-action@v1
         with:
           dpf_path: .
-          suffix: _12
+          suffix: _13
           target: ${{ matrix.target }}
 
-  macos-13:
+  macos-14:
     strategy:
       matrix:
         target: [macos-intel, macos-universal, macos-10.15]
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
       - uses: distrho/dpf-cmake-action@v1
         with:
           dpf_path: .
-          suffix: _13
+          suffix: _14
           target: ${{ matrix.target }}
 
-  macos-14:
+  macos-15:
     strategy:
       matrix:
         target: [macos-intel, macos-universal, macos-10.15]
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
       - uses: distrho/dpf-cmake-action@v1
         with:
           dpf_path: .
-          suffix: _14
+          suffix: _15
           target: ${{ matrix.target }}
 
   cmake_win32:

diff --git a/.github/workflows/example-plugins.yml b/.github/workflows/example-plugins.yml
@@ -39,47 +39,47 @@ jobs:
           suffix: _24_04
           target: ${{ matrix.target }}
 
-  macos-12:
+  macos-13:
     strategy:
       matrix:
         target: [macos-intel, macos-universal, macos-10.15]
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
       - uses: distrho/dpf-makefile-action@v1
         with:
           dpf_path: .
-          suffix: _12
+          suffix: _13
           target: ${{ matrix.target }}
 
-  macos-13:
+  macos-14:
     strategy:
       matrix:
         target: [macos-intel, macos-universal, macos-10.15]
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
       - uses: distrho/dpf-makefile-action@v1
         with:
           dpf_path: .
-          suffix: _13
+          suffix: _14
           target: ${{ matrix.target }}
 
-  macos-14:
+  macos-15:
     strategy:
       matrix:
         target: [macos-intel, macos-universal, macos-10.15]
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
       - uses: distrho/dpf-makefile-action@v1
         with:
           dpf_path: .
-          suffix: _14
+          suffix: _15
           target: ${{ matrix.target }}
diff --git a/distrho/src/DistrhoPluginAU.cpp b/distrho/src/DistrhoPluginAU.cpp
@@ -278,8 +278,18 @@ typedef std::vector<RenderListener> RenderListeners;
 
 #if DISTRHO_PLUGIN_WANT_MIDI_OUTPUT
 // useful definitions
-static constexpr const uint32_t kMIDIPacketNonDataSize = sizeof(MIDIPacket) - sizeof(MIDIPacket::data);
-static constexpr const uint32_t kMIDIPacketListNonDataSize = sizeof(MIDIPacketList) - sizeof(MIDIPacketList::packet);
+static constexpr const uint32_t kMIDIPacketNonDataSize = sizeof(MIDIPacket)
+                                                      #if __cplusplus >= 201103L
+                                                       - sizeof(MIDIPacket::data);
+                                                      #else
+                                                       - sizeof(static_cast<MIDIPacket*>(0)->data);
+                                                      #endif
+static constexpr const uint32_t kMIDIPacketListNonDataSize = sizeof(MIDIPacketList)
+                                                          #if __cplusplus >= 201103L
+                                                           - sizeof(MIDIPacketList::packet);
+                                                          #else
+                                                           - sizeof(static_cast<MIDIPacketList*>(0)->packet);
+                                                          #endif
 
 // size of data used for midi events
 static constexpr const uint32_t kMIDIPacketListMaxDataSize = kMIDIPacketNonDataSize * kMaxMidiEvents