merge conflicts

Author: dromer

.github/workflows/cmake.yml

@@ -59,19 +59,14 @@ jobs:
           AC_PASSWORD: ${{ secrets.AC_PASSWORD }}
         run: ./.github/scripts/package-macOS.sh plugdata-macOS-Universal.pkg
 
-      - name: Authorise Google Cloud
+      - name: Upload to Cloud Storage
         if: github.ref == 'refs/heads/develop'
-        uses: "google-github-actions/auth@v2"
-        with:
-          credentials_json: ${{ secrets.GCP_SA_KEY }}
-
-      - name: Upload to Google Cloud
-        if: github.ref == 'refs/heads/develop'
-        uses: "google-github-actions/upload-cloud-storage@v2"
-        with:
-          path: ./
-          glob: ./plugdata-macOS-Universal.*
-          destination: "plugdata-nightly"
+        run: |
+          aws configure set aws_access_key_id ${{ secrets.AWS_ACCESS_KEY }}
+          aws configure set aws_secret_access_key ${{ secrets.AWS_SECRET_KEY }}
+          aws configure set default.region eu-north-1
+          aws s3 cp ./plugdata-macOS-Universal.pkg s3://plugdata-nightly/
+          aws s3 cp ./plugdata-macOS-Universal.pkg.txt s3://plugdata-nightly/
 
       - name: Archive Artifacts
         uses: actions/upload-artifact@v4
@@ -139,19 +134,14 @@ jobs:
           AC_PASSWORD: ${{ secrets.AC_PASSWORD }}
         run: ./.github/scripts/package-macOS.sh plugdata-macOS-Legacy.pkg
 
-      - name: Authorise Google Cloud
+      - name: Upload to Cloud Storage
         if: github.ref == 'refs/heads/develop'
-        uses: "google-github-actions/auth@v2"
-        with:
-          credentials_json: ${{ secrets.GCP_SA_KEY }}
-
-      - name: Upload to Google Cloud
-        if: github.ref == 'refs/heads/develop'
-        uses: "google-github-actions/upload-cloud-storage@v2"
-        with:
-          path: ./
-          glob: ./plugdata-macOS-Legacy.*
-          destination: "plugdata-nightly"
+        run: |
+          aws configure set aws_access_key_id ${{ secrets.AWS_ACCESS_KEY }}
+          aws configure set aws_secret_access_key ${{ secrets.AWS_SECRET_KEY }}
+          aws configure set default.region eu-north-1
+          aws s3 cp ./plugdata-macOS-Legacy.pkg s3://plugdata-nightly/
+          aws s3 cp ./plugdata-macOS-Legacy.pkg.txt s3://plugdata-nightly/
 
       - name: Archive Artifacts
         uses: actions/upload-artifact@v4
@@ -199,19 +189,15 @@ jobs:
         run: |
           ./.github/scripts/package-Windows.sh plugdata-Win64.msi
 
-      - name: Authorise Google Cloud
-        if: github.ref == 'refs/heads/develop'
-        uses: "google-github-actions/auth@v2"
-        with:
-          credentials_json: ${{ secrets.GCP_SA_KEY }}
-
-      - name: Upload to Google Cloud
+      - name: Upload to Cloud Storage
         if: github.ref == 'refs/heads/develop'
-        uses: "google-github-actions/upload-cloud-storage@v2"
-        with:
-          path: ./
-          glob: ./plugdata-Win64.*
-          destination: "plugdata-nightly"
+        run: |
+          choco install awscli
+          aws configure set aws_access_key_id ${{ secrets.AWS_ACCESS_KEY }}
+          aws configure set aws_secret_access_key ${{ secrets.AWS_SECRET_KEY }}
+          aws configure set default.region eu-north-1
+          aws s3 cp ./plugdata-Win64.msi s3://plugdata-nightly/
+          aws s3 cp ./plugdata-Win64.msi.txt s3://plugdata-nightly/
 
       - name: Archive Artifacts
         uses: actions/upload-artifact@v4
@@ -261,19 +247,15 @@ jobs:
         run: |
           ./.github/scripts/package-Windows.sh plugdata-Win32.msi
 
-      - name: Authorise Google Cloud
-        if: github.ref == 'refs/heads/develop'
-        uses: "google-github-actions/auth@v2"
-        with:
-          credentials_json: ${{ secrets.GCP_SA_KEY }}
-
-      - name: Upload to Google Cloud
+      - name: Upload to Cloud Storage
         if: github.ref == 'refs/heads/develop'
-        uses: "google-github-actions/upload-cloud-storage@v2"
-        with:
-          path: ./
-          glob: ./plugdata-Win32.*
-          destination: "plugdata-nightly"
+        run: |
+          choco install awscli
+          aws configure set aws_access_key_id ${{ secrets.AWS_ACCESS_KEY }}
+          aws configure set aws_secret_access_key ${{ secrets.AWS_SECRET_KEY }}
+          aws configure set default.region eu-north-1
+          aws s3 cp ./plugdata-Win32.msi s3://plugdata-nightly/
+          aws s3 cp ./plugdata-Win32.msi.txt s3://plugdata-nightly/
 
       - name: Archive Artifacts
         uses: actions/upload-artifact@v4
@@ -327,19 +309,19 @@ jobs:
     steps:
       - name: Install Dependencies (dnf)
         if: ${{ matrix.pacman == 'dnf' }}
-        run: dnf install -y git cmake alsa-lib-devel libXinerama-devel freetype-devel curl libcurl-devel wget bzip2 gcc-c++ libXi-devel libXcomposite-devel freeglut-devel libXrandr-devel libXcursor-devel xz ccache python python3-pip jack-audio-connection-kit-devel libatomic
+        run: dnf install -y git cmake alsa-lib-devel libXinerama-devel freetype-devel curl libcurl-devel wget bzip2 gcc-c++ libXi-devel libXcomposite-devel freeglut-devel libXrandr-devel libXcursor-devel xz ccache python python3-pip jack-audio-connection-kit-devel libatomic unzip
 
       - name: Install Dependencies (apt)
         if: ${{ matrix.pacman == 'apt' }}
-        run: apt update && DEBIAN_FRONTEND=noninteractive TZ="Europe/Amsterdam" apt install -y cmake git wget bzip2 build-essential libasound2-dev libjack-jackd2-dev curl libcurl4-openssl-dev libfreetype6-dev libx11-dev libxi-dev libxcomposite-dev libxcursor-dev libxcursor-dev libxext-dev libxrandr-dev libxinerama-dev ccache python3 python3-pip freeglut3-dev
+        run: apt update && DEBIAN_FRONTEND=noninteractive TZ="Europe/Amsterdam" apt install -y cmake git wget bzip2 build-essential libasound2-dev libjack-jackd2-dev curl libcurl4-openssl-dev libfreetype6-dev libx11-dev libxi-dev libxcomposite-dev libxcursor-dev libxcursor-dev libxext-dev libxrandr-dev libxinerama-dev ccache python3 python3-pip freeglut3-dev unzip
 
       - name: Install Dependencies (zypper)
         if: ${{ matrix.pacman == 'zypper' }}
-        run: zypper refresh && zypper install -y git rsync wget bzip2 xz tar gzip cmake alsa-lib-devel libXinerama-devel libXi-devel freetype-devel libcurl-devel libXcomposite-devel freeglut-devel libXrandr-devel libXcursor-devel freetype2-devel gcc gcc-c++ curl ccache python python3-pip libjack-devel gawk
+        run: zypper refresh && zypper install -y git rsync wget bzip2 xz tar gzip cmake alsa-devel libXinerama-devel libXi-devel libcurl-devel libXcomposite-devel freeglut-devel libXrandr-devel libXcursor-devel freetype2-devel gcc gcc-c++ curl ccache python3 libjack-devel gawk unzip
 
       - name: Install Dependencies (pacman)
         if: ${{ matrix.pacman == 'pacman' }}
-        run: pacman -Sy && pacman -S --noconfirm cmake wget bzip2 git alsa-lib freetype2 libx11 libxcursor libxi libxext libxinerama libxrandr libxrender webkit2gtk cmake make gcc pkgconf python python-pip curl ccache freeglut mesa glfw-x11 glew jack2 openssl && pacman --noconfirm -Syu
+        run: pacman -Sy && pacman -S --noconfirm cmake wget bzip2 git alsa-lib freetype2 libx11 libxcursor libxi libxext libxinerama libxrandr libxrender webkit2gtk cmake make gcc pkgconf python python-pip curl ccache freeglut mesa glfw-x11 glew jack2 openssl unzip && pacman --noconfirm -Syu
 
       - uses: actions/checkout@v4
         with:
@@ -367,19 +349,17 @@ jobs:
         working-directory: ${{github.workspace}}
         run: ./.github/scripts/package-Linux.sh plugdata-${{ matrix.name }}.tar.gz
 
-      - name: Authorise Google Cloud
-        if: github.ref == 'refs/heads/develop'
-        uses: "google-github-actions/auth@v2"
-        with:
-          credentials_json: ${{ secrets.GCP_SA_KEY }}
-
-      - name: Upload to Google Cloud
+      - name: Upload to Cloud Storage
         if: github.ref == 'refs/heads/develop'
-        uses: "google-github-actions/upload-cloud-storage@v2"
-        with:
-          path: ./
-          glob: plugdata-${{ matrix.name }}.tar.*
-          destination: "plugdata-nightly"
+        run: |
+          curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+          unzip awscliv2.zip
+          ./aws/install
+          aws configure set aws_access_key_id ${{ secrets.AWS_ACCESS_KEY }}
+          aws configure set aws_secret_access_key ${{ secrets.AWS_SECRET_KEY }}
+          aws configure set default.region eu-north-1
+          aws s3 cp ./plugdata-${{ matrix.name }}.tar.gz s3://plugdata-nightly/
+          aws s3 cp ./plugdata-${{ matrix.name }}.tar.gz.txt s3://plugdata-nightly/
 
       - name: Archive Artifacts
         uses: actions/upload-artifact@v4

CMakeLists.txt

@@ -90,6 +90,11 @@ if(ENABLE_PERFETTO)
   add_subdirectory(Libraries/melatonin_perfetto EXCLUDE_FROM_ALL)
 endif()
 
+set(PLUGDATA_VERSION "0.9.2")
+set_directory_properties(PROPERTIES JUCE_COMPANY_NAME "plugdata")
+set_directory_properties(PROPERTIES JUCE_COMPANY_COPYRIGHT "plugdata by Timothy Schoen")
+set_directory_properties(PROPERTIES JUCE_COMPANY_WEBSITE "plugdata.org")
+
 cmake_policy(SET CMP0091 NEW)
 set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 
@@ -127,11 +132,6 @@ if(NOT PACKAGE_RESOURCES_RESULT EQUAL 0)
     message(FATAL_ERROR "Resource packaging failed with error code ${PACKAGE_RESOURCES_RESULT}")
 endif()
 
-set(PLUGDATA_VERSION                    "0.9.2")
-set(PLUGDATA_COMPANY_NAME               "plugdata")
-set(PLUGDATA_COMPANY_COPYRIGHT          "plugdata by Timothy Schoen")
-set(PLUGDATA_COMPANY_WEBSITE            "github.com/plugdata-team/plugdata")
-
 if("${CMAKE_SYSTEM_NAME}" MATCHES "iOS")
     set(PLUGDATA_ICON_BIG                   "${CMAKE_CURRENT_SOURCE_DIR}/Resources/Icons/plugdata_logo_ios.png")
 elseif(APPLE)
@@ -194,7 +194,12 @@ file(GLOB plugdata_sources
 
 # Set up testing
 if(ENABLE_TESTING)
-    list(APPEND plugdata_sources ${CMAKE_CURRENT_SOURCE_DIR}/Tests/Tests.cpp)
+    list(APPEND plugdata_sources
+    ${CMAKE_CURRENT_SOURCE_DIR}/Tests/Tests.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/Tests/Tests.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/Tests/HelpfileFuzzTest.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/Tests/ObjectFuzzTest.h
+    )
 
 endif()
 
@@ -239,6 +244,7 @@ set(JUCE_COMPILE_DEFINITIONS
     JUCE_COREGRAPHICS_RENDER_WITH_MULTIPLE_PAINT_CALLS=0
     JUCE_JACK=1
     JUCE_JACK_CLIENT_NAME="plugdata"
+    JUCE_USE_DIRECTWRITE=0
 )
 
 if(LINUX)
@@ -407,9 +413,6 @@ set(AU_EFFECT_TYPE kAudioUnitType_Effect)
 
 juce_add_plugin(plugdata_standalone
     VERSION                     ${PLUGDATA_VERSION}
-    COMPANY_NAME                ${PLUGDATA_COMPANY_NAME}
-    COMPANY_COPYRIGHT           ${PLUGDATA_COMPANY_COPYRIGHT}
-    COMPANY_WEBSITE             ${PLUGDATA_COMPANY_WEBSITE}
     PLUGIN_DESCRIPTION          "A plugin that loads Pure Data patches"
     ICON_BIG                    ${PLUGDATA_ICON_BIG}
     LAUNCH_STORYBOARD_FILE      ${CMAKE_CURRENT_SOURCE_DIR}/Resources/Icons/LaunchScreen.storyboard
@@ -453,11 +456,10 @@ juce_add_plugin(plugdata_standalone
     target_sources(plugdata_standalone_Standalone PUBLIC ${IOS_LAUNCHSCREEN})
 endif()
 
+
+
 juce_add_plugin(plugdata
     VERSION                     ${PLUGDATA_VERSION}
-    COMPANY_NAME                ${PLUGDATA_COMPANY_NAME}
-    COMPANY_COPYRIGHT           ${PLUGDATA_COMPANY_COPYRIGHT}
-    COMPANY_WEBSITE             ${PLUGDATA_COMPANY_WEBSITE}
     PLUGIN_DESCRIPTION          "Visual audio programming environment"
     ICON_BIG                    ${PLUGDATA_ICON_BIG}
     MICROPHONE_PERMISSION_ENABLED TRUE
@@ -489,9 +491,6 @@ juce_add_plugin(plugdata
 
 juce_add_plugin(plugdata_fx
     VERSION                     ${PLUGDATA_VERSION}
-    COMPANY_NAME                ${PLUGDATA_COMPANY_NAME}
-    COMPANY_COPYRIGHT           ${PLUGDATA_COMPANY_COPYRIGHT}
-    COMPANY_WEBSITE             ${PLUGDATA_COMPANY_WEBSITE}
     PLUGIN_DESCRIPTION          "Visual audio programming environment"
     ICON_BIG                    ${PLUGDATA_ICON_BIG}
     HARDENED_RUNTIME_ENABLED    ${HARDENED_RUNTIME_ENABLED}
@@ -525,9 +524,6 @@ juce_add_plugin(plugdata_fx
 if(APPLE)
 juce_add_plugin(plugdata_midi
     VERSION                     ${PLUGDATA_VERSION}
-    COMPANY_NAME                ${PLUGDATA_COMPANY_NAME}
-    COMPANY_COPYRIGHT           ${PLUGDATA_COMPANY_COPYRIGHT}
-    COMPANY_WEBSITE             ${PLUGDATA_COMPANY_WEBSITE}
     ICON_BIG                    ${PLUGDATA_ICON_BIG}
     HARDENED_RUNTIME_ENABLED    ${HARDENED_RUNTIME_ENABLED}
     HARDENED_RUNTIME_OPTIONS    ${HARDENED_RUNTIME_OPTIONS}

Libraries/CMakeLists.txt

@@ -5,6 +5,11 @@ cmake_minimum_required(VERSION 3.15)
 # ------------------------------------------------------------------------------#
 project(libpd VERSION 1.0.0 LANGUAGES C CXX)
 
+set(MESSAGE_QUIET ON)
+message(STATUS "Configuring fftw3")
+add_subdirectory(fftw3)
+set(MESSAGE_QUIET OFF)
+
 if(MSVC)
     set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
     option(BUILD_SHARED_LIBS "" FALSE)
@@ -32,6 +37,7 @@ set(PD_DIR "pure-data/")
 # ------------------------------------------------------------------------------#
 set(CMAKE_MACOSX_RPATH ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+set(CMAKE_VISIBILITY_INLINES_HIDDEN ON)
 
 set(PD_PATH "pure-data/")
 set(LIBPD_PATH "libpd/")
@@ -59,7 +65,7 @@ file(GLOB PD_SOURCES
     ${PD_PATH}/src/d_dac.c
     ${PD_PATH}/src/d_delay.c
     ${PD_PATH}/src/d_fft.c
-    ${PD_PATH}/src/d_fft_fftsg.c
+    ${PD_PATH}/src/d_fft_fftw.c
     ${PD_PATH}/src/d_filter.c
     ${PD_PATH}/src/d_global.c
     ${PD_PATH}/src/d_math.c
@@ -200,6 +206,7 @@ file(GLOB ELSE_SOURCES
 if(NOT ENABLE_FFMPEG)
 list(REMOVE_ITEM ELSE_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/pd-else/Source/Audio/play.file~.c)
 list(REMOVE_ITEM ELSE_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/pd-else/Source/Control/sfload.c)
+list(REMOVE_ITEM ELSE_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/pd-else/Source/Control/sfinfo.c)
 endif()
 
 
@@ -276,18 +283,12 @@ if(ENABLE_SFIZZ)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/pd-else/Source/Audio/sfz~)
 endif()
 
-
-
 # COMPILE DEFINITIONS OPTIONS
 # ------------------------------------------------------------------------------#
 if(PD_EXTRA)
     list(APPEND LIBPD_COMPILE_DEFINITIONS LIBPD_EXTRA=1)
 endif()
 
-if(NOT PD_LOCALE)
-    list(APPEND LIBPD_COMPILE_DEFINITIONS LIBPD_NO_NUMERIC=1)
-endif()
-
 # COMPILE DEFINITIONS OS
 # ------------------------------------------------------------------------------#
 if(WIN32)
@@ -393,6 +394,8 @@ list(APPEND SFONT_INCLUDES
 
 add_library(fluidlite STATIC ${SFONT_SOURCES})
 target_include_directories(fluidlite PRIVATE ${SFONT_INCLUDES})
+target_include_directories(fluidlite PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/pd-else/Source/Audio/sfont~)
+
 if(CMAKE_C_COMPILER_ID MATCHES "Clang|GNU")
 target_compile_options(fluidlite PRIVATE -Wno-compound-token-split-by-macro)
 endif()
@@ -496,6 +499,16 @@ elseif(APPLE)
     target_link_libraries(externals-multi PUBLIC ${externals_libs} ${GEM_LIBS_MULTI})
 endif()
 
+if(MSVC)
+target_link_libraries(pd PRIVATE fftw3f)
+target_link_libraries(pd-multi PRIVATE fftw3f)
+else()
+target_link_libraries(pd-src PRIVATE fftw3f)
+target_link_libraries(pd-src-multi PRIVATE fftw3f)
+endif()
+target_include_directories(pd-src PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/fftw3/api)
+target_include_directories(pd-src-multi PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/fftw3/api)
+
 # PTHREAD
 # ------------------------------------------------------------------------------#
 set(THREADS_PREFER_PTHREAD_FLAG On)