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-01-09 17:24:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/carla (Old)
and /work/SRC/openSUSE:Factory/.carla.new.32243 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "carla"
Mon Jan 9 17:24:24 2023 rev:33 rq:1057089 version:2.5.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/carla/carla.changes 2022-10-11
18:05:18.362061162 +0200
+++ /work/SRC/openSUSE:Factory/.carla.new.32243/carla.changes 2023-01-09
17:24:25.687370840 +0100
@@ -1,0 +2,22 @@
+Sat Jan 07 12:07:19 UTC 2023 - m...@0x0.st
+
+- Update to version 2.5.2:
+ * Improve debug messages
+ * Correct jackbridge build flags
+ * LTO must not be used for building wine stuff (not just linking)
+ * Also prevent -flto from wine link flags
+ * Prevent -static-lib{gcc,stdc++} flags from going to winelib stuff
+ * Use LIB_EXT for wine libs copying
+ * Bump version to 2.5.2
+ * fix pkgconfig files having bad includedir/libdir variables
+ * Revert "outer frame for carla-lv2" stuff, make it verbose instead
+ * Import fixes from main branch into hotfix-2.5 one
+- Refresh/Git format patches:
+ * carla-systemlibs.patch
+ -> 0001-Use-system-flac-vorbis-ogg.patch
+ * carla-remove-pkgconf-rpath.patch
+ -> 0002-Remove-rpath-from-.pc-files.patch
+ * use-correct-plugin-paths.patch
+ -> 0003-Use-correct-plugin-paths-for-openSUSE.patch
+
+-------------------------------------------------------------------
Old:
----
carla-2.5.1.tar.xz
carla-remove-pkgconf-rpath.patch
carla-systemlibs.patch
use-correct-plugin-paths.patch
New:
----
0001-Use-system-flac-vorbis-ogg.patch
0002-Remove-rpath-from-.pc-files.patch
0003-Use-correct-plugin-paths-for-openSUSE.patch
carla-2.5.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ carla.spec ++++++
--- /var/tmp/diff_new_pack.o2LWPb/_old 2023-01-09 17:24:26.435375073 +0100
+++ /var/tmp/diff_new_pack.o2LWPb/_new 2023-01-09 17:24:26.439375096 +0100
@@ -1,7 +1,7 @@
#
# spec file for package carla
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -27,7 +27,7 @@
#NOTE: to update this package please change these two version fields in
"_service" <param name="revision">v2.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.5.1
+Version: 2.5.2
Release: 0
Summary: An audio plugin host
License: BSD-2-Clause AND GPL-2.0-or-later AND BSD-3-Clause
@@ -37,11 +37,11 @@
Source1: carla-warning
Source2: bsd-2-clause.txt
# PATCH-FIX-OPENSUSE -- Use system flac/vorbis/ogg
-Patch0: carla-systemlibs.patch
+Patch0: 0001-Use-system-flac-vorbis-ogg.patch
# PATCH-FIX-OPENSUSE -- Remove rpath from .pc files davejpla...@gmail.com
-Patch1: carla-remove-pkgconf-rpath.patch
+Patch1: 0002-Remove-rpath-from-.pc-files.patch
# PATCH-FIX-OPENSUSE -- Use the correct plugin paths for openSUSE
sfl...@suse.de
-Patch2: use-correct-plugin-paths.patch
+Patch2: 0003-Use-correct-plugin-paths-for-openSUSE.patch
BuildRequires: fdupes
BuildRequires: file-devel
BuildRequires: hicolor-icon-theme
++++++ 0001-Use-system-flac-vorbis-ogg.patch ++++++
>From 125f16f4861ec6df1709b03c5cc44b80677bbef7 Mon Sep 17 00:00:00 2001
From: Mia Herkt <m...@0x0.st>
Date: Sat, 7 Jan 2023 13:31:11 +0100
Subject: [PATCH 1/3] Use system flac/vorbis/ogg
---
source/Makefile.mk | 8 ++++++++
source/backend/Makefile | 2 ++
source/backend/utils/Makefile | 2 ++
source/bridges-plugin/Makefile | 5 +++++
source/bridges-ui/Makefile | 10 +++++-----
source/plugin/Makefile | 3 +++
6 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/source/Makefile.mk b/source/Makefile.mk
index 29e9523..4565551 100644
--- a/source/Makefile.mk
+++ b/source/Makefile.mk
@@ -231,6 +231,14 @@ else ifeq ($(HAVE_SDL1),true)
BASE_FLAGS += -DHAVE_SDL -DHAVE_SDL1
endif
+FLAC_FLAGS = $(shell pkg-config --cflags flac)
+FLAC_LIBS = $(shell pkg-config --libs flac)
+BASE_FLAGS += $(FLAC_FLAGS)
+
+VORBIS_FLAGS = $(shell pkg-config --cflags vorbis vorbisfile vorbisenc ogg)
+VORBIS_LIBS = $(shell pkg-config --libs vorbis vorbisfile vorbisenc ogg)
+BASE_FLAGS += $(VORBIS_FLAGS)
+
ifeq ($(HAVE_SNDFILE),true)
BASE_FLAGS += -DHAVE_SNDFILE
endif
diff --git a/source/backend/Makefile b/source/backend/Makefile
index 8c14c79..fdd1da9 100644
--- a/source/backend/Makefile
+++ b/source/backend/Makefile
@@ -86,6 +86,8 @@ STANDALONE_LINK_FLAGS += $(MAGIC_LIBS)
STANDALONE_LINK_FLAGS += $(FLUIDSYNTH_LIBS)
STANDALONE_LINK_FLAGS += $(SDL_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)
diff --git a/source/backend/utils/Makefile b/source/backend/utils/Makefile
index 238274b..617b7af 100644
--- a/source/backend/utils/Makefile
+++ b/source/backend/utils/Makefile
@@ -45,6 +45,8 @@ endif
LINK_FLAGS += $(LILV_LIBS)
LINK_FLAGS += $(WATER_LIBS)
LINK_FLAGS += $(YSFX_GRAPHICS_LIBS)
+LINK_FLAGS += $(FLAC_LIBS)
+LINK_FLAGS += $(VORBIS_LIBS)
ifeq ($(HAVE_X11),true)
LINK_FLAGS += $(X11_LIBS)
diff --git a/source/bridges-plugin/Makefile b/source/bridges-plugin/Makefile
index 72fe7f9..b6da63b 100644
--- a/source/bridges-plugin/Makefile
+++ b/source/bridges-plugin/Makefile
@@ -179,6 +179,11 @@ NATIVE_LINK_FLAGS += $(FLUIDSYNTH_LIBS)
NATIVE_LINK_FLAGS += $(MAGIC_LIBS)
+NATIVE_BUILD_FLAGS += $(FLAC_FLAGS)
+NATIVE_LINK_FLAGS += $(FLAC_LIBS)
+NATIVE_BUILD_FLAGS += $(VORBIS_FLAGS)
+NATIVE_LINK_FLAGS += $(VORBIS_LIBS)
+
LIBS_native += $(MODULEDIR)/audio_decoder.a
LIBS_native += $(MODULEDIR)/native-plugins.a
LIBS_native += $(MODULEDIR)/sfzero.a
diff --git a/source/bridges-ui/Makefile b/source/bridges-ui/Makefile
index 243bbfa..30385f9 100644
--- a/source/bridges-ui/Makefile
+++ b/source/bridges-ui/Makefile
@@ -36,19 +36,19 @@ endif
#
---------------------------------------------------------------------------------------------------------------------
BUILD_GTK2_FLAGS = $(BUILD_CXX_FLAGS) -DBRIDGE_GTK2 $(X11_FLAGS)
-LINK_GTK2_FLAGS = $(LINK_FLAGS) $(X11_LIBS) $(LIBDL_LIBS)
+LINK_GTK2_FLAGS = $(LINK_FLAGS) $(X11_LIBS) $(LIBDL_LIBS) $(FLAC_LIBS)
$(VORBIS_LIBS)
BUILD_GTK3_FLAGS = $(BUILD_CXX_FLAGS) -DBRIDGE_GTK3 $(X11_FLAGS)
-LINK_GTK3_FLAGS = $(LINK_FLAGS) $(X11_LIBS) $(LIBDL_LIBS)
+LINK_GTK3_FLAGS = $(LINK_FLAGS) $(X11_LIBS) $(LIBDL_LIBS) $(FLAC_LIBS)
$(VORBIS_LIBS)
BUILD_QT4_FLAGS = $(BUILD_CXX_FLAGS) -DBRIDGE_QT4 $(shell pkg-config
--cflags QtCore QtGui) $(X11_FLAGS) -I$(OBJDIR) -I$(CWD)/theme
-Wno-unused-variable
-LINK_QT4_FLAGS = $(LINK_FLAGS) $(shell pkg-config --libs QtCore QtGui)
$(X11_LIBS) $(LIBDL_LIBS)
+LINK_QT4_FLAGS = $(LINK_FLAGS) $(shell pkg-config --libs QtCore QtGui)
$(X11_LIBS) $(LIBDL_LIBS) $(FLAC_LIBS) $(VORBIS_LIBS)
BUILD_QT5_FLAGS = $(BUILD_CXX_FLAGS) -DBRIDGE_QT5 $(shell pkg-config
--cflags Qt5Core Qt5Gui Qt5Widgets) -I$(OBJDIR) -I$(CWD)/theme
-LINK_QT5_FLAGS = $(LINK_FLAGS) $(shell pkg-config --libs Qt5Core Qt5Gui
Qt5Widgets) $(LIBDL_LIBS)
+LINK_QT5_FLAGS = $(LINK_FLAGS) $(shell pkg-config --libs Qt5Core Qt5Gui
Qt5Widgets) $(LIBDL_LIBS) $(FLAC_LIBS) $(VORBIS_LIBS)
BUILD_X11_FLAGS = $(BUILD_CXX_FLAGS) -DBRIDGE_X11 $(X11_FLAGS)
-LINK_X11_FLAGS = $(LINK_FLAGS) $(X11_LIBS) $(LIBDL_LIBS)
+LINK_X11_FLAGS = $(LINK_FLAGS) $(X11_LIBS) $(LIBDL_LIBS) $(FLAC_LIBS)
$(VORBIS_LIBS)
BUILD_COCOA_FLAGS = $(BUILD_CXX_FLAGS) -DBRIDGE_COCOA -ObjC++
LINK_COCOA_FLAGS = $(LINK_FLAGS) -framework Cocoa $(LIBDL_LIBS)
diff --git a/source/plugin/Makefile b/source/plugin/Makefile
index 389dd77..47ce7bb 100644
--- a/source/plugin/Makefile
+++ b/source/plugin/Makefile
@@ -127,6 +127,9 @@ endif
LINK_FLAGS += $(YSFX_GRAPHICS_LIBS)
+LINK_FLAGS += $(FLAC_LIBS)
+LINK_FLAGS += $(VORBIS_LIBS)
+
ifeq ($(MACOS),true)
SYMBOLS_NATIVE = -Wl,-exported_symbol,_carla_get_native_rack_plugin
SYMBOLS_NATIVE += -Wl,-exported_symbol,_carla_get_native_patchbay_plugin
--
2.39.0
++++++ 0002-Remove-rpath-from-.pc-files.patch ++++++
>From 8bc42b9231b93f8ea4f0839bf945d4f014f769c1 Mon Sep 17 00:00:00 2001
From: "davejpla...@gmail.com" <davejpla...@gmail.com>
Date: Sat, 7 Jan 2023 13:33:45 +0100
Subject: [PATCH 2/3] Remove rpath from .pc files
---
data/pkgconfig/carla-host-plugin.pc | 2 +-
data/pkgconfig/carla-native-plugin.pc | 2 +-
data/pkgconfig/carla-standalone.pc | 2 +-
data/pkgconfig/carla-utils.pc | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/data/pkgconfig/carla-host-plugin.pc
b/data/pkgconfig/carla-host-plugin.pc
index 29b952a..fa148b6 100644
--- a/data/pkgconfig/carla-host-plugin.pc
+++ b/data/pkgconfig/carla-host-plugin.pc
@@ -6,5 +6,5 @@ carla_libdir=${libdir}/carla
Name: carla-host-plugin
Version: X-VERSION-X
Description: Carla Host as Native Plugin
-Libs: -Wl,-rpath,${carla_libdir} -L${carla_libdir} -lcarla_host-plugin
+Libs: -L${carla_libdir} -lcarla_host-plugin
Cflags: -DREAL_BUILD -I${includedir}/carla -I${includedir}/carla/includes
diff --git a/data/pkgconfig/carla-native-plugin.pc
b/data/pkgconfig/carla-native-plugin.pc
index ade9950..5400014 100644
--- a/data/pkgconfig/carla-native-plugin.pc
+++ b/data/pkgconfig/carla-native-plugin.pc
@@ -5,5 +5,5 @@ includedir=X-INCLUDEDIR-X
Name: carla-native-plugin
Version: X-VERSION-X
Description: Carla Native Plugin
-Libs: -Wl,-rpath,${libdir}/carla -L${libdir}/carla -lcarla_native-plugin
+Libs: -L${libdir}/carla -lcarla_native-plugin
Cflags: -DREAL_BUILD -I${includedir}/carla -I${includedir}/carla/includes
diff --git a/data/pkgconfig/carla-standalone.pc
b/data/pkgconfig/carla-standalone.pc
index 0e1113a..7daa047 100644
--- a/data/pkgconfig/carla-standalone.pc
+++ b/data/pkgconfig/carla-standalone.pc
@@ -5,5 +5,5 @@ includedir=X-INCLUDEDIR-X
Name: carla-standalone
Version: X-VERSION-X
Description: Carla Host Standalone
-Libs: -Wl,-rpath,${libdir}/carla -L${libdir}/carla -lcarla_standalone2
+Libs: -L${libdir}/carla -lcarla_standalone2
Cflags: -DREAL_BUILD -I${includedir}/carla -I${includedir}/carla/includes
diff --git a/data/pkgconfig/carla-utils.pc b/data/pkgconfig/carla-utils.pc
index 1115fbe..6a8b5f2 100644
--- a/data/pkgconfig/carla-utils.pc
+++ b/data/pkgconfig/carla-utils.pc
@@ -5,5 +5,5 @@ includedir=X-INCLUDEDIR-X
Name: carla-utils
Version: X-VERSION-X
Description: Carla Host Utilities
-Libs: -Wl,-rpath,${libdir}/carla -L${libdir}/carla -lcarla_utils
+Libs: -L${libdir}/carla -lcarla_utils
Cflags: -DREAL_BUILD -I${includedir}/carla -I${includedir}/carla/includes
-I${includedir}/carla/utils
--
2.39.0
++++++ 0003-Use-correct-plugin-paths-for-openSUSE.patch ++++++
>From 8de9be56dd35bd33e8a81adfbea082f4b210a8f4 Mon Sep 17 00:00:00 2001
From: "sfl...@suse.de" <sfl...@suse.de>
Date: Sat, 7 Jan 2023 13:34:29 +0100
Subject: [PATCH 3/3] Use correct plugin paths for openSUSE
---
source/frontend/carla_shared.py | 12 ++++++------
source/frontend/carla_widgets.py | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/source/frontend/carla_shared.py b/source/frontend/carla_shared.py
index bad8e2d..bc8a483 100644
--- a/source/frontend/carla_shared.py
+++ b/source/frontend/carla_shared.py
@@ -459,27 +459,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"
diff --git a/source/frontend/carla_widgets.py b/source/frontend/carla_widgets.py
index fbb058b..a0c734c 100755
--- a/source/frontend/carla_widgets.py
+++ b/source/frontend/carla_widgets.py
@@ -1871,7 +1871,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)
--
2.39.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.o2LWPb/_old 2023-01-09 17:24:26.507375480 +0100
+++ /var/tmp/diff_new_pack.o2LWPb/_new 2023-01-09 17:24:26.511375503 +0100
@@ -6,7 +6,7 @@
<param name="exclude">.git</param>
<param name="exclude">data/windows</param>
<param name="exclude">source/native-plugins/external/*</param>
- <param name="revision">v2.5.1</param>
+ <param name="revision">v2.5.2</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>
<param name="changesgenerate">enable</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.o2LWPb/_old 2023-01-09 17:24:26.531375616 +0100
+++ /var/tmp/diff_new_pack.o2LWPb/_new 2023-01-09 17:24:26.535375639 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/falkTX/Carla.git</param>
- <param
name="changesrevision">7d23ab72be1f5fc541e919ad98c63f5ee2c9b94c</param></service></servicedata>
+ <param
name="changesrevision">12d4d77b3c01ea70254dc74b7885e9f26d6a9b7f</param></service></servicedata>
(No newline at EOF)
++++++ carla-2.5.1.tar.xz -> carla-2.5.2.tar.xz ++++++
/work/SRC/openSUSE:Factory/carla/carla-2.5.1.tar.xz
/work/SRC/openSUSE:Factory/.carla.new.32243/carla-2.5.2.tar.xz differ: char 15,
line 1
