Hello community, here is the log from the commit of package carla for openSUSE:Factory checked in at 2019-12-10 22:43:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/carla (Old) and /work/SRC/openSUSE:Factory/.carla.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "carla" Tue Dec 10 22:43:38 2019 rev:15 rq:755499 version:2.0.0+git20190321.20cc5244 Changes: -------- --- /work/SRC/openSUSE:Factory/carla/carla.changes 2019-05-02 19:16:49.485363678 +0200 +++ /work/SRC/openSUSE:Factory/.carla.new.4691/carla.changes 2019-12-10 22:43:53.433776454 +0100 @@ -1,0 +2,7 @@ +Mon Dec 9 12:47:15 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Add 0001-Place-Qt-stuff-outside-of-custom-namespace.patch to fix + build with GCC9. +- Run spec-cleaner + +------------------------------------------------------------------- New: ---- 0001-Place-Qt-stuff-outside-of-custom-namespace.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ carla.spec ++++++ --- /var/tmp/diff_new_pack.ebW2Ot/_old 2019-12-10 22:43:54.529776048 +0100 +++ /var/tmp/diff_new_pack.ebW2Ot/_new 2019-12-10 22:43:54.529776048 +0100 @@ -1,7 +1,7 @@ # # spec file for package carla # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,49 +17,47 @@ %define __provides_exclude_from ^%{_libdir}/carla/jack/.*.so.0$ - Name: carla Version: 2.0.0+git20190321.20cc5244 Release: 0 Summary: An audio plugin host License: GPL-2.0-or-later Group: Productivity/Multimedia/Sound/Utilities -ExclusiveArch: x86_64 -Url: http://kxstudio.linuxaudio.org/Applications:Carla +URL: https://kxstudio.linuxaudio.org/Applications:Carla Source: Carla-%{version}.tar.xz -Patch1: carla-systemlibs.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build - +Patch0: carla-systemlibs.patch +# PATCH-FIX-UPSTREAM -- Fix build with GCC9 +Patch1: 0001-Place-Qt-stuff-outside-of-custom-namespace.patch BuildRequires: fdupes BuildRequires: file-devel BuildRequires: libqt5-qtbase-devel -BuildRequires: pkg-config +# for extra native plugins +BuildRequires: non-ntk-fluid +BuildRequires: pkgconfig BuildRequires: python3-devel BuildRequires: python3-qt5-devel BuildRequires: python3-rdflib BuildRequires: update-desktop-files BuildRequires: pkgconfig(alsa) -BuildRequires: pkgconfig(flac) -BuildRequires: pkgconfig(libpulse) -BuildRequires: pkgconfig(sndfile) -BuildRequires: pkgconfig(vorbisenc) -# for extra native plugins -BuildRequires: non-ntk-fluid BuildRequires: pkgconfig(fftw3f) +BuildRequires: pkgconfig(flac) +# for extra samplers support +BuildRequires: pkgconfig(fluidsynth) BuildRequires: pkgconfig(gl) -BuildRequires: pkgconfig(liblo) -BuildRequires: pkgconfig(libprojectM) -BuildRequires: pkgconfig(mxml) -BuildRequires: pkgconfig(zlib) # for plugin GUIs BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(liblo) +BuildRequires: pkgconfig(libprojectM) +BuildRequires: pkgconfig(libpulse) +BuildRequires: pkgconfig(mxml) +BuildRequires: pkgconfig(sndfile) +BuildRequires: pkgconfig(vorbisenc) BuildRequires: pkgconfig(x11) -# for extra samplers support -BuildRequires: pkgconfig(fluidsynth) - +BuildRequires: pkgconfig(zlib) Requires: python3-base Requires: python3-qt5 +ExclusiveArch: x86_64 %description Carla is an audio plugin host, with support for many audio drivers @@ -71,7 +69,7 @@ %package devel Summary: Header files to access Carla's API Group: Development/Libraries/C and C++ -BuildRequires: pkg-config +BuildRequires: pkgconfig %description devel This package contains header files needed when writing software using @@ -86,8 +84,7 @@ CarlaPatchbay, CarlaRackFX, and CarlaRack. %prep -%setup -q -n Carla-%{version} -%patch1 -p1 +%autosetup -p1 -n Carla-%{version} %build export CXXFLAGS="%{optflags}" @@ -98,7 +95,7 @@ # bulding with high -j numbers often results in build failures, thus we're disabling _smp_flags for now make \ -%ifnarch %ix86 x86_64 +%ifnarch %{ix86} x86_64 BASE_OPTS= \ %endif --trace @@ -120,8 +117,8 @@ %endif %files -%defattr(-,root,root) -%doc INSTALL.md README.md doc +%license doc/GPL.txt doc/LGPL.txt +%doc INSTALL.md README.md doc/Carla-TestCases %{_bindir}/* %dir %{_libdir}/carla %{_libdir}/carla/* @@ -135,13 +132,11 @@ %{_datadir}/mime/packages/carla.xml %files vst -%defattr(-,root,root) %dir %{_libdir}/vst %dir %{_libdir}/vst/carla.vst %{_libdir}/vst/carla.vst/* %files devel -%defattr(-,root,root) %dir %{_includedir}/carla %{_includedir}/carla/* %{_libdir}/pkgconfig/* ++++++ 0001-Place-Qt-stuff-outside-of-custom-namespace.patch ++++++ >From db6dadd6de2041adf34905d77839cce05273924c Mon Sep 17 00:00:00 2001 From: falkTX <[email protected]> Date: Fri, 12 Jul 2019 11:55:39 +0200 Subject: [PATCH] Place Qt stuff outside of custom namespace Fixes #894 Closes #895 Signed-off-by: falkTX <[email protected]> Conflicts: source/bridges-ui/CarlaBridgeToolkitQt.cpp --- source/bridges-ui/CarlaBridgeToolkitQt.cpp | 10 ++++---- source/includes/CarlaDefines.h | 1 - source/utils/CarlaUtils.hpp | 28 ++++++++++++++-------- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/source/bridges-ui/CarlaBridgeToolkitQt.cpp b/source/bridges-ui/CarlaBridgeToolkitQt.cpp index d0632b86..77c9f608 100644 --- a/source/bridges-ui/CarlaBridgeToolkitQt.cpp +++ b/source/bridges-ui/CarlaBridgeToolkitQt.cpp @@ -256,12 +256,6 @@ private: #endif }; -#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) -# include "CarlaBridgeToolkitQt5.moc" -#else -# include "CarlaBridgeToolkitQt4.moc" -#endif - // ------------------------------------------------------------------------- CarlaBridgeToolkit* CarlaBridgeToolkit::createNew(CarlaBridgeFormat* const format) @@ -275,13 +269,17 @@ CARLA_BRIDGE_UI_END_NAMESPACE // ------------------------------------------------------------------------- +CARLA_BRIDGE_UI_USE_NAMESPACE + // missing declaration int qInitResources(); int qCleanupResources(); #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) +# include "CarlaBridgeToolkitQt5.moc" # include "resources.qt5.cpp" #else +# include "CarlaBridgeToolkitQt4.moc" # include "resources.qt4.cpp" #endif diff --git a/source/includes/CarlaDefines.h b/source/includes/CarlaDefines.h index 3c427e02..42baaaf2 100644 --- a/source/includes/CarlaDefines.h +++ b/source/includes/CarlaDefines.h @@ -185,7 +185,6 @@ /* Define CARLA_SAFE_EXCEPTION */ #define CARLA_SAFE_EXCEPTION(msg) catch(...) { carla_safe_exception(msg, __FILE__, __LINE__); } - #define CARLA_SAFE_EXCEPTION_BREAK(msg) catch(...) { carla_safe_exception(msg, __FILE__, __LINE__); break; } #define CARLA_SAFE_EXCEPTION_CONTINUE(msg) catch(...) { carla_safe_exception(msg, __FILE__, __LINE__); continue; } #define CARLA_SAFE_EXCEPTION_RETURN(msg, ret) catch(...) { carla_safe_exception(msg, __FILE__, __LINE__); return ret; } diff --git a/source/utils/CarlaUtils.hpp b/source/utils/CarlaUtils.hpp index 6895333e..803e40b7 100644 --- a/source/utils/CarlaUtils.hpp +++ b/source/utils/CarlaUtils.hpp @@ -211,33 +211,41 @@ void carla_safe_assert(const char* const assertion, const char* const file, cons } /* - * Print a safe assertion error message, with 1 extra integer value. + * Print a safe assertion error message, with 1 extra signed integer value. */ static inline -void carla_safe_assert_int(const char* const assertion, const char* const file, const int line, - const int value) noexcept +void carla_safe_assert_int(const char* const assertion, const char* const file, + const int line, const int value) noexcept { carla_stderr2("Carla assertion failure: \"%s\" in file %s, line %i, value %i", assertion, file, line, value); } + +/* + * Print a safe assertion error message, with 1 extra unsigned integer value. + */ static inline -void carla_safe_assert_uint(const char* const assertion, const char* const file, const int line, - const uint value) noexcept +void carla_safe_assert_uint(const char* const assertion, const char* const file, + const int line, const uint value) noexcept { carla_stderr2("Carla assertion failure: \"%s\" in file %s, line %i, value %u", assertion, file, line, value); } /* - * Print a safe assertion error message, with 2 extra integer values. + * Print a safe assertion error message, with 2 extra signed integer values. */ static inline -void carla_safe_assert_int2(const char* const assertion, const char* const file, const int line, - const int v1, const int v2) noexcept +void carla_safe_assert_int2(const char* const assertion, const char* const file, + const int line, const int v1, const int v2) noexcept { carla_stderr2("Carla assertion failure: \"%s\" in file %s, line %i, v1 %i, v2 %i", assertion, file, line, v1, v2); } + +/* + * Print a safe assertion error message, with 2 extra unsigned integer values. + */ static inline -void carla_safe_assert_uint2(const char* const assertion, const char* const file, const int line, - const uint v1, const uint v2) noexcept +void carla_safe_assert_uint2(const char* const assertion, const char* const file, + const int line, const uint v1, const uint v2) noexcept { carla_stderr2("Carla assertion failure: \"%s\" in file %s, line %i, v1 %u, v2 %u", assertion, file, line, v1, v2); } -- 2.24.0
