From fd6357b8c9ec6ccbeee2fe3d9738f85ec4529dfa Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Thu, 15 Apr 2021 09:52:03 +0200 Subject: [PATCH 1/5] Update to 2.3.0 --- .gitignore | 1 + Carla.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5552eee..9bfdf76 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /Carla-2.2b1.tar.gz /Carla-2.2.0-RC1.tar.gz /Carla-2.2.0.tar.gz +/Carla-2.3.0.tar.gz diff --git a/Carla.spec b/Carla.spec index 8a6db77..b8d39aa 100644 --- a/Carla.spec +++ b/Carla.spec @@ -1,8 +1,8 @@ %global pname carla Name: Carla -Version: 2.2.0 -Release: 4%{?dist} +Version: 2.3.0 +Release: 1%{?dist} Summary: Audio plugin host # The entire source code is GPLv2+ except @@ -212,8 +212,12 @@ 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 +* Thu Apr 15 2021 Martin Gansser - 1:2.3.0-1 +- Update to 2.3.0 + * Thu Feb 18 2021 Neal Gompa - 1:2.2.0-4 - Drop explicit dep on jack-audio-connection-kit diff --git a/sources b/sources index b9c80d7..3617e4d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Carla-2.2.0.tar.gz) = afb2beab979f801817a7fd7663bfdc90800db021679243faa5acb15de60f6dc281032e05c51a8625124c69e7759099fc682678eb98c08507f952763e665ac9c4 +SHA512 (Carla-2.3.0.tar.gz) = 1ef049e4eb97c9ee82e2e047860d6db713e9fa13a7a25de05192674fe6c7e510b4512123ed5c16e6b40ed66d264afe734a1b386be41bb85fd5c9e902edba8c0b From 1269fcc573faabe6c46e9b8866e521a24d9cab95 Mon Sep 17 00:00:00 2001 From: Jan Beran Date: Wed, 26 May 2021 12:12:45 +0200 Subject: [PATCH 2/5] Provide appdata-xml metada file carla.appdata.xml serves for displaying Carla in GNOME Software. Without the file, GNOME Software does not display Carla. --- Carla.spec | 14 +++++++++++++- carla.appdata.xml | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 carla.appdata.xml diff --git a/Carla.spec b/Carla.spec index b8d39aa..5badd9d 100644 --- a/Carla.spec +++ b/Carla.spec @@ -2,7 +2,7 @@ Name: Carla Version: 2.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Audio plugin host # The entire source code is GPLv2+ except @@ -51,6 +51,7 @@ 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: Carla-gcc11-include.patch #ExcludeArch: ppc64le @@ -73,6 +74,8 @@ BuildRequires: pkgconfig(liblo) BuildRequires: pkgconfig(zlib) BuildRequires: desktop-file-utils BuildRequires: make +BuildRequires: /usr/bin/appstream-util +BuildRequires: /usr/bin/desktop-file-validate Requires: python3-qt5 Requires: python3-pyliblo Requires: hicolor-icon-theme @@ -171,8 +174,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 @@ -199,6 +207,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/ @@ -215,6 +224,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %{_libdir}/pkgconfig/%{pname}-host-plugin.pc %changelog +* Wed May 26 2021 Jan Beran - 1:2.3.0-2 +- Add carla.appdata.xml file + * Thu Apr 15 2021 Martin Gansser - 1:2.3.0-1 - Update to 2.3.0 diff --git a/carla.appdata.xml b/carla.appdata.xml new file mode 100644 index 0000000..e8b3233 --- /dev/null +++ b/carla.appdata.xml @@ -0,0 +1,38 @@ + + + carla.desktop + CC0-1.0 + GPLv2+ and BSD and Boost and ISC and MIT and zlib + Carla + Audio plugin host + + +

+ 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.

-- test every suffix of the sf whether its prefix is not a LHS of the rule, +

Features:

+
    +
  • LADSPA, DSSI, LV2 and VST plugin formats
    • +
  • SF2/3 and SFZ sound banks
    • +
  • Internal audio and midi file player
    • +
  • Automation of plugin parameters via MIDI CC
    • +
  • Remote control over OSC
    • +
  • Rack and Patchbay processing modes, plus Single and Multi-Client if using JACK
    • +
  • Native audio drivers (ALSA, DirectSound, CoreAudio, etc) and JACK
    • +
+

In experimental phase / work in progress:

+
    +
  • Export any Carla loadable plugin or sound bank as an LV2 plugin
    • +
  • Plugin bridge support (such as running 32bit plugins on a 64bit Carla, or Windows plugins on Linux)
    • +
  • Run JACK applications as audio plugins
    • +
  • Transport controls, sync with JACK Transport or Ableton Link
    • +
+

+ Carla is also available as an LV2 plugin for MacOS and Linux, and VST plugin for + Linux. +

+ + + https://kx.studio/Applications:Carla + From 057a30b4b54a8b0d897eb69f73e306100f1b21ca Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Wed, 26 May 2021 14:08:14 +0200 Subject: [PATCH 3/5] Add carla.appdata.xml file --- carla.appdata.xml | 514 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 481 insertions(+), 33 deletions(-) diff --git a/carla.appdata.xml b/carla.appdata.xml index e8b3233..83adffc 100644 --- a/carla.appdata.xml +++ b/carla.appdata.xml @@ -1,38 +1,486 @@ - - - carla.desktop - CC0-1.0 - GPLv2+ and BSD and Boost and ISC and MIT and zlib - Carla - Audio plugin host - -

+ + + + + Tree - rpms/Carla - src.fedoraproject.org + + + + + + + + + + + + + + + +

+ + +
+ + +
+
+
+
+
+
+

+ +

+
+
+

+xberry / rpms / Carla +

+ + Forked from + + rpms/Carla + + a year ago + +
+
+
+
+
+
+ + +
+ +
+
+ +
+ +
+
+ + + Clone + +
+
+
+
Source Code
+ +
+
+
GIT
+ +
+
+
+
+
+ +
+
+
+
+ + +
+
+ +
+
+
+
+
+
+
+

+ Files +

+
+ +
+
+ +
+
+
+
+
+
    +
  1. + + +   1269fcc573faabe6c46e9b8866e521a24d9cab95 + +
    2. +
  2. + +   carla.appdata.xml +
    3. +
+
+ +
+
+
+ + +
+ + Blob + + Blame + + History + + Raw +
+ + 
<?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. 
-- test every suffix of the sf whether its prefix is not a LHS of the rule,
-    
Features:  

-      
    
-        
  • LADSPA, DSSI, LV2 and VST plugin formats
    • 
-        
  • SF2/3 and SFZ sound banks
    • 
-        
  • Internal audio and midi file player
    • 
-        
  • Automation of plugin parameters via MIDI CC
    • 
-        
  • Remote control over OSC
    • 
-        
  • Rack and Patchbay processing modes, plus Single and Multi-Client if using JACK
    • 
-        
  •   Native audio drivers (ALSA, DirectSound, CoreAudio, etc) and JACK
    • 
-      

-    
In experimental phase / work in progress: 

-      
    
-        
  • Export any Carla loadable plugin or sound bank as an LV2 plugin
    • 
-        
  • Plugin bridge support (such as running 32bit plugins on a 64bit Carla, or Windows plugins on Linux)
    • 
-        
  • Run JACK applications as audio plugins
    • 
-        
  • Transport controls, sync with JACK Transport or Ableton Link
    • 
-      

-    

+      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>
 
-  https://kx.studio/Applications:Carla
-
+  <url type="homepage">https://kx.studio/Applications:Carla</url>
+</component>
+
+
+
+ +
+
+
+
+ +
+
+
+
+
Powered by Pagure 5.13.2
+ +
+
+
© Red Hat, Inc. and others.
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 53c695bf1388b47c82a29ac4245dc3219b395fed Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Wed, 26 May 2021 14:35:11 +0200 Subject: [PATCH 4/5] Add carla.appdata.xml file --- carla.appdata.xml | 513 +++------------------------------------------- 1 file changed, 33 insertions(+), 480 deletions(-) diff --git a/carla.appdata.xml b/carla.appdata.xml index 83adffc..85dd7c0 100644 --- a/carla.appdata.xml +++ b/carla.appdata.xml @@ -1,486 +1,39 @@ + - - - - - Tree - rpms/Carla - src.fedoraproject.org - - - - - + + carla.desktop + CC0-1.0 + GPLv2+ and BSD and Boost and ISC and MIT and zlib + Carla + Audio plugin host - - - - - - - - - - - - -
- - -
-
-
-
-
-
-

- -

-
-
-

-xberry / rpms / Carla -

- - Forked from - - rpms/Carla - - a year ago - -
-
-
-
-
-
- - -
- -
-
- -
- -
-
- - - Clone - -
-
-
-
Source Code
- -
-
-
GIT
- -
-
-
-
-
- -
-
-
-
- - -
-
- -
-
-
-
-
-
-
-

- Files -

-
- -
-
- -
-
-
-
-
-
    -
  1. - - -   1269fcc573faabe6c46e9b8866e521a24d9cab95 - -
    2. -
  2. - -   carla.appdata.xml -
    3. -
-
- -
-
-
- - -
- - Blob - - Blame - - History - - Raw -
- - 
<?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>
+      and plugin formats. It's open source and licensed under the GNU General Public
+      License, version 2 or later. 
-- test every suffix of the sf whether its prefix is not a LHS of the rule,
+    
Features:  

+      
    
+        
  • LADSPA, DSSI, LV2 and VST plugin formats
    • 
+        
  • SF2/3 and SFZ sound banks
    • 
+        
  • Internal audio and midi file player
    • 
+        
  • Automation of plugin parameters via MIDI CC
    • 
+        
  • Remote control over OSC
    • 
+        
  • Rack and Patchbay processing modes, plus Single and Multi-Client if using JACK
    • 
+        
  •   Native audio drivers (ALSA, DirectSound, CoreAudio, etc) and JACK
    • 
+      

+    
In experimental phase / work in progress: 

+      
    
+        
  • Export any Carla loadable plugin or sound bank as an LV2 plugin
    • 
+        
  • Plugin bridge support (such as running 32bit plugins on a 64bit Carla, or Windows plugins on Linux)
    • 
+        
  • Run JACK applications as audio plugins
    • 
+        
  • Transport controls, sync with JACK Transport or Ableton Link
    • 
+      

+    

         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>
-
-
-
- -
-
-
-
- -
-
-
-
-
Powered by Pagure 5.13.2
- -
-
-
© Red Hat, Inc. and others.
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + https://kx.studio/Applications:Carla + From ab06e02207efd64bbca7342d2647f69d43ea0b20 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Tue, 15 Jun 2021 09:53:05 +0200 Subject: [PATCH 5/5] Add Carla-libdir.patch --- Carla-libdir.patch | 36 ++++++++++++++++++++++++++++++++++++ Carla.spec | 13 +++++++++---- 2 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 Carla-libdir.patch diff --git a/Carla-libdir.patch b/Carla-libdir.patch new file mode 100644 index 0000000..0c062a7 --- /dev/null +++ b/Carla-libdir.patch @@ -0,0 +1,36 @@ +--- 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" +- 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" diff --git a/Carla.spec b/Carla.spec index 5badd9d..0c304ac 100644 --- a/Carla.spec +++ b/Carla.spec @@ -2,7 +2,7 @@ Name: Carla Version: 2.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Audio plugin host # The entire source code is GPLv2+ except @@ -52,7 +52,9 @@ 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: Carla-gcc11-include.patch +Patch0: %{name}-gcc11-include.patch +# https://github.com/falkTX/Carla/issues/1444 +Patch1: %{name}-libdir.patch #ExcludeArch: ppc64le @@ -73,7 +75,7 @@ BuildRequires: python3-magic BuildRequires: pkgconfig(liblo) BuildRequires: pkgconfig(zlib) BuildRequires: desktop-file-utils -BuildRequires: make +BuildRequires: make BuildRequires: /usr/bin/appstream-util BuildRequires: /usr/bin/desktop-file-validate Requires: python3-qt5 @@ -140,7 +142,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} @@ -224,6 +226,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/%{pname}. %{_libdir}/pkgconfig/%{pname}-host-plugin.pc %changelog +* Tue Jun 15 2021 Martin Gansser - 1:2.3.0-3 +- Add Carla-libdir.patch + * Wed May 26 2021 Jan Beran - 1:2.3.0-2 - Add carla.appdata.xml file