From 60d2651f2efbab7e1cfe8472e36ac500e5e46065 Mon Sep 17 00:00:00 2001 From: falkTX Date: Mon, 1 Jan 2024 19:39:53 +0100 Subject: [PATCH] Cleanup last few build details Signed-off-by: falkTX --- .github/workflows/build.yml | 3 ++- Makefile | 3 --- Makefile.base.mk | 2 +- deps/Makefile | 6 ++++++ include/simd-compat/emmintrin.h | 2 +- include/simd-compat/immintrin.h | 2 ++ include/simd-compat/mmintrin.h | 2 +- include/simd-compat/pmmintrin.h | 2 +- include/simd-compat/simd-compat.h | 14 ++++++++++++++ include/simd-compat/smmintrin.h | 2 +- include/simd-compat/tmmintrin.h | 2 +- include/simd-compat/xmmintrin.h | 2 +- src/override/common.cpp | 17 +++-------------- 13 files changed, 34 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 22cd44c..d2a2d16 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -417,7 +417,7 @@ jobs: - name: Set up dependencies run: | ./deps/PawPaw/.github/workflows/bootstrap-deps.sh ${{ matrix.target }} - apt-get install -yqq wget zip + apt-get install -yqq wget xvfb zip apt-get clean - name: Set up ccache uses: hendrikmuhs/ccache-action@v1.2 @@ -458,6 +458,7 @@ jobs: run: echo "SHA8=$(echo ${{ github.ref_name }})" >> $GITHUB_ENV - name: Pack binaries if: steps.cache.outputs.cache-hit == 'true' + shell: bash run: | pushd bin zip -r -9 ../${{ github.event.repository.name }}-${{ matrix.target }}-${{ github.event.pull_request.number || env.SHA8 }}.zip $(ls | grep -e lv2 -e vst -e clap) diff --git a/Makefile b/Makefile index e2c3a6b..62ada82 100644 --- a/Makefile +++ b/Makefile @@ -268,9 +268,6 @@ clean: $(MAKE) clean -C plugins $(MAKE) clean -C src rm -rf bin build build-headless dpf/utils/lv2_ttl_generator.d - # FIXME - rm -f src/Rack/BaconMusic/default-skin.json - rm -f src/Rack/SurgeXTRack/default-skin.json # -------------------------------------------------------------- # Install step diff --git a/Makefile.base.mk b/Makefile.base.mk index 27c62b4..9c5097f 100644 --- a/Makefile.base.mk +++ b/Makefile.base.mk @@ -73,7 +73,7 @@ BASE_FLAGS += -msse -msse2 -msse3 -msimd128 else ifeq ($(CPU_ARM32),true) BASE_FLAGS += -mfpu=neon-vfpv4 -mfloat-abi=hard else ifeq ($(CPU_I386_OR_X86_64),true) -BASE_FLAGS += -msse -msse2 -msse3 -mfpmath=sse +BASE_FLAGS += -msse -msse2 -msse3 endif ifeq ($(SYSDEPS),true) diff --git a/deps/Makefile b/deps/Makefile index cd785bc..5e70651 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -335,6 +335,12 @@ clean: rm -rf $(RACK_DEP_PATH)/jansson-2.12 rm -rf $(RACK_DEP_PATH)/libarchive-3.4.3 rm -rf $(RACK_DEP_PATH)/libsamplerate-0.1.9 + rm -rf $(RACK_DEP_PATH)/speexdsp/autom4te.cache + rm -rf $(RACK_DEP_PATH)/speexdsp/libspeexdsp/.deps + rm -rf $(RACK_DEP_PATH)/speexdsp/libspeexdsp/.libs + rm -rf $(RACK_DEP_PATH)/speexdsp/libspeexdsp/*.lo + rm -rf $(RACK_DEP_PATH)/speexdsp/libspeexdsp/*.o + rm -rf $(RACK_DEP_PATH)/speexdsp/Makefile rm -rf $(RACK_DEP_PATH)/zstd-1.4.5 rm -rf $(SURGE_DEP_PATH) diff --git a/include/simd-compat/emmintrin.h b/include/simd-compat/emmintrin.h index afe9803..3f8a42f 100644 --- a/include/simd-compat/emmintrin.h +++ b/include/simd-compat/emmintrin.h @@ -8,7 +8,7 @@ #include "simd-compat.h" -#ifdef SIMDE_X86_SSE2_NATIVE +#if defined(CARDINAL_INCLUDING_IMMINTRIN_H) || defined(SIMDE_X86_SSE2_NATIVE) # include_next #else # include "mmintrin.h" diff --git a/include/simd-compat/immintrin.h b/include/simd-compat/immintrin.h index d10cbf9..d20a011 100644 --- a/include/simd-compat/immintrin.h +++ b/include/simd-compat/immintrin.h @@ -9,7 +9,9 @@ #include "simd-compat.h" #ifdef SIMDE_X86_SSE_NATIVE +# define CARDINAL_INCLUDING_IMMINTRIN_H # include_next +# undef CARDINAL_INCLUDING_IMMINTRIN_H #else # include "mmintrin.h" # include "xmmintrin.h" diff --git a/include/simd-compat/mmintrin.h b/include/simd-compat/mmintrin.h index d4cd4d0..e475090 100644 --- a/include/simd-compat/mmintrin.h +++ b/include/simd-compat/mmintrin.h @@ -8,7 +8,7 @@ #include "simd-compat.h" -#ifdef SIMDE_X86_MMX_NATIVE +#if defined(CARDINAL_INCLUDING_IMMINTRIN_H) || defined(SIMDE_X86_MMX_NATIVE) # include_next #else # define SIMDE_ENABLE_NATIVE_ALIASES diff --git a/include/simd-compat/pmmintrin.h b/include/simd-compat/pmmintrin.h index e6be1f1..310fb4c 100644 --- a/include/simd-compat/pmmintrin.h +++ b/include/simd-compat/pmmintrin.h @@ -8,7 +8,7 @@ #include "simd-compat.h" -#ifdef SIMDE_X86_SSE3_NATIVE +#if defined(CARDINAL_INCLUDING_IMMINTRIN_H) || defined(SIMDE_X86_SSE3_NATIVE) # include_next #else # include "mmintrin.h" diff --git a/include/simd-compat/simd-compat.h b/include/simd-compat/simd-compat.h index 26cc93e..555db92 100644 --- a/include/simd-compat/simd-compat.h +++ b/include/simd-compat/simd-compat.h @@ -50,3 +50,17 @@ # define SIMDE_WASM_SIMD128_NATIVE # endif #endif + +// fix win32 build +#ifdef _WIN32 +static inline +float simde_math_roundevenf(float v) { + float rounded = __builtin_roundf(v); + float diff = rounded - v; + if (__builtin_expect(!!(__builtin_fabsf(diff) == 0.5f) && ((int)rounded & 1), 0)) { + rounded = v - diff; + } + return rounded; +} +#define simde_math_roundevenf simde_math_roundevenf +#endif diff --git a/include/simd-compat/smmintrin.h b/include/simd-compat/smmintrin.h index 5c6fb9a..1bf8aa8 100644 --- a/include/simd-compat/smmintrin.h +++ b/include/simd-compat/smmintrin.h @@ -8,7 +8,7 @@ #include "simd-compat.h" -#ifdef SIMDE_X86_SSE4_1_NATIVE +#if defined(CARDINAL_INCLUDING_IMMINTRIN_H) || defined(SIMDE_X86_SSE4_1_NATIVE) # include_next #else # include "mmintrin.h" diff --git a/include/simd-compat/tmmintrin.h b/include/simd-compat/tmmintrin.h index 32b6476..b4a4ddd 100644 --- a/include/simd-compat/tmmintrin.h +++ b/include/simd-compat/tmmintrin.h @@ -8,7 +8,7 @@ #include "simd-compat.h" -#ifdef SIMDE_X86_SSSE3_NATIVE +#if defined(CARDINAL_INCLUDING_IMMINTRIN_H) || defined(SIMDE_X86_SSSE3_NATIVE) # include_next #else # include "mmintrin.h" diff --git a/include/simd-compat/xmmintrin.h b/include/simd-compat/xmmintrin.h index 237038c..3874baa 100644 --- a/include/simd-compat/xmmintrin.h +++ b/include/simd-compat/xmmintrin.h @@ -8,7 +8,7 @@ #include "simd-compat.h" -#ifdef SIMDE_X86_SSE_NATIVE +#if defined(CARDINAL_INCLUDING_IMMINTRIN_H) || defined(SIMDE_X86_SSE_NATIVE) # include_next #else # include "mmintrin.h" diff --git a/src/override/common.cpp b/src/override/common.cpp index 336034b..acf6a56 100644 --- a/src/override/common.cpp +++ b/src/override/common.cpp @@ -1,18 +1,7 @@ /* * DISTRHO Cardinal Plugin - * Copyright (C) 2021-2023 Filipe Coelho - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 3 of - * the License, or any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * For a full copy of the GNU General Public License see the LICENSE file. + * Copyright (C) 2021-2024 Filipe Coelho + * SPDX-License-Identifier: GPL-3.0-or-later */ /** @@ -63,7 +52,7 @@ const std::string APP_NAME = "Cardinal"; const std::string APP_EDITION = getPluginFormatName(); const std::string APP_EDITION_NAME = "Audio Plugin"; const std::string APP_VERSION_MAJOR = "2"; -const std::string APP_VERSION = "2.3.0"; +const std::string APP_VERSION = "2.4.1"; #if defined ARCH_WIN const std::string APP_OS = "win"; #elif defined ARCH_MAC