Update to 2.3.2
This commit is contained in:
Martin Gansser
parent
25b6007c4b
commit
2dfefa153d
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 <sys/endian.h>
|
||||
+#elif defined(CARLA_OS_LINUX)
|
||||
+# include <byteswap.h>
|
||||
+#elif defined(CARLA_OS_MAC)
|
||||
# include <libkern/OSByteOrder.h>
|
||||
#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<uint16> ((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));
|
||||
|
|
@ -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 <string>
|
||||
+
|
||||
#ifndef CARLA_LIBJACK_HPP_INCLUDED
|
||||
#define CARLA_LIBJACK_HPP_INCLUDED
|
||||
|
||||
|
|
@ -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 <algorithm>
|
||||
+#include <limits>
|
||||
|
||||
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 <string>
|
||||
+#include <limits>
|
||||
|
||||
namespace water {
|
||||
|
||||
|
|
@ -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 <martinkg@fedoraproject.org> - 1:2.3.2-1
|
||||
- Update to 2.3.2
|
||||
|
||||
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.3.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (Carla-2.3.1.tar.gz) = b6970e558c4ec1b4e768eff22f1dc52a1334f21e5d6ebe0a85ff10bc858c67d491a75f57466af71124a20eb0890c4e489182fbe5e90ef1e05bd73ca79c566725
|
||||
SHA512 (Carla-2.3.2.tar.gz) = 1406b7398ba589db1d5739bb79585f6b95d69904a08e665fbef4b511f609271ea56d920665aa1b9e04b7c79f214a887e28e3cec861c3418d76f12dde48b74dab
|
||||
|
|
|
|||
Loading…
Reference in New Issue