Hello community, here is the log from the commit of package carla for openSUSE:Factory checked in at 2020-06-12 21:38:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/carla (Old) and /work/SRC/openSUSE:Factory/.carla.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "carla" Fri Jun 12 21:38:40 2020 rev:16 rq:814173 version:2.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/carla/carla.changes 2019-12-10 22:43:53.433776454 +0100 +++ /work/SRC/openSUSE:Factory/.carla.new.3606/carla.changes 2020-06-12 21:40:10.591956853 +0200 @@ -1,0 +2,74 @@ +Fri Jun 12 10:23:37 UTC 2020 - [email protected] + +- Update to version 2.1.1 and remove incorporated patches: + 0001-Fix-a-const-variable.patch and + 0001-Add-missing-QPainterPath-include.patch +- Upstream changes: + * Use CARLA_CATCH_UNWIND in the base utils + * Fix build with EXTERNAL_PLUGINS=false + * Bump version to 2.1.1 + * Fixup macOS 10.12 packaging + * Fix carla-control not handling CLI arg for custom address + * Fix carla-control adding more than 1 plugin + * Fix a couple of issues with carla-plugin + * Improve performance of inline display rendering + * patchcanvas: Fix ports text width calculation + * Fix wrong assertion with size 1 MIDI messages in JACK code path + +------------------------------------------------------------------- +Tue Jun 2 08:08:45 UTC 2020 - Dave Plater <[email protected]> + +- Fix factory build with patch from git: + 0001-Add-missing-QPainterPath-include.patch +- Added patch from git: + 0001-Fix-a-const-variable.patch + +------------------------------------------------------------------- +Thu May 28 11:55:14 UTC 2020 - Dave Plater <[email protected]> + +- Use service file to remove data/windows directory from tarball. + +------------------------------------------------------------------- +Wed Apr 22 12:56:21 UTC 2020 - Dave Plater <[email protected]> + +- Update license field and added bsd-2-clause.txt + +------------------------------------------------------------------- +Thu Apr 16 09:53:23 UTC 2020 - Edgar Aichinger <[email protected]> + +- update to version 2.1 final +- update carla-remove-pkgconf-rpath.patch for version 2.1 +- remove carla-link-mingw.patch (solved upstream) + +------------------------------------------------------------------- +Sat Apr 11 13:05:03 UTC 2020 - Dave Plater <[email protected]> + +- Update to git snapshot version 2.0.0+git20200331 aka v2.1-rc2. +- Build posix32, wine32 and win32 plugins and plugin utils for + Tumbleweed see boo#1168659 +- Added carla-link-mingw.patch to fix win32 build. +- Upstream changes: + *bigmeter plugin does not need fixed buffers fixes #1050 + *Can always drag&drop vst3 files because of bridges + *Increase default size of plugin RT data pool + *Fix missing idle in native plugins, leading to no post rt events + *Fix jack metadata usage for multiple carla instances + *Focus bridged UI when shown #954 + +------------------------------------------------------------------- +Fri Apr 3 09:09:07 UTC 2020 - Dave Plater <[email protected]> + +- Add %post message carla-warning. + +------------------------------------------------------------------- +Fri Mar 27 10:02:24 UTC 2020 - Dave Plater <[email protected]> + +- Update to git snapshot version 2.0.0+git20200310 and remove + incorporated patch: + 0001-Place-Qt-stuff-outside-of-custom-namespace.patch +- Added carla-remove-pkgconf-rpath.patch to remove rpath in pc files +- Rebased carla-systemlibs.patch +- Fix Factory build. +- Many upstream fixes and improvements + +------------------------------------------------------------------- Old: ---- 0001-Place-Qt-stuff-outside-of-custom-namespace.patch Carla-2.0.0+git20190321.20cc5244.tar.xz Carla.obsinfo New: ---- _servicedata bsd-2-clause.txt carla-2.1.1.tar.xz carla-remove-pkgconf-rpath.patch carla-warning ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ carla.spec ++++++ --- /var/tmp/diff_new_pack.WjcNVz/_old 2020-06-12 21:40:13.007948576 +0200 +++ /var/tmp/diff_new_pack.WjcNVz/_new 2020-06-12 21:40:13.007948576 +0200 @@ -1,7 +1,7 @@ # # spec file for package carla # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,21 +16,33 @@ # +%define rev 9249bebbf5a8f2358cb912a5b8c429bc0c5b479b + %define __provides_exclude_from ^%{_libdir}/carla/jack/.*.so.0$ Name: carla -Version: 2.0.0+git20190321.20cc5244 +#NOTE: to update this package please change these two version fields in "_service" <param name="revision">v2.1.1</param> and +#<param name="versionformat">2.1.1</param> to the version that you want and execute "osc service runall" +# It will even fill in the .changes file. Please don't touch the Version: in the spec file, it will be filled automaticaly. +Version: 2.1.1 Release: 0 Summary: An audio plugin host -License: GPL-2.0-or-later +License: GPL-2.0-or-later AND BSD-2-Clause AND BSD-3-Clause Group: Productivity/Multimedia/Sound/Utilities URL: https://kxstudio.linuxaudio.org/Applications:Carla -Source: Carla-%{version}.tar.xz +#https://github.com/falkTX/Carla/archive/v%%{version}.tar.gz#/ + +Source0: %{name}-%{version}.tar.xz +Source1: carla-warning +Source2: bsd-2-clause.txt +# PATCH-FIX-OPENSUSE -- Use system flac/vorbis/ogg Patch0: carla-systemlibs.patch -# PATCH-FIX-UPSTREAM -- Fix build with GCC9 -Patch1: 0001-Place-Qt-stuff-outside-of-custom-namespace.patch +# PATCH-FIX-OPENSUSE -- Remove rpath from .pc files [email protected] +Patch1: carla-remove-pkgconf-rpath.patch BuildRequires: fdupes BuildRequires: file-devel +BuildRequires: filesystem BuildRequires: libqt5-qtbase-devel +BuildRequires: memory-constraints # for extra native plugins BuildRequires: non-ntk-fluid BuildRequires: pkgconfig @@ -55,6 +67,22 @@ BuildRequires: pkgconfig(vorbisenc) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(zlib) +#Wine +#!BuildIgnore: sane-backends-32bit +BuildRequires: gcc-32bit +BuildRequires: gcc-c++-32bit +BuildRequires: glibc-devel-32bit +BuildRequires: libX11-devel-32bit +BuildRequires: libstdc++-devel-32bit +%if 0%{?suse_version} >= 1550 +BuildRequires: mingw32-cross-gcc +BuildRequires: mingw32-cross-gcc-c++ +BuildRequires: wine +BuildRequires: wine-devel +BuildRequires: wine-devel-32bit +Suggests: %{name}-vst = %{version} +%endif +#End wine Requires: python3-base Requires: python3-qt5 ExclusiveArch: x86_64 @@ -69,7 +97,8 @@ %package devel Summary: Header files to access Carla's API Group: Development/Libraries/C and C++ -BuildRequires: pkgconfig +Requires: carla = %{version} +Requires: pkgconfig %description devel This package contains header files needed when writing software using @@ -78,15 +107,21 @@ %package vst Summary: CarlaRack and CarlaPatchbay VST plugins Group: Productivity/Multimedia/Sound/Utilities +Requires: %{name} = %{version} %description vst This package contanis Carla VST plugins, including CarlaPatchbayFX, -CarlaPatchbay, CarlaRackFX, and CarlaRack. +CarlaPatchbay, CarlaRackFX, and CarlaRack. It also contains the +win32 and wine32 binaries for handling ms win32 vst plugins %prep -%autosetup -p1 -n Carla-%{version} +%autosetup -p1 +#for i in `grep -rl "/usr/bin/env python3"`;do $(sed -i '1s/^#!.*/#!\/usr\/bin\/python3/' ${i}; chmod +x ${i}) ;done %build +#remove -m64 from the build +%define optflags -O2 -Wall -D_FORTIFY_SOURCE=2 -funwind-tables -fasynchronous-unwind-tables -Werror=return-type -flto=auto +%limit_build -m 1000 export CXXFLAGS="%{optflags}" export CFLAGS="%{optflags}" @@ -94,34 +129,59 @@ make features # bulding with high -j numbers often results in build failures, thus we're disabling _smp_flags for now -make \ +make %{_smp_mflags} \ %ifnarch %{ix86} x86_64 BASE_OPTS= \ %endif --trace +#Makes 32bit plugin capabilities +make posix32 +#missing /usr/lib64/gcc/i686-w64-mingw32/9.2.0/libssp.a +%if 0%{?suse_version} >= 1550 +export CFLAGS=`echo $CFLAGS | sed s/\-flto=auto//` +export CXXFLAGS=`echo $CXXFLAGS | sed s/\-flto=auto//` +echo $CFLAGS +echo $CXXFLAGS +make --trace win32 CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ LIBDIR=%{_libdir} CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" +make --trace wine32 LIBDIR=%{_libdir} CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" +%endif %install make install DESTDIR=%{buildroot} PREFIX="%{_prefix}" LIBDIR="%{_libdir}" -# Move arch depended files (wrong installed) -mv %{buildroot}%{_datadir}/carla/resources/zynaddsubfx-ui %{buildroot}%{_libdir}/carla -ln -s %{_libdir}/carla/zynaddsubfx-ui %{buildroot}%{_datadir}/carla/resources/zynaddsubfx-ui -# flags -for file in carla carla-control carla-jack-multi carla-jack-single carla-patchbay carla-rack carla_app.py carla_backend.py carla_backend_qt.py carla_config.py carla_control.py carla_database.py carla_host.py carla_shared.py carla_skin.py carla_utils.py carla_widgets.py carla_settings.py externalui.py ladspa_rdf.py patchcanvas.py patchcanvas_theme.py resources_rc.py; do - chmod +x "%{buildroot}%{_datadir}/carla/$file" -done + +pushd %{buildroot} +for i in `grep -rl "/usr/bin/env python"`;do $(sed -i '1s/^#!.*/#!\/usr\/bin\/python3/' ${i}; chmod +x ${i}) ;done +for i in `grep -rl "/usr/bin/env python3"`;do $(sed -i '1s/^#!.*/#!\/usr\/bin\/python3/' ${i}; chmod +x ${i}) ;done +for i in `grep -rl "/usr/bin/python3"`;do chmod +x ${i} ;done +popd + +cp -v source/modules/lilv/serd-0.24.0/tests/TurtleTests/LICENSE LICENSE.TurtleTests + # SUSE specific %if 0%{?suse_version} %suse_update_desktop_file -r carla AudioVideo Music %suse_update_desktop_file -r carla-control AudioVideo Music %fdupes -s %{buildroot}%{_datadir} + %fdupes -s %{buildroot}%{_includedir} %endif +mkdir -p %{buildroot}%{_localstatedir}/adm/update-messages/ +#%%{name}-warning +cp %{S:1} %{buildroot}%{_localstatedir}/adm/update-messages/ +cp %{S:2} . %files -%license doc/GPL.txt doc/LGPL.txt +%license doc/GPL.txt doc/LGPL.txt LICENSE.TurtleTests bsd-2-clause.txt %doc INSTALL.md README.md doc/Carla-TestCases %{_bindir}/* %dir %{_libdir}/carla %{_libdir}/carla/* +%exclude %{_libdir}/carla/carla-bridge-posix32 +%exclude %{_libdir}/carla/carla-discovery-posix32 +%if 0%{?suse_version} >= 1550 +%exclude %{_libdir}/carla/jackbridge-wine32.dll +%exclude %{_libdir}/carla/carla-bridge-win32.exe +%exclude %{_libdir}/carla/carla-discovery-win32.exe +%endif %dir %{_libdir}/lv2 %dir %{_libdir}/lv2/carla.lv2 %{_libdir}/lv2/carla.lv2/* @@ -130,10 +190,21 @@ %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/ %{_datadir}/mime/packages/carla.xml +%{_localstatedir}/adm/update-messages/%{name}-warning + +%post +cat %{_localstatedir}/adm/update-messages/%{name}-warning %files vst %dir %{_libdir}/vst %dir %{_libdir}/vst/carla.vst +%{_libdir}/carla/carla-bridge-posix32 +%{_libdir}/carla/carla-discovery-posix32 +%if 0%{?suse_version} >= 1550 +%{_libdir}/carla/jackbridge-wine32.dll +%{_libdir}/carla/carla-bridge-win32.exe +%{_libdir}/carla/carla-discovery-win32.exe +%endif %{_libdir}/vst/carla.vst/* %files devel ++++++ _service ++++++ --- /var/tmp/diff_new_pack.WjcNVz/_old 2020-06-12 21:40:13.035948481 +0200 +++ /var/tmp/diff_new_pack.WjcNVz/_new 2020-06-12 21:40:13.035948481 +0200 @@ -1,21 +1,20 @@ +<!-- Downloads revision vx.x and removes proprietary data/windows --> <services> - <service name="obs_scm" mode="disabled"> + <service name="tar_scm" mode="disabled"> <param name="url">https://github.com/falkTX/Carla.git</param> <param name="scm">git</param> - <param name="submodules">enable</param> <param name="exclude">.git</param> - <param name="filename">Carla</param> - <param name="versionformat">2.0.0+git%cd.%h</param> - <param name="revision">20cc5244</param> - <param name="changesgenerate">disable</param> - </service> - <service name="tar" mode="disabled"> + <param name="exclude">data/windows</param> + <param name="exclude">source/native-plugins/external/*</param> + <param name="revision">v2.1.1</param> + <param name="versionformat">2.1.1</param> + <param name="changesgenerate">enable</param> + <param name="filename">carla</param> </service> <service name="recompress" mode="disabled"> - <param name="file">Carla-*.tar</param> + <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service name="set_version" mode="disabled"> - <param name="basename">Carla</param> </service> </services> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/falkTX/Carla.git</param> <param name="changesrevision">1b5080dff02b1e751e32f0582e4aee7bc2c74a67</param></service></servicedata>++++++ bsd-2-clause.txt ++++++ --- title: BSD 2-Clause "Simplified" License spdx-id: BSD-2-Clause redirect_from: /licenses/bsd/ hidden: false description: A permissive license that comes in two variants, the <a href="/licenses/bsd-2-clause/">BSD 2-Clause</a> and <a href="/licenses/bsd-3-clause/">BSD 3-Clause</a>. Both have very minute differences to the MIT license. how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. using: - go-redis: https://github.com/go-redis/redis/blob/master/LICENSE - Homebrew: https://github.com/Homebrew/brew/blob/master/LICENSE.txt - Pony: https://github.com/ponylang/ponyc/blob/master/LICENSE permissions: - commercial-use - modifications - distribution - private-use conditions: - include-copyright limitations: - liability - warranty --- BSD 2-Clause License Copyright (c) [year], [fullname] All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++++++ Carla-2.0.0+git20190321.20cc5244.tar.xz -> carla-2.1.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/carla/Carla-2.0.0+git20190321.20cc5244.tar.xz /work/SRC/openSUSE:Factory/.carla.new.3606/carla-2.1.1.tar.xz differ: char 26, line 1 ++++++ carla-remove-pkgconf-rpath.patch ++++++ Index: carla-2.1.1/data/carla-standalone.pc =================================================================== --- carla-2.1.1.orig/data/carla-standalone.pc 2020-06-12 12:53:06.368008569 +0200 +++ carla-2.1.1/data/carla-standalone.pc 2020-06-12 12:54:21.982914944 +0200 @@ -5,5 +5,5 @@ includedir=X-INCLUDEDIR-X/carla Name: carla-standalone Version: 2.1.1 Description: Carla Host Standalone -Libs: -Wl,-rpath,${libdir} -L${libdir} -lcarla_standalone2 +Libs: -L${libdir} -lcarla_standalone2 Cflags: -DREAL_BUILD -I${includedir} -I${includedir}/includes Index: carla-2.1.1/data/carla-utils.pc =================================================================== --- carla-2.1.1.orig/data/carla-utils.pc 2020-06-12 12:53:06.368008569 +0200 +++ carla-2.1.1/data/carla-utils.pc 2020-06-12 12:55:07.736672962 +0200 @@ -5,5 +5,5 @@ includedir=X-INCLUDEDIR-X/carla Name: carla-utils Version: 2.1.1 Description: Carla Host Utilities -Libs: -Wl,-rpath,${libdir} -L${libdir} -lcarla_utils +Libs: -L${libdir} -lcarla_utils Cflags: -DREAL_BUILD -I${includedir} -I${includedir}/includes -I${includedir}/utils Index: carla-2.1.1/data/carla-native-plugin.pc =================================================================== --- carla-2.1.1.orig/data/carla-native-plugin.pc 2020-06-12 12:53:06.368008569 +0200 +++ carla-2.1.1/data/carla-native-plugin.pc 2020-06-12 12:56:32.123914260 +0200 @@ -5,5 +5,5 @@ includedir=X-INCLUDEDIR-X/carla Name: carla-native-plugin Version: 2.1.1 Description: Carla Native Plugin -Libs: -Wl,-rpath,${libdir} -L${libdir} -lcarla_native-plugin +Libs: -L${libdir} -lcarla_native-plugin Cflags: -DREAL_BUILD -I${includedir} -I${includedir}/includes ++++++ carla-systemlibs.patch ++++++ --- /var/tmp/diff_new_pack.WjcNVz/_old 2020-06-12 21:40:13.095948275 +0200 +++ /var/tmp/diff_new_pack.WjcNVz/_new 2020-06-12 21:40:13.099948261 +0200 @@ -1,20 +1,8 @@ -diff -up carla/source/backend/Makefile.systemlibs carla/source/backend/Makefile ---- carla/source/backend/Makefile.systemlibs 2018-11-08 20:25:26.000000000 +0100 -+++ carla/source/backend/Makefile 2018-11-12 12:09:41.077718615 +0100 -@@ -56,6 +56,9 @@ STANDALONE_LINK_FLAGS += $(MAGIC_LIBS) - STANDALONE_LINK_FLAGS += $(FLUIDSYNTH_LIBS) - STANDALONE_LINK_FLAGS += $(X11_LIBS) - -+STANDALONE_LINK_FLAGS += $(FLAC_LIBS) -+STANDALONE_LINK_FLAGS += $(VORBIS_LIBS) -+ - # ---------------------------------------------------------------------------------------------------------------------------- - - all: $(TARGETS) -diff -up carla/source/backend/utils/Makefile.systemlibs carla/source/backend/utils/Makefile ---- carla/source/backend/utils/Makefile.systemlibs 2018-11-08 20:25:26.000000000 +0100 -+++ carla/source/backend/utils/Makefile 2018-11-12 12:11:43.501736201 +0100 -@@ -25,6 +25,8 @@ LIBS += $(MODULEDIR)/water.files.a +Index: carla-2.1.1/source/backend/utils/Makefile +=================================================================== +--- carla-2.1.1.orig/source/backend/utils/Makefile 2020-06-10 23:38:43.000000000 +0200 ++++ carla-2.1.1/source/backend/utils/Makefile 2020-06-12 12:45:36.674697400 +0200 +@@ -42,6 +42,8 @@ endif LINK_FLAGS += $(LILV_LIBS) LINK_FLAGS += $(WATER_LIBS) @@ -23,10 +11,11 @@ ifeq ($(HAVE_X11),true) LINK_FLAGS += $(X11_LIBS) -diff -up carla/source/bridges-plugin/Makefile.systemlibs carla/source/bridges-plugin/Makefile ---- carla/source/bridges-plugin/Makefile.systemlibs 2018-11-08 20:25:26.000000000 +0100 -+++ carla/source/bridges-plugin/Makefile 2018-11-12 12:16:05.041847461 +0100 -@@ -78,6 +78,11 @@ NATIVE_LINK_FLAGS += $(FLUIDSYNTH_LIBS) +Index: carla-2.1.1/source/bridges-plugin/Makefile +=================================================================== +--- carla-2.1.1.orig/source/bridges-plugin/Makefile 2020-06-10 23:38:43.000000000 +0200 ++++ carla-2.1.1/source/bridges-plugin/Makefile 2020-06-12 12:45:36.674697400 +0200 +@@ -152,6 +152,11 @@ NATIVE_LINK_FLAGS += $(FLUIDSYNTH_LIBS) NATIVE_LINK_FLAGS += $(MAGIC_LIBS) @@ -38,9 +27,10 @@ LIBS_native += $(MODULEDIR)/audio_decoder.a LIBS_native += $(MODULEDIR)/native-plugins.a LIBS_native += $(MODULEDIR)/sfzero.a -diff -up carla/source/bridges-ui/Makefile.systemlibs carla/source/bridges-ui/Makefile ---- carla/source/bridges-ui/Makefile.systemlibs 2018-08-04 16:35:52.000000000 +0200 -+++ carla/source/bridges-ui/Makefile 2018-11-12 12:21:34.637973676 +0100 +Index: carla-2.1.1/source/bridges-ui/Makefile +=================================================================== +--- carla-2.1.1.orig/source/bridges-ui/Makefile 2020-06-10 23:38:43.000000000 +0200 ++++ carla-2.1.1/source/bridges-ui/Makefile 2020-06-12 12:45:36.674697400 +0200 @@ -37,10 +37,10 @@ BUILD_QT4_FLAGS = $(BUILD_CXX_FLAGS) LINK_QT4_FLAGS = $(LINK_FLAGS) $(shell pkg-config --libs QtCore QtGui) $(LIBDL_LIBS) @@ -65,12 +55,13 @@ +LINK_QT4_FLAGS += $(FLAC_LIBS) $(VORBIS_LIBS) endif - # --------------------------------------------------------------------------------------------------------------------- -diff -up carla/source/Makefile.mk.systemlibs carla/source/Makefile.mk ---- carla/source/Makefile.mk.systemlibs 2018-11-08 20:25:26.000000000 +0100 -+++ carla/source/Makefile.mk 2018-11-12 12:03:16.933663447 +0100 -@@ -413,6 +413,14 @@ FLUIDSYNTH_FLAGS = $(shell pkg-config $( - FLUIDSYNTH_LIBS = $(shell pkg-config $(PKG_CONFIG_FLAGS) --libs fluidsynth) + ifeq ($(TESTBUILD),true) +Index: carla-2.1.1/source/Makefile.mk +=================================================================== +--- carla-2.1.1.orig/source/Makefile.mk 2020-06-10 23:38:43.000000000 +0200 ++++ carla-2.1.1/source/Makefile.mk 2020-06-12 12:45:36.674697400 +0200 +@@ -436,6 +436,14 @@ QT5_FLAGS = $(shell $(PKG_CONFIG) $(PKG_ + QT5_LIBS = $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --libs Qt5Core Qt5Gui Qt5Widgets) endif +FLAC_FLAGS = $(shell pkg-config --cflags flac) @@ -82,14 +73,15 @@ +BASE_FLAGS += $(VORBIS_FLAGS) + ifeq ($(HAVE_SNDFILE),true) - SNDFILE_FLAGS = $(shell pkg-config $(PKG_CONFIG_FLAGS) --cflags sndfile) - SNDFILE_LIBS = $(shell pkg-config $(PKG_CONFIG_FLAGS) --libs sndfile) -diff -up carla/source/plugin/Makefile.systemlibs carla/source/plugin/Makefile ---- carla/source/plugin/Makefile.systemlibs 2018-11-08 20:25:26.000000000 +0100 -+++ carla/source/plugin/Makefile 2018-11-12 12:24:06.390012077 +0100 -@@ -73,6 +73,9 @@ LINK_FLAGS += $(LIBLO_LIBS) - LINK_FLAGS += $(MAGIC_LIBS) - LINK_FLAGS += $(X11_LIBS) + SNDFILE_FLAGS = $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --cflags sndfile) + SNDFILE_LIBS = $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --libs sndfile) +Index: carla-2.1.1/source/plugin/Makefile +=================================================================== +--- carla-2.1.1.orig/source/plugin/Makefile 2020-06-10 23:38:43.000000000 +0200 ++++ carla-2.1.1/source/plugin/Makefile 2020-06-12 12:45:36.674697400 +0200 +@@ -109,6 +109,9 @@ LINK_FLAGS += $(JUCE_GUI_EXTRA_LIBS) + endif + endif +LINK_FLAGS += $(FLAC_LIBS) +LINK_FLAGS += $(VORBIS_LIBS) @@ -97,3 +89,16 @@ ifeq ($(MACOS),true) SYMBOLS_NATIVE = -Wl,-exported_symbol,_carla_get_native_rack_plugin SYMBOLS_NATIVE += -Wl,-exported_symbol,_carla_get_native_patchbay_plugin +Index: carla-2.1.1/source/backend/Makefile +=================================================================== +--- carla-2.1.1.orig/source/backend/Makefile 2020-06-10 23:38:43.000000000 +0200 ++++ carla-2.1.1/source/backend/Makefile 2020-06-12 12:45:36.674697400 +0200 +@@ -67,6 +67,8 @@ STANDALONE_LINK_FLAGS += $(LIBLO_LIBS) + STANDALONE_LINK_FLAGS += $(MAGIC_LIBS) + STANDALONE_LINK_FLAGS += $(FLUIDSYNTH_LIBS) + STANDALONE_LINK_FLAGS += $(X11_LIBS) ++STANDALONE_LINK_FLAGS += $(FLAC_LIBS) ++STANDALONE_LINK_FLAGS += $(VORBIS_LIBS) + + ifeq ($(USING_JUCE),true) + STANDALONE_LINK_FLAGS += $(JUCE_AUDIO_BASICS_LIBS) ++++++ carla-warning ++++++ WARNING: This version of Carla has VST support but if you wish to use it you will need to install carla-vst. This is to prevent an unnecessary dependency on wine.
