Update to 2.4.1

.gitignore

@@ -9,3 +9,8 @@
 /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-bswap.patch

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

Carla-gcc11-include.patch

@@ -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 {
+ 

Carla-libdir.patch

@@ -1,6 +1,6 @@
---- 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 @@
+--- 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 @@
      splitter = ":"
  
      DEFAULT_LADSPA_PATH  = HOME + "/.ladspa"
@@ -23,4 +23,14 @@
 +    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"

Carla.spec

@@ -1,7 +1,7 @@
-%global pname   carla 
+%global pname   carla
 
 Name:           Carla
-Version:        2.2.0
+Version:        2.4.1
 Release:        1%{?dist}
 Summary:        Audio plugin host
 
@@ -51,6 +51,9 @@ 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
+Source1:        carla.appdata.xml
+# https://github.com/falkTX/Carla/issues/1444
+Patch0:         %{name}-libdir.patch
 
 #ExcludeArch:    ppc64le
 
@@ -66,12 +69,14 @@ BuildRequires:  pkgconfig(fftw3)
 BuildRequires:  pkgconfig(mxml)
 BuildRequires:  pkgconfig(gl)
 BuildRequires:  pkgconfig(Qt5Core)
-BuildRequires:  python3-qt5-devel
+BuildRequires:  python3-qt5-base
 BuildRequires:  python3-magic
 BuildRequires:  pkgconfig(liblo)
 BuildRequires:  pkgconfig(zlib)
 BuildRequires:  desktop-file-utils
-Requires:       jack-audio-connection-kit
+BuildRequires:  make
+BuildRequires:  /usr/bin/appstream-util
+BuildRequires:  /usr/bin/desktop-file-validate
 Requires:       python3-qt5
 Requires:       python3-pyliblo
 Requires:       hicolor-icon-theme
@@ -136,7 +141,7 @@ Requires:       %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 This package contains the Carla LV2 plugin.
 
 %prep
-%autosetup -p 0 -n %{name}-%{version}
+%autosetup -p0 -n %{name}-%{version}
 
 # remove windows stuff
 rm -rf data/{macos,windows}
@@ -170,8 +175,13 @@ chmod a+x %{buildroot}%{_datadir}/%{pname}/{carla,carla-control,carla-jack-multi
 # fix perm due rpmlint W: unstripped-binary-or-object /usr/lib64/carla/libcarla_interposer-jack-x11.so
 find %{buildroot}%{_libdir} -name '*.so' -exec chmod +x '{}' ';'
 
+# Install appdata file
+mkdir -p %{buildroot}%{_datadir}/metainfo
+install -p -m 0644 %SOURCE1 %{buildroot}%{_datadir}/metainfo
+
 %check
 desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
+appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/%{pname}.appdata.xml
 
 %files
 %doc README.md
@@ -198,6 +208,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/apps/%{pname}*.png
 %{_datadir}/icons/hicolor/*/apps/%{pname}*.svg
 %{_datadir}/mime/packages/%{pname}.xml
+%{_datadir}/metainfo/%{pname}.appdata.xml
 
 %files vst
 %{_libdir}/vst/
@@ -211,8 +222,48 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_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 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
+
 * Sun Sep 27 2020 Martin Gansser <martinkg@fedoraproject.org> - 1:2.2.0-1
 - Update to 2.2.0
 

carla.appdata.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<component type="desktop">
+  <id>carla.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPLv2+ and BSD and Boost and ISC and MIT and zlib</project_license>
+  <name>Carla</name>
+  <summary>Audio plugin host</summary>
+
+  <description>
+    <p>
+      Carla is a fully-featured audio plugin host, with support for many audio drivers
+      and plugin formats. It's open source and licensed under the GNU General Public
+      License, version 2 or later. </p>-- test every suffix of the sf whether its prefix is not a LHS of the rule,
+    <p>Features:  </p>
+      <ul>
+        <li>LADSPA, DSSI, LV2 and VST plugin formats</li>
+        <li>SF2/3 and SFZ sound banks</li>
+        <li>Internal audio and midi file player</li>
+        <li>Automation of plugin parameters via MIDI CC</li>
+        <li>Remote control over OSC</li>
+        <li>Rack and Patchbay processing modes, plus Single and Multi-Client if using JACK</li>
+        <li>  Native audio drivers (ALSA, DirectSound, CoreAudio, etc) and JACK</li>
+      </ul>
+    <p>In experimental phase / work in progress: </p>
+      <ul>
+        <li>Export any Carla loadable plugin or sound bank as an LV2 plugin</li>
+        <li>Plugin bridge support (such as running 32bit plugins on a 64bit Carla, or Windows plugins on Linux)</li>
+        <li>Run JACK applications as audio plugins</li>
+        <li>Transport controls, sync with JACK Transport or Ableton Link</li>
+      </ul>
+    <p>
+        Carla is also available as an LV2 plugin for MacOS and Linux, and VST plugin for
+        Linux.
+    </p>
+  </description>
+
+  <url type="homepage">https://kx.studio/Applications:Carla</url>
+</component>

sources

@@ -1 +1 @@
-SHA512 (Carla-2.2.0.tar.gz) = afb2beab979f801817a7fd7663bfdc90800db021679243faa5acb15de60f6dc281032e05c51a8625124c69e7759099fc682678eb98c08507f952763e665ac9c4
+SHA512 (Carla-2.4.1.tar.gz) = cebb66de09337a6ce2ecb80ab3cacf57b74bb41b03edeca42059c037e45773991b0eabe53bd58aba1d334df7c87f778b32c6ae7740eb66227840def94a5d460e