From 2dfefa153d5f03fefda2f183c0d272752d500a0f Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Mon, 9 Aug 2021 09:00:06 +0200 Subject: [PATCH] Update to 2.3.2 --- .gitignore | 1 + Carla-bswap.patch | 55 ----------------------------- Carla-gcc10-include.patch | 12 ------- Carla-gcc11-include.patch | 24 ------------- Carla.spec | 7 ++-- carla-0001-change-libdir-path.patch | 26 -------------- sources | 2 +- 7 files changed, 7 insertions(+), 120 deletions(-) delete mode 100644 Carla-bswap.patch delete mode 100644 Carla-gcc10-include.patch delete mode 100644 Carla-gcc11-include.patch delete mode 100644 carla-0001-change-libdir-path.patch diff --git a/.gitignore b/.gitignore index ff14f7b..04a4cd5 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /Carla-2.2.0.tar.gz /Carla-2.3.0.tar.gz /Carla-2.3.1.tar.gz +/Carla-2.3.2.tar.gz diff --git a/Carla-bswap.patch b/Carla-bswap.patch deleted file mode 100644 index 2a22b6b..0000000 --- a/Carla-bswap.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- a/source/modules/water/memory/ByteOrder.h.orig 2018-12-25 09:55:04.000000000 +0100 -+++ b/source/modules/water/memory/ByteOrder.h 2018-12-25 13:00:27.500279074 +0100 -@@ -28,7 +28,11 @@ - - #include "../water.h" - --#ifdef CARLA_OS_MAC -+#if defined(CARLA_OS_BSD) -+# include -+#elif defined(CARLA_OS_LINUX) -+# include -+#elif defined(CARLA_OS_MAC) - # include - #endif - -@@ -146,14 +150,24 @@ - //============================================================================== - inline uint16 ByteOrder::swap (uint16 n) noexcept - { -+ #if defined(CARLA_OS_BSD) -+ return bswap16 (n); -+ #elif defined(CARLA_OS_LINUX) -+ return bswap_16 (n); -+ #else - return static_cast ((n << 8) | (n >> 8)); -+ #endif - } - - inline uint32 ByteOrder::swap (uint32 n) noexcept - { -- #ifdef CARLA_OS_MAC -+ #if defined(CARLA_OS_BSD) -+ return bswap32 (n); -+ #elif defined(CARLA_OS_LINUX) -+ return bswap_32 (n); -+ #elif defined(CARLA_OS_MAC) - return OSSwapInt32 (n); -- #elif defined(CARLA_OS_WIN) || ! (defined (__arm__) || defined (__arm64__) || defined (__aarch64__)) -+ #elif defined(__i386__) || defined(__x86_64__) - asm("bswap %%eax" : "=a"(n) : "a"(n)); - return n; - #else -@@ -163,7 +177,11 @@ - - inline uint64 ByteOrder::swap (uint64 value) noexcept - { -- #ifdef CARLA_OS_MAC -+ #if defined(CARLA_OS_BSD) -+ return bswap64 (value); -+ #elif defined(CARLA_OS_LINUX) -+ return bswap_64 (value); -+ #elif defined(CARLA_OS_MAC) - return OSSwapInt64 (value); - #else - return (((uint64) swap ((uint32) value)) << 32) | swap ((uint32) (value >> 32)); diff --git a/Carla-gcc10-include.patch b/Carla-gcc10-include.patch deleted file mode 100644 index e0a4f38..0000000 --- a/Carla-gcc10-include.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/source/libjack/libjack.hpp.orig 2020-02-07 11:50:53.267552094 +0100 -+++ b/source/libjack/libjack.hpp 2020-02-07 11:52:53.336539210 +0100 -@@ -15,6 +15,9 @@ - * For a full copy of the GNU General Public License see the doc/GPL.txt file. - */ - -+// needed by gcc10 -+#include -+ - #ifndef CARLA_LIBJACK_HPP_INCLUDED - #define CARLA_LIBJACK_HPP_INCLUDED - diff --git a/Carla-gcc11-include.patch b/Carla-gcc11-include.patch deleted file mode 100644 index 519a1d2..0000000 --- a/Carla-gcc11-include.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/source/modules/water/text/CharacterFunctions.h b/source/modules/water/text/CharacterFunctions.h -index 4108e99..d9dfe8a 100644 ---- source/modules/water/text/CharacterFunctions.h -+++ source/modules/water/text/CharacterFunctions.h -@@ -29,6 +29,7 @@ - #include "../memory/Memory.h" - - #include -+#include - - namespace water { - -diff --git a/source/modules/water/text/String.h b/source/modules/water/text/String.h -index b636146..39cc712 100644 ---- source/modules/water/text/String.h -+++ source/modules/water/text/String.h -@@ -30,6 +30,7 @@ - #include "../memory/Memory.h" - - #include -+#include - - namespace water { - diff --git a/Carla.spec b/Carla.spec index fcaa3fb..2474ae9 100644 --- a/Carla.spec +++ b/Carla.spec @@ -1,8 +1,8 @@ %global pname carla Name: Carla -Version: 2.3.1 -Release: 2%{?dist} +Version: 2.3.2 +Release: 1%{?dist} Summary: Audio plugin host # The entire source code is GPLv2+ except @@ -225,6 +225,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/%{pname}. %{_libdir}/pkgconfig/%{pname}-host-plugin.pc %changelog +* Mon Aug 09 2021 Martin Gansser - 1:2.3.2-1 +- Update to 2.3.2 + * Wed Jul 21 2021 Fedora Release Engineering - 1:2.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/carla-0001-change-libdir-path.patch b/carla-0001-change-libdir-path.patch deleted file mode 100644 index 550d6a2..0000000 --- a/carla-0001-change-libdir-path.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/source/frontend/carla_shared.py.orig 2018-12-19 12:57:21.251802286 +0100 -+++ b/source/frontend/carla_shared.py 2018-12-19 12:59:24.154528863 +0100 -@@ -402,19 +402,19 @@ - splitter = ":" - - DEFAULT_LADSPA_PATH = HOME + "/.ladspa" -- DEFAULT_LADSPA_PATH += ":/usr/lib/ladspa" -+ DEFAULT_LADSPA_PATH += ":/usr/lib64/ladspa" - DEFAULT_LADSPA_PATH += ":/usr/local/lib/ladspa" - - DEFAULT_DSSI_PATH = HOME + "/.dssi" -- DEFAULT_DSSI_PATH += ":/usr/lib/dssi" -+ DEFAULT_DSSI_PATH += ":/usr/lib64/dssi" - DEFAULT_DSSI_PATH += ":/usr/local/lib/dssi" - - DEFAULT_LV2_PATH = HOME + "/.lv2" -- DEFAULT_LV2_PATH += ":/usr/lib/lv2" -+ DEFAULT_LV2_PATH += ":/usr/lib64/lv2" - DEFAULT_LV2_PATH += ":/usr/local/lib/lv2" - - DEFAULT_VST2_PATH = HOME + "/.vst" -- DEFAULT_VST2_PATH += ":/usr/lib/vst" -+ DEFAULT_VST2_PATH += ":/usr/lib64/vst" - DEFAULT_VST2_PATH += ":/usr/local/lib/vst" - - DEFAULT_SF2_PATH = HOME + "/.sounds/sf2" diff --git a/sources b/sources index 978db0c..2936e73 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Carla-2.3.1.tar.gz) = b6970e558c4ec1b4e768eff22f1dc52a1334f21e5d6ebe0a85ff10bc858c67d491a75f57466af71124a20eb0890c4e489182fbe5e90ef1e05bd73ca79c566725 +SHA512 (Carla-2.3.2.tar.gz) = 1406b7398ba589db1d5739bb79585f6b95d69904a08e665fbef4b511f609271ea56d920665aa1b9e04b7c79f214a887e28e3cec861c3418d76f12dde48b74dab