From ab06e02207efd64bbca7342d2647f69d43ea0b20 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Tue, 15 Jun 2021 09:53:05 +0200 Subject: [PATCH] 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