Update to 2.5.2

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -10,3 +10,13 @@
 /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

Carla-2.5-libdir.patch

@@ -0,0 +1,35 @@
+--- 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"

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-expression-error.patch

@@ -0,0 +1,10 @@
+--- 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
+ {

Carla-gcc10-include.patch

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

Carla-gcc11-include.patch

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

Carla-refresh-plugin-crash.patch

@@ -0,0 +1,11 @@
+--- 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)

Carla-single-libs-path.patch

@@ -0,0 +1,14 @@
+--- 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")
+ 
+ # --------------------------------------------------------------------------------------------------------

Carla.spec

@@ -1,8 +1,8 @@
-%global pname   carla 
+%global pname   carla
 
 Name:           Carla
-Version:        2.3.0
-Release:        3%{?dist}
+Version:        2.5.2
+Release:        1%{?dist}
 Summary:        Audio plugin host
 
 # The entire source code is GPLv2+ except
@@ -51,12 +51,10 @@ 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
-Patch0:         %{name}-gcc11-include.patch
 # https://github.com/falkTX/Carla/issues/1444
-Patch1:         %{name}-libdir.patch
+Patch0:         %{name}-2.5-libdir.patch
+Patch1:         %{name}-single-libs-path.patch
 
-#ExcludeArch:    ppc64le
 
 BuildRequires:  gcc gcc-c++
 BuildRequires:  pkgconfig(alsa)
@@ -70,7 +68,7 @@ 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)
@@ -82,6 +80,7 @@ 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,
@@ -155,6 +154,10 @@ 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
@@ -176,13 +179,9 @@ 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
+appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/studio.kx.carla.appdata.xml
 
 %files
 %doc README.md
@@ -209,7 +208,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/%{pname}.
 %{_datadir}/icons/hicolor/*/apps/%{pname}*.png
 %{_datadir}/icons/hicolor/*/apps/%{pname}*.svg
 %{_datadir}/mime/packages/%{pname}.xml
-%{_datadir}/metainfo/%{pname}.appdata.xml
+%{_datadir}/metainfo/studio.kx.carla.appdata.xml
 
 %files vst
 %{_libdir}/vst/
@@ -226,6 +225,59 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/%{pname}.
 %{_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
 

carla-0001-change-libdir-path.patch

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

carla.appdata.xml

@@ -1,39 +0,0 @@
-<?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.3.0.tar.gz) = 1ef049e4eb97c9ee82e2e047860d6db713e9fa13a7a25de05192674fe6c7e510b4512123ed5c16e6b40ed66d264afe734a1b386be41bb85fd5c9e902edba8c0b
+SHA512 (Carla-2.5.2.tar.gz) = cfdeeafe3a108a4e6d88d4be0ccb73d4e1677f0eff51375b04bd6a7a081694f91dfd37afa88f4bd0baf02a14f2e2e8214f471273d2b0fe12b63ba36656650e2d