Compare commits
13 Commits
Author | SHA1 | Date |
---|---|---|
Martin Gansser | 1eecbae29f | |
Martin Gansser | 056d55c414 | |
Martin Gansser | 0622e51eb7 | |
Martin Gansser | c1572db0cb | |
Martin Gansser | 6414a563ca | |
Martin Gansser | 4e695ee9d3 | |
Martin Gansser | c643797f39 | |
Martin Gansser | c739d91d56 | |
Martin Gansser | ca73236226 | |
Martin Gansser | fdb589bf2d | |
Martin Gansser | 818ccace05 | |
Martin Gansser | 629d1bea0e | |
Martin Gansser | 036cd894f4 |
|
@ -16,7 +16,3 @@
|
|||
/Carla-2.4.1.tar.gz
|
||||
/Carla-2.4.2.tar.gz
|
||||
/Carla-2.4.3.tar.gz
|
||||
/Carla-2.4.4.tar.gz
|
||||
/Carla-2.5.0.tar.gz
|
||||
/Carla-2.5.1.tar.gz
|
||||
/Carla-2.5.2.tar.gz
|
||||
|
|
|
@ -1,35 +0,0 @@
|
|||
--- source/frontend/carla_shared.py.orig 2022-07-16 01:10:33.000000000 +0200
|
||||
+++ source/frontend/carla_shared.py 2022-09-28 10:00:32.297247754 +0200
|
||||
@@ -460,26 +460,32 @@
|
||||
|
||||
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_VST2_PATH += HOME + "/.lxvst"
|
||||
DEFAULT_VST2_PATH += ":/usr/lib/lxvst"
|
||||
+ DEFAULT_VST2_PATH += ":/usr/lib64/lxvst"
|
||||
DEFAULT_VST2_PATH += ":/usr/local/lib/lxvst"
|
||||
|
||||
DEFAULT_VST3_PATH = HOME + "/.vst3"
|
||||
DEFAULT_VST3_PATH += ":/usr/lib/vst3"
|
||||
+ DEFAULT_VST3_PATH += ":/usr/lib64/vst3"
|
||||
DEFAULT_VST3_PATH += ":/usr/local/lib/vst3"
|
||||
|
||||
DEFAULT_SF2_PATH = HOME + "/.sounds/sf2"
|
|
@ -0,0 +1,55 @@
|
|||
--- 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));
|
|
@ -0,0 +1,12 @@
|
|||
--- 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
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
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 {
|
||||
|
25
Carla.spec
25
Carla.spec
|
@ -1,7 +1,7 @@
|
|||
%global pname carla
|
||||
|
||||
Name: Carla
|
||||
Version: 2.5.2
|
||||
Version: 2.4.3
|
||||
Release: 1%{?dist}
|
||||
Summary: Audio plugin host
|
||||
|
||||
|
@ -52,9 +52,11 @@ License: GPLv2+ and BSD and Boost and ISC and MIT and zlib
|
|||
URL: https://github.com/falkTX/Carla
|
||||
Source0: https://github.com/falkTX/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
# https://github.com/falkTX/Carla/issues/1444
|
||||
Patch0: %{name}-2.5-libdir.patch
|
||||
Patch1: %{name}-single-libs-path.patch
|
||||
Patch0: %{name}-libdir.patch
|
||||
Patch1: %{name}-expression-error.patch
|
||||
Patch2: %{name}-single-libs-path.patch
|
||||
|
||||
#ExcludeArch: ppc64le
|
||||
|
||||
BuildRequires: gcc gcc-c++
|
||||
BuildRequires: pkgconfig(alsa)
|
||||
|
@ -80,7 +82,6 @@ Requires: python3-qt5
|
|||
Requires: python3-pyliblo
|
||||
Requires: hicolor-icon-theme
|
||||
Requires: shared-mime-info
|
||||
Requires: a2jmidid
|
||||
|
||||
|
||||
# Dont provide or require internal libs. Using new rpm builtin filtering,
|
||||
|
@ -225,22 +226,6 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/studio.kx
|
|||
%{_libdir}/pkgconfig/%{pname}-host-plugin.pc
|
||||
|
||||
%changelog
|
||||
* Sat Oct 15 2022 Martin Gansser <martinkg@fedoraproject.org> - 1:2.5.2-1
|
||||
- Update to 2.5.2
|
||||
|
||||
* Tue Oct 04 2022 Martin Gansser <martinkg@fedoraproject.org> - 1:2.5.1-1
|
||||
- Update to 2.5.1
|
||||
|
||||
* Wed Sep 28 2022 Martin Gansser <martinkg@fedoraproject.org> - 1:2.5.0-1
|
||||
- Update to 2.5.0
|
||||
|
||||
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.4.4-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Sat Jul 16 2022 Martin Gansser <martinkg@fedoraproject.org> - 1:2.4.4-1
|
||||
- Update to 2.4.4
|
||||
- Add RR a2jmidid to allow automatically midi input from system (BZ#2101508)
|
||||
|
||||
* Sat Apr 16 2022 Martin Gansser <martinkg@fedoraproject.org> - 1:2.4.3-1
|
||||
- Update to 2.4.3
|
||||
|
||||
|
|
|
@ -0,0 +1,26 @@
|
|||
--- 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.5.2.tar.gz) = cfdeeafe3a108a4e6d88d4be0ccb73d4e1677f0eff51375b04bd6a7a081694f91dfd37afa88f4bd0baf02a14f2e2e8214f471273d2b0fe12b63ba36656650e2d
|
||||
SHA512 (Carla-2.4.3.tar.gz) = 1e062e2bd5c8791d5936dbaa30accf8165cfb8b487e4b7d90800b573f436a6415d7452000849ebdab60ff60f7162161a0f4f50645deaaf115d47a436807ea3b9
|
||||
|
|
Loading…
Reference in New Issue