rpms
/
Carla
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drop explicit dep on jack-audio-connection-kit

This commit is contained in:
Martin Gansser 2021-03-05 15:27:55 +01:00
parent caa288ea3b
commit 233c7b4f1c
3 changed files with 4 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
Carla-bswap.patch
View File

@ -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));

6
Carla.spec
View File

@ -2,7 +2,7 @@
Name: Carla
Version: 2.2.0
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Audio plugin host
# The entire source code is GPLv2+ except
@ -71,7 +71,6 @@ BuildRequires: python3-magic
BuildRequires: pkgconfig(liblo)
BuildRequires: pkgconfig(zlib)
BuildRequires: desktop-file-utils
Requires: jack-audio-connection-kit
Requires: python3-qt5
Requires: python3-pyliblo
Requires: hicolor-icon-theme
@ -213,6 +212,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_libdir}/pkgconfig/%{pname}-native-plugin.pc
%changelog
* Fri Mar 05 2021 Martin Gansser <martinkg@fedoraproject.org> - 1:2.2.0-2
- Drop explicit dep on jack-audio-connection-kit
* Sun Sep 27 2020 Martin Gansser <martinkg@fedoraproject.org> - 1:2.2.0-1
- Update to 2.2.0

26
carla-0001-change-libdir-path.patch
View File

@ -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"