Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package carla for openSUSE:Factory checked in at 2021-06-04 00:33:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/carla (Old) and /work/SRC/openSUSE:Factory/.carla.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "carla" Fri Jun 4 00:33:28 2021 rev:23 rq:897014 version:2.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/carla/carla.changes 2021-04-24 23:10:22.619498644 +0200 +++ /work/SRC/openSUSE:Factory/.carla.new.1898/carla.changes 2021-06-04 00:33:37.428893879 +0200 @@ -1,0 +2,11 @@ +Mon May 31 02:53:51 UTC 2021 - Simon Lees <sfl...@suse.de> + +- Use correct plugin paths for openSUSE (/usr/lib64/*) + * use-correct-plugin-paths.patch +- Cadence uses carla_util.py which also uses carla_backend.py + so add these to pythonsitelib +- Fix gcc-11 build + * fix-build-with-gcc11.patch +- Add carla-host-plugin.pc to carla-remove-pkgconf-rpath.patch + +------------------------------------------------------------------- @@ -1153 +1163,0 @@ - New: ---- fix-build-with-gcc11.patch use-correct-plugin-paths.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ carla.spec ++++++ --- /var/tmp/diff_new_pack.MyOMX6/_old 2021-06-04 00:33:38.764894915 +0200 +++ /var/tmp/diff_new_pack.MyOMX6/_new 2021-06-04 00:33:38.764894915 +0200 @@ -32,7 +32,7 @@ Version: 2.3.0 Release: 0 Summary: An audio plugin host -License: GPL-2.0-or-later AND BSD-2-Clause AND BSD-3-Clause +License: BSD-2-Clause AND GPL-2.0-or-later AND BSD-3-Clause Group: Productivity/Multimedia/Sound/Utilities URL: https://kx.studio/Applications:Carla #https://github.com/falkTX/Carla/archive/v%%{version}.tar.gz#/ @@ -44,6 +44,10 @@ Patch0: carla-systemlibs.patch # PATCH-FIX-OPENSUSE -- Remove rpath from .pc files davejpla...@gmail.com Patch1: carla-remove-pkgconf-rpath.patch +# PATCH-FIX-OPENSUSE -- Use the correct plugin paths for openSUSE sfl...@suse.de +Patch2: use-correct-plugin-paths.patch +# PATCH-FIX-UPSTREAM -- https://github.com/falkTX/Carla/commit/545304f5cfa484d4037b845a4df4abd530f82669 +Patch3: fix-build-with-gcc11.patch BuildRequires: fdupes BuildRequires: file-devel BuildRequires: hicolor-icon-theme @@ -169,6 +173,13 @@ cp -v source/modules/lilv/serd-0.24.0/tests/TurtleTests/LICENSE LICENSE.TurtleTests +# Cadence uses carla_util.py which also uses carla_backend.py so they need to be in pythonsitelib +mkdir -p %{buildroot}/%{python_sitelib} +pushd %{buildroot}/%{python_sitelib} +ln -s ../../../../%{_datadir}/carla/carla_backend.py . +ln -s ../../../../%{_datadir}/carla/carla_utils.py . +popd + # SUSE specific %if 0%{?suse_version} %suse_update_desktop_file -r carla AudioVideo Music @@ -201,6 +212,7 @@ %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/apps/* %{_datadir}/mime/packages/carla.xml +%{python_sitelib}/carla*.py %{_localstatedir}/adm/update-messages/%{name}-warning %post ++++++ carla-remove-pkgconf-rpath.patch ++++++ --- /var/tmp/diff_new_pack.MyOMX6/_old 2021-06-04 00:33:38.816894955 +0200 +++ /var/tmp/diff_new_pack.MyOMX6/_new 2021-06-04 00:33:38.820894958 +0200 @@ -31,3 +31,14 @@ -Libs: -Wl,-rpath,${libdir} -L${libdir} -lcarla_native-plugin +Libs: -L${libdir} -lcarla_native-plugin Cflags: -DREAL_BUILD -I${includedir} -I${includedir}/includes +Index: carla-2.3.0/data/carla-host-plugin.pc +=================================================================== +--- carla-2.3.0.orig/data/carla-host-plugin.pc ++++ carla-2.3.0/data/carla-host-plugin.pc +@@ -5,5 +5,5 @@ includedir=X-INCLUDEDIR-X/carla + Name: carla-host-plugin + Version: 2.3.0 + Description: Carla Host as Native Plugin +-Libs: -Wl,-rpath,${libdir} -L${libdir} -lcarla_host-plugin ++Libs: -L${libdir} -lcarla_host-plugin + Cflags: -DREAL_BUILD -I${includedir} -I${includedir}/includes ++++++ fix-build-with-gcc11.patch ++++++ >From 545304f5cfa484d4037b845a4df4abd530f82669 Mon Sep 17 00:00:00 2001 From: falkTX <fal...@falktx.com> Date: Thu, 15 Apr 2021 13:18:37 +0100 Subject: [PATCH] Fix build with GCC11 Closes #1396 Signed-off-by: falkTX <fal...@falktx.com> --- source/modules/water/text/CharacterFunctions.h | 1 + source/modules/water/text/String.h | 1 + 2 files changed, 2 insertions(+) diff --git a/source/modules/water/text/CharacterFunctions.h b/source/modules/water/text/CharacterFunctions.h index 4108e995f..d9dfe8ab8 100644 --- a/source/modules/water/text/CharacterFunctions.h +++ b/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 b6361468d..ad5dd6f1b 100644 --- a/source/modules/water/text/String.h +++ b/source/modules/water/text/String.h @@ -29,6 +29,7 @@ #include "CharPointer_UTF8.h" #include "../memory/Memory.h" +#include <limits> #include <string> namespace water { ++++++ use-correct-plugin-paths.patch ++++++ Index: carla-2.3.0/source/frontend/carla_shared.py =================================================================== --- carla-2.3.0.orig/source/frontend/carla_shared.py +++ carla-2.3.0/source/frontend/carla_shared.py @@ -444,27 +444,27 @@ else: 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" Index: carla-2.3.0/source/frontend/carla_widgets.py =================================================================== --- carla-2.3.0.orig/source/frontend/carla_widgets.py +++ carla-2.3.0/source/frontend/carla_widgets.py @@ -1854,7 +1854,7 @@ if __name__ == '__main__': _loadHostSettings(_host) _host.engine_init("JACK", "Carla-Widgets") - _host.add_plugin(BINARY_NATIVE, PLUGIN_DSSI, "/usr/lib/dssi/karplong.so", "karplong", "karplong", 0, None, 0x0) + _host.add_plugin(BINARY_NATIVE, PLUGIN_DSSI, "/usr/lib64/dssi/karplong.so", "karplong", "karplong", 0, None, 0x0) _host.set_active(0, True) gui1 = CarlaAboutW(None, _host)
