Compare commits
1 Commits
| Author | SHA1 | Date |
|---|---|---|
Carl George
|
1eda028239 |
|
|
@ -9,14 +9,3 @@
|
|||
/Carla-2.2b1.tar.gz
|
||||
/Carla-2.2.0-RC1.tar.gz
|
||||
/Carla-2.2.0.tar.gz
|
||||
/Carla-2.3.0.tar.gz
|
||||
/Carla-2.3.1.tar.gz
|
||||
/Carla-2.3.2.tar.gz
|
||||
/Carla-2.4.0.tar.gz
|
||||
/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));
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
--- source/modules/juce_gui_basics/native/x11/juce_linux_XWindowSystem.cpp.orig 2022-01-29 16:23:32.355327960 +0100
|
||||
+++ source/modules/juce_gui_basics/native/x11/juce_linux_XWindowSystem.cpp 2022-01-29 16:24:24.934436166 +0100
|
||||
@@ -24,6 +24,7 @@
|
||||
*/
|
||||
|
||||
#include <unordered_map>
|
||||
+#include <array>
|
||||
|
||||
namespace juce
|
||||
{
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- source/frontend/carla_database.py.orig 2022-03-19 16:55:20.796092166 +0100
|
||||
+++ source/frontend/carla_database.py 2022-03-19 16:56:17.009719997 +0100
|
||||
@@ -1358,7 +1358,7 @@
|
||||
|
||||
# -----------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- @pyqtSlot(int, str)
|
||||
+ @pyqtSlot(float, str)
|
||||
def slot_handlePluginLook(self, percent, plugin):
|
||||
self.ui.progressBar.setFormat("%s" % plugin)
|
||||
self.ui.progressBar.setValue(percent)
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
--- data/carla-single 2018-09-06 09:49:37.310950156 +1000
|
||||
+++ data/carla-single 2019-09-25 16:36:23.365683884 +1000
|
||||
@@ -25,9 +25,9 @@
|
||||
# --------------------------------------------------------------------------------------------------------
|
||||
# Setup
|
||||
|
||||
-INSTALL_PREFIX = "X-PREFIX-X"
|
||||
+INSTALL_PREFIX = "/usr"
|
||||
|
||||
-CARLA_LIBDIR = os.path.join(INSTALL_PREFIX, "lib", "carla")
|
||||
+CARLA_LIBDIR = os.path.join(INSTALL_PREFIX, "lib64", "carla")
|
||||
CARLA_RESDIR = os.path.join(INSTALL_PREFIX, "share", "carla", "resources")
|
||||
|
||||
# --------------------------------------------------------------------------------------------------------
|
||||
98
Carla.spec
98
Carla.spec
|
|
@ -1,8 +1,8 @@
|
|||
%global pname carla
|
||||
%global pname carla
|
||||
|
||||
Name: Carla
|
||||
Version: 2.5.2
|
||||
Release: 1%{?dist}
|
||||
Version: 2.2.0
|
||||
Release: 2%{?dist}
|
||||
Summary: Audio plugin host
|
||||
|
||||
# The entire source code is GPLv2+ except
|
||||
|
|
@ -51,10 +51,8 @@ Epoch: 1
|
|||
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
|
||||
|
||||
#ExcludeArch: ppc64le
|
||||
|
||||
BuildRequires: gcc gcc-c++
|
||||
BuildRequires: pkgconfig(alsa)
|
||||
|
|
@ -68,19 +66,16 @@ BuildRequires: pkgconfig(fftw3)
|
|||
BuildRequires: pkgconfig(mxml)
|
||||
BuildRequires: pkgconfig(gl)
|
||||
BuildRequires: pkgconfig(Qt5Core)
|
||||
BuildRequires: python3-qt5-base
|
||||
BuildRequires: python3-qt5-devel
|
||||
BuildRequires: python3-magic
|
||||
BuildRequires: pkgconfig(liblo)
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: make
|
||||
BuildRequires: /usr/bin/appstream-util
|
||||
BuildRequires: /usr/bin/desktop-file-validate
|
||||
Requires: jack-audio-connection-kit
|
||||
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,
|
||||
|
|
@ -141,7 +136,7 @@ Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
|
|||
This package contains the Carla LV2 plugin.
|
||||
|
||||
%prep
|
||||
%autosetup -p0 -n %{name}-%{version}
|
||||
%autosetup -p 0 -n %{name}-%{version}
|
||||
|
||||
# remove windows stuff
|
||||
rm -rf data/{macos,windows}
|
||||
|
|
@ -154,10 +149,6 @@ sed -i "s|#!/usr/bin/env python|#!%{__python3}|" source/frontend/widgets/paramsp
|
|||
# fix libdir path
|
||||
sed -i "s|/lib/carla|/%{_lib}/carla|" data/{carla,carla-control,carla-database,carla-jack-multi,carla-jack-single,carla-patchbay,carla-rack,carla-settings}
|
||||
|
||||
# Fix metainfo install dir
|
||||
sed -i -e 's|$(DESTDIR)$(PREFIX)/share/appdata/studio.kx.carla.appdata.xml|$(DESTDIR)$(PREFIX)/share/metainfo/studio.kx.carla.appdata.xml|g' Makefile
|
||||
sed -i -e 's|$(DESTDIR)$(PREFIX)/share/appdata|$(DESTDIR)$(PREFIX)/share/metainfo|g' Makefile
|
||||
|
||||
%build
|
||||
%{set_build_flags}
|
||||
# list build configuration, no need for optflags or -j
|
||||
|
|
@ -181,7 +172,6 @@ find %{buildroot}%{_libdir} -name '*.so' -exec chmod +x '{}' ';'
|
|||
|
||||
%check
|
||||
desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
|
||||
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/studio.kx.carla.appdata.xml
|
||||
|
||||
%files
|
||||
%doc README.md
|
||||
|
|
@ -208,7 +198,6 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/studio.kx
|
|||
%{_datadir}/icons/hicolor/*/apps/%{pname}*.png
|
||||
%{_datadir}/icons/hicolor/*/apps/%{pname}*.svg
|
||||
%{_datadir}/mime/packages/%{pname}.xml
|
||||
%{_datadir}/metainfo/studio.kx.carla.appdata.xml
|
||||
|
||||
%files vst
|
||||
%{_libdir}/vst/
|
||||
|
|
@ -222,79 +211,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/studio.kx
|
|||
%{_libdir}/pkgconfig/%{pname}-standalone.pc
|
||||
%{_libdir}/pkgconfig/%{pname}-utils.pc
|
||||
%{_libdir}/pkgconfig/%{pname}-native-plugin.pc
|
||||
%{_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
|
||||
|
||||
* Sat Mar 19 2022 Martin Gansser <martinkg@fedoraproject.org> - 1:2.4.2-2
|
||||
- Add Carla-refresh-plugin-crash.patch
|
||||
|
||||
* Sun Feb 20 2022 Martin Gansser <martinkg@fedoraproject.org> - 1:2.4.2-1
|
||||
- Update to 2.4.2
|
||||
- Add Carla-single-libs-path.patch
|
||||
|
||||
* Sat Jan 29 2022 Martin Gansser <martinkg@fedoraproject.org> - 1:2.4.1-3
|
||||
- Add Carla-expression-error.patch
|
||||
|
||||
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.4.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Sat Oct 16 2021 Martin Gansser <martinkg@fedoraproject.org> - 1:2.4.1-1
|
||||
- Update to 2.4.1
|
||||
|
||||
* Fri Aug 20 2021 Martin Gansser <martinkg@fedoraproject.org> - 1:2.4.0-1
|
||||
- Update to 2.4.0
|
||||
|
||||
* 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
|
||||
|
||||
* Sat Jul 17 2021 Martin Gansser <martinkg@fedoraproject.org> - 1:2.3.1-1
|
||||
- Update to 2.3.1-1
|
||||
|
||||
* Wed Jul 14 2021 Scott Talbert <swt@techie.net> - 1:2.3.0-5
|
||||
- Replace python3-qt5-devel BD with python3-qt5-base (for pyuic5)
|
||||
|
||||
* Wed Jun 16 2021 Martin Gansser <martinkg@fedoraproject.org> - 1:2.3.0-4
|
||||
- Rebuilt for fluidsynth-2.2.1
|
||||
|
||||
* Tue Jun 15 2021 Martin Gansser <martinkg@fedoraproject.org> - 1:2.3.0-3
|
||||
- Add Carla-libdir.patch
|
||||
|
||||
* Wed May 26 2021 Jan Beran <jaberan@redhat.com> - 1:2.3.0-2
|
||||
- Add carla.appdata.xml file
|
||||
|
||||
* Thu Apr 15 2021 Martin Gansser <martinkg@fedoraproject.org> - 1:2.3.0-1
|
||||
- Update to 2.3.0
|
||||
|
||||
* Thu Feb 18 2021 Neal Gompa <ngompa13@gmail.com> - 1:2.2.0-4
|
||||
- Drop explicit dep on jack-audio-connection-kit
|
||||
|
||||
* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.2.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Mon Oct 12 2020 Jeff Law <law@redhat.com> - 1:2.2.0-2
|
||||
- Add missing #includes for gcc-11
|
||||
* Fri May 07 2021 Carl George <carl@george.computer> - 1:2.2.0-2
|
||||
- Rebuilt for fluidsynth soname bump rhbz#1958008
|
||||
|
||||
* Sun Sep 27 2020 Martin Gansser <martinkg@fedoraproject.org> - 1:2.2.0-1
|
||||
- Update to 2.2.0
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- source/frontend/carla_shared.py.orig 2021-06-15 09:18:19.464824018 +0200
|
||||
+++ source/frontend/carla_shared.py 2021-06-15 09:20:09.863816347 +0200
|
||||
@@ -444,27 +444,27 @@
|
||||
--- 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"
|
||||
|
|
@ -23,14 +23,4 @@
|
|||
+ 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"
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (Carla-2.5.2.tar.gz) = cfdeeafe3a108a4e6d88d4be0ccb73d4e1677f0eff51375b04bd6a7a081694f91dfd37afa88f4bd0baf02a14f2e2e8214f471273d2b0fe12b63ba36656650e2d
|
||||
SHA512 (Carla-2.2.0.tar.gz) = afb2beab979f801817a7fd7663bfdc90800db021679243faa5acb15de60f6dc281032e05c51a8625124c69e7759099fc682678eb98c08507f952763e665ac9c4
|
||||
|
|
|
|||
Loading…
Reference in New Issue