From 481af0799830db02f011a88ed251935e353f7b79 Mon Sep 17 00:00:00 2001 From: Martin Rys Date: Fri, 20 Dec 2024 13:28:12 +0100 Subject: [PATCH] Cleanup docs --- mac.spec | 3 --- pyproject.toml | 8 ++------ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/mac.spec b/mac.spec index db7a19bed6..fe590d251c 100644 --- a/mac.spec +++ b/mac.spec @@ -24,7 +24,6 @@ a = Analysis( binaries=[ *lib_paths, (phazor_path, "."), -# (f"{prefix}/Cellar/ffmpeg", "."), (f"{prefix}/bin/ffmpeg", "."), ], datas=[ @@ -96,8 +95,6 @@ app = BUNDLE( "LSEnvironment": { "LANG": "en_US.UTF-8", "LC_CTYPE": "en_US.UTF-8", - # Set DYLD_LIBRARY_PATH to ensure the app can locate dynamic libraries -# "DYLD_LIBRARY_PATH": f"{prefix}/lib", }}) for lib in lib_paths: diff --git a/pyproject.toml b/pyproject.toml index 0a40513c15..dba58dd222 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -88,6 +88,8 @@ # Linux + macOS ext-modules = [ {name = "phazor", sources = ["src/phazor/kissfft/kiss_fftr.c", "src/phazor/kissfft/kiss_fft.c", "src/phazor/phazor.c"], include-dirs = ["/usr/include/opus", "/opt/homebrew/include/opus", "/opt/homebrew/include"], libraries = ["samplerate", "wavpack", "opusfile", "vorbisfile", "mpg123", "FLAC", "openmpt", "gme"], library-dirs = ["/opt/homebrew/lib"] }, + # Set as optional to allow soft-failure, it's expected not to build on Windows/macOS, but we don't want to fail the entire build on it + # I have not found a better way to solve this, ideally we would somehow tag this as Linux-exclusive {name = "phazor-pw", sources = ["src/phazor/kissfft/kiss_fftr.c", "src/phazor/kissfft/kiss_fft.c", "src/phazor/phazor.c"], include-dirs = ["/usr/include/opus"], libraries = ["samplerate", "wavpack", "opusfile", "vorbisfile", "mpg123", "FLAC", "openmpt", "gme", "pipewire-0.3"], optional = true }, ] @@ -108,12 +110,6 @@ [tool.setuptools.dynamic] dependencies = {file = "requirements.txt"} -# # Windows -## dependencies = {file = "requirements_windows.txt"} -# # Linux -# dependencies = {file = "requirements_linux.txt"} -# # macOS -# dependencies = {file = "requirements_macos.txt"} [tool.setuptools.package-data] "tauon" = ["assets/*", "assets/svg/*", "locale/*/*/*.mo", "templates/*", "theme/*"]