Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package carla for openSUSE:Factory checked
in at 2023-03-12 16:25:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/carla (Old)
and /work/SRC/openSUSE:Factory/.carla.new.31432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "carla"
Sun Mar 12 16:25:02 2023 rev:35 rq:1071000 version:2.5.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/carla/carla.changes 2023-02-13
16:43:20.412231151 +0100
+++ /work/SRC/openSUSE:Factory/.carla.new.31432/carla.changes 2023-03-12
16:26:55.101470899 +0100
@@ -1,0 +2,8 @@
+Sat Mar 11 10:45:38 UTC 2023 - Dave Plater <davejpla...@gmail.com>
+
+- Add patch to fix #boo1209057
+ 0001-Fix-crash-regression-when-using-LV2-plugins-without-.patch
+- Added patch 0001-Fix-compat-with-PyQt-PyQt-5.15.8.patch
+- Made build macros more specific
+
+-------------------------------------------------------------------
New:
----
0001-Fix-compat-with-PyQt-PyQt-5.15.8.patch
0001-Fix-crash-regression-when-using-LV2-plugins-without-.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ carla.spec ++++++
--- /var/tmp/diff_new_pack.eNvlAU/_old 2023-03-12 16:26:56.165475585 +0100
+++ /var/tmp/diff_new_pack.eNvlAU/_new 2023-03-12 16:26:56.181475655 +0100
@@ -16,11 +16,20 @@
#
-%if 0%{?suse_version} > 1501
+%if 0%{?suse_version} >= 1550
+%bcond_without liblo
+%bcond_without vst
+%else
+%if 0%{?sle_version} >= 150500
%bcond_without liblo
+%bcond_with vst
%else
+%bcond_with vst
%bcond_with liblo
%endif
+%endif
+#carla doesn't produce debug rpms unless a debugbuild is defined as 1
+%define debugbuild 0
%define __provides_exclude_from ^%{_libdir}/carla/jack/.*.so.0$
Name: carla
@@ -42,6 +51,9 @@
Patch1: 0002-Remove-rpath-from-.pc-files.patch
# PATCH-FIX-OPENSUSE -- Use the correct plugin paths for openSUSE
sfl...@suse.de
Patch2: 0003-Use-correct-plugin-paths-for-openSUSE.patch
+# Patches from pre version 2.5.4 release
+Patch3: 0001-Fix-crash-regression-when-using-LV2-plugins-without-.patch
+Patch4: 0001-Fix-compat-with-PyQt-PyQt-5.15.8.patch
BuildRequires: fdupes
BuildRequires: file-devel
BuildRequires: hicolor-icon-theme
@@ -85,7 +97,7 @@
BuildRequires: libXcursor-devel-32bit
BuildRequires: libXext-devel-32bit
BuildRequires: libstdc++-devel-32bit
-%if 0%{?suse_version} >= 1550
+%if %{with vst}
BuildRequires: mingw32-cross-gcc
BuildRequires: mingw32-cross-gcc-c++
BuildRequires: mingw64-cross-gcc
@@ -140,7 +152,9 @@
%define optflags -O2 -Wall -D_FORTIFY_SOURCE=2 -funwind-tables
-fasynchronous-unwind-tables -Werror=return-type -flto=auto
export CXXFLAGS="%{optflags}"
export CFLAGS="%{optflags}"
-
+%if 0%{?debugbuild} == 1
+export DEBUG=true
+%endif
# list build configuration, no need for optflags or -j
make features
@@ -152,7 +166,7 @@
#Makes 32bit plugin capabilities
make posix32
#missing /usr/lib64/gcc/i686-w64-mingw32/9.2.0/libssp.a
-%if 0%{?suse_version} >= 1550
+%if %{with vst}
export CFLAGS=`echo $CFLAGS | sed s/\-flto=auto//`
export CXXFLAGS=`echo $CXXFLAGS | sed s/\-flto=auto//`
echo $CFLAGS
@@ -202,7 +216,7 @@
%{_libdir}/carla
%exclude %{_libdir}/carla/carla-bridge-posix32
%exclude %{_libdir}/carla/carla-discovery-posix32
-%if 0%{?suse_version} >= 1550
+%if %{with vst}
%exclude %{_libdir}/carla/carla-bridge-win32.exe
%exclude %{_libdir}/carla/carla-bridge-win64.exe
%exclude %{_libdir}/carla/carla-discovery-win32.exe
@@ -228,7 +242,7 @@
%{_libdir}/vst/carla.vst
%{_libdir}/carla/carla-bridge-posix32
%{_libdir}/carla/carla-discovery-posix32
-%if 0%{?suse_version} >= 1550
+%if %{with vst}
%{_libdir}/carla/carla-bridge-win32.exe
%{_libdir}/carla/carla-bridge-win64.exe
%{_libdir}/carla/carla-discovery-win32.exe
++++++ 0001-Fix-compat-with-PyQt-PyQt-5.15.8.patch ++++++
>From 8c662a990f33e278a738dcc4f5b43c086c12166b Mon Sep 17 00:00:00 2001
From: falkTX <fal...@falktx.com>
Date: Sun, 29 Jan 2023 20:40:54 +0100
Subject: [PATCH] Fix compat with PyQt >= PyQt 5.15.8
Signed-off-by: falkTX <fal...@falktx.com>
---
source/frontend/carla_shared.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/source/frontend/carla_shared.py b/source/frontend/carla_shared.py
index bdc7d4ffb..e9fd22722 100644
--- a/source/frontend/carla_shared.py
+++ b/source/frontend/carla_shared.py
@@ -38,7 +38,12 @@ except:
#
------------------------------------------------------------------------------------------------------------
# Imports (PyQt5)
-from PyQt5.Qt import PYQT_VERSION_STR
+# import changed in PyQt 5.15.8, so try both
+try:
+ from PyQt5.Qt import PYQT_VERSION_STR
+except ImportError:
+ from PyQt5.QtCore import PYQT_VERSION_STR
+
from PyQt5.QtCore import qFatal, QT_VERSION, QT_VERSION_STR, qWarning, QDir,
QSettings
from PyQt5.QtGui import QIcon
from PyQt5.QtWidgets import QFileDialog, QMessageBox
--
2.35.3
++++++ 0001-Fix-crash-regression-when-using-LV2-plugins-without-.patch ++++++
>From 235beb8de5bf8bf12d2b93c551098fd4ba26f54d Mon Sep 17 00:00:00 2001
From: falkTX <fal...@falktx.com>
Date: Sat, 28 Jan 2023 14:24:20 +0100
Subject: [PATCH] Fix crash/regression when using LV2 plugins without worker
ext
Signed-off-by: falkTX <fal...@falktx.com>
---
source/backend/plugin/CarlaPluginLV2.cpp | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/source/backend/plugin/CarlaPluginLV2.cpp
b/source/backend/plugin/CarlaPluginLV2.cpp
index 4c9b64ecc..38bf8afd1 100644
--- a/source/backend/plugin/CarlaPluginLV2.cpp
+++ b/source/backend/plugin/CarlaPluginLV2.cpp
@@ -3247,8 +3247,16 @@ public:
if (fRdfDescriptor->ParameterCount > 0 ||
(fUI.type != UI::TYPE_NULL && fEventsIn.count > 0 &&
(fEventsIn.data[0].type & CARLA_EVENT_DATA_ATOM) != 0))
+ {
fAtomBufferEvIn.createBuffer(eventBufferSize);
+ if (fAtomBufferRealtimeSize == 0)
+ {
+ fAtomBufferRealtimeSize = fAtomBufferEvIn.getSize(); // actual
buffer size will be next power of 2
+ fAtomBufferRealtime =
static_cast<LV2_Atom*>(std::malloc(fAtomBufferRealtimeSize));
+ }
+ }
+
if (hasPatchParameterOutputs ||
(fUI.type != UI::TYPE_NULL && fEventsOut.count > 0 &&
(fEventsOut.data[0].type & CARLA_EVENT_DATA_ATOM) != 0))
{
--
2.35.3
