Merge pull request #156 from SpotlightKid/feat/rtmidi-build-updates

Update rtmidi submodule and improve build dependency selection

Author: brunoenten

.github/workflows/tests.yml .github/workflows/pr_to_master.yml.github/workflows/tests.yml renamed to .github/workflows/pr_to_master.yml

@@ -1,12 +1,9 @@
 name: Build sdist and wheels for testing purposes
 
 on:
-  push:
-    branches:
-      - improve-build
   pull_request:
     branches:
-      - improve-build
+      - master
 
 jobs:
   build_sdist:
@@ -30,10 +27,6 @@ jobs:
    - name: Check metadata
      run: pipx run twine check --strict dist/*
 
-   - uses: actions/upload-artifact@v3
-     with:
-       path: dist/*.tar.gz
-
   build_wheels:
     name: Build wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
@@ -53,10 +46,6 @@ jobs:
     - name: Build wheels
       uses: pypa/[email protected]
 
-    - uses: actions/upload-artifact@v3
-      with:
-        path: wheelhouse/*.whl
-
   build_arch_wheels:
    name: Build wheels on Linux ${{ matrix.arch }}
    runs-on: ubuntu-20.04
@@ -81,7 +70,3 @@ jobs:
      run: git diff --exit-code
      shell: bash
 
-   - name: Upload wheels
-     uses: actions/upload-artifact@v3
-     with:
-       path: wheelhouse/*.whl

.github/workflows/development.yml .github/workflows/push_to_master.yml.github/workflows/development.yml renamed to .github/workflows/push_to_master.yml

@@ -3,10 +3,7 @@ name: Build sdist and wheels and publish to TestPyPI
 on:
   push:
     branches:
-      - develop
-  pull_request:
-    branches:
-      - develop
+      - master
 
 jobs:
   build_sdist:

.github/workflows/production.yml .github/workflows/release.yml.github/workflows/production.yml renamed to .github/workflows/release.yml

@@ -24,7 +24,6 @@ else
     jack_dep = disabler()
 endif
 
-
 jack_not_found = jack_dep.found() ? false : true
 
 ## From https://github.com/numpy/numpy/blob/main/numpy/meson.build
@@ -65,9 +64,16 @@ else
 
     # API
     alsa_dep = dependency('alsa', required: jack_not_found)
-    threads_dep = dependency('threads')
 endif # Platform detection
 
+jack_support = jack_dep.found() and get_option('jack')
+alsa_support = host_machine.system() == 'linux' and alsa_dep.found() and get_option('alsa')
+coremidi_support = host_machine.system() == 'darwin' and coremidi_dep.found() and get_option('coremidi')
+winmm_support = host_machine.system() == 'windows' and winmm_dep.found() and get_option('winmm')
+
+threads_dep = dependency('threads', required: alsa_support or jack_support)
+have_semaphore = cpp.has_header('semaphore.h')
+
 pymod = import('python')
 python = pymod.find_installation(get_option('python'), required: true)
 
@@ -85,9 +91,9 @@ endif
 summary({
     'Debug messages (verbose)': get_option('verbose'),
     'Build for wheel': get_option('wheel'),
-    'JACK support': jack_dep.found() and get_option('jack'),
-    'ALSA support': host_machine.system() == 'linux' and alsa_dep.found() and get_option('alsa'),
-    'CoreMIDI support': host_machine.system() == 'darwin' and coremidi_dep.found() and get_option('coremidi'),
-    'Window MM support': host_machine.system() == 'windows' and winmm_dep.found() and get_option('winmm'),
+    'JACK support': jack_support,
+    'ALSA support': alsa_support,
+    'CoreMIDI support': coremidi_support,
+    'Window MM support': winmm_support,
 }, section: 'Configuration')
 

meson.build

@@ -11,4 +11,5 @@
     print('Compiling Python module to bytecode...')
 
 moduledir = sysconfig.get_path('purelib', vars={'base': destdir})
-compile_dir(path.join(moduledir, 'rtmidi'), optimize=1)
+compile_dir(path.join(moduledir, 'rtmidi'), optimize=1, quiet=not verbose,
+            stripdir=destdir or None)

meson_postinstall.py

@@ -44,7 +44,7 @@ keywords = [
 meson-python-option-name = "python"
 meson-options = [
     "-Dwheel=true",
-    "-Dverbose=true",
+    "-Dverbose=false",
     "--buildtype=plain"
 ]
 
@@ -106,7 +106,7 @@ before-all = [
 
 [tool.cibuildwheel.macos]
 build = "cp3{8,9,10,11}-macosx*"
-archs = ["universal2"]
+archs = ["x86_64", "arm64"]
 environment = { MACOSX_DEPLOYMENT_TARGET = "10.14" }
 before-all = [
     "pipx install ninja",
@@ -115,4 +115,4 @@ before-all = [
 [tool.cibuildwheel.windows]
 build = "cp3{8,9,10,11}-win*"
 archs = ["AMD64"]
-build-verbosity = 1
+

pyproject.toml

@@ -4,7 +4,7 @@ defines = []
 dependencies = [python.dependency()]
 link_args = []
 
-if host_machine.system() == 'darwin' and coremidi_dep.found() and get_option('coremidi')
+if coremidi_support
     defines += ['-D__MACOSX_CORE__']
     #defines += ['-frtti']
     dependencies += [coremidi_dep]
@@ -15,25 +15,28 @@ if host_machine.system() == 'darwin' and coremidi_dep.found() and get_option('co
     ]
 endif
 
-if host_machine.system() == 'linux'
+if alsa_support or jack_support
     dependencies += [threads_dep]
 endif
 
-if host_machine.system() == 'linux' and alsa_dep.found() and get_option('alsa')
+if alsa_support
     defines += ['-D__LINUX_ALSA__']
     dependencies += [alsa_dep]
 endif
 
-if host_machine.system() == 'windows' and get_option('winmm')
+if winmm_support
     defines += ['-D__WINDOWS_MM__']
     if meson.get_compiler('cpp').get_id() != 'gcc'
         defines += ['/EHsc']
     endif
     dependencies += [winmm_dep]
 endif
 
-if jack_dep.found() and get_option('jack')
+if jack_support
     defines += ['-D__UNIX_JACK__', '-DJACK_HAS_PORT_RENAME']
+    if have_semaphore
+        defines += ['-DHAVE_SEMAPHORE']
+    endif
     dependencies += [jack_dep]
 endif
 

rtmidi/meson.build

@@ -150,8 +150,8 @@ cdef extern from "RtMidi.h":
         LINUX_ALSA   "RtMidi::LINUX_ALSA"
         UNIX_JACK    "RtMidi::UNIX_JACK"
         WINDOWS_MM   "RtMidi::WINDOWS_MM"
-        RTMIDI_DUMMY "RtMidi::RTMIDI_DUMMY"
         WEB_MIDI     "RtMidi::WEB_MIDI_API"
+        RTMIDI_DUMMY "RtMidi::RTMIDI_DUMMY"
 
     cdef enum ErrorType "RtMidiError::Type":
         ERR_WARNING           "RtMidiError::WARNING"
@@ -247,8 +247,8 @@ API_MACOSX_CORE = MACOSX_CORE
 API_LINUX_ALSA = LINUX_ALSA
 API_UNIX_JACK = UNIX_JACK
 API_WINDOWS_MM = WINDOWS_MM
-API_RTMIDI_DUMMY = RTMIDI_DUMMY
 API_WEB_MIDI = WEB_MIDI
+API_RTMIDI_DUMMY = RTMIDI_DUMMY
 
 # export error values to Python
 

src/_rtmidi.pyx

@@ -57,7 +57,7 @@ def test_get_compiled_api_by_name(self):
     def test_get_rtmidi_version(self):
         version = rtmidi.get_rtmidi_version()
         self.assertTrue(isinstance(version, string_types))
-        self.assertEqual(version, '4.0.0')
+        self.assertEqual(version, '5.0.0')
 
 
 class BaseTests: