D8660.id20841.diff
No OneTemporary
Actions

Size

18 KB

Referenced Files

None

Subscribers

None

D8660.id20841.diff
View Options

	diff --git a/abi_used_libs b/abi_used_libs
	--- a/abi_used_libs
	+++ b/abi_used_libs
	@@ -5,9 +5,6 @@
	libQt5Widgets.so.5
	libX11.so.6
	libasound.so.2
	-libavcodec.so.58
	-libavformat.so.58
	-libavutil.so.56
	libc.so.6
	libdl.so.2
	libfftw3.so.3
	diff --git a/files/fix-compile-with-qt5.13-and-gcc9.patch b/files/fix-compile-with-qt5.13-and-gcc9.patch
	deleted file mode 100644
	--- a/files/fix-compile-with-qt5.13-and-gcc9.patch
	+++ /dev/null
	@@ -1,119 +0,0 @@
	-From db6dadd6de2041adf34905d77839cce05273924c Mon Sep 17 00:00:00 2001
	-From: falkTX <falktx@falktx.com>
	-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 <falktx@falktx.com>
	-
	-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 d0632b86f..77c9f6084 100644
	---- a/source/bridges-ui/CarlaBridgeToolkitQt.cpp
	-+++ b/source/bridges-ui/CarlaBridgeToolkitQt.cpp
	-@@ -256,12 +256,6 @@ class CarlaBridgeToolkitQt: public QObject,
	- #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 3c427e026..42baaaf23 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 6895333ef..803e40b7b 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);
	- }
	diff --git a/package.yml b/package.yml
	--- a/package.yml
	+++ b/package.yml
	@@ -1,8 +1,8 @@
	name : carla
	-version : 2.0.0
	-release : 5
	+version : 2.1.0
	+release : 6
	source :
	- - git\|https://github.com/falkTX/Carla.git : v2.0.0
	+ - git\|https://github.com/falkTX/Carla.git : v2.1
	license : GPL-2.0-or-later
	component : multimedia.audio
	summary : Fully-featured audio plugin host
	@@ -30,7 +30,6 @@
	- python-pyliblo
	- python3-qt5
	build : \|
	- %patch -p1 < $pkgfiles/fix-compile-with-qt5.13-and-gcc9.patch
	%make features
	%make
	install : \|
	diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
	--- a/pspec_x86_64.xml
	+++ b/pspec_x86_64.xml
	@@ -2,8 +2,8 @@
	<Source>
	<Name>carla</Name>
	<Packager>
	- <Name>Joshua Strobl</Name>
	- <Email>joshua@stroblindustries.com</Email>
	+ <Name>Jacob Alzén</Name>
	+ <Email>jacob.alzen@gmail.com</Email>
	</Packager>
	<License>GPL-2.0-or-later</License>
	<PartOf>multimedia.audio</PartOf>
	@@ -30,6 +30,7 @@
	<Path fileType="executable">/usr/bin/carla-single</Path>
	<Path fileType="library">/usr/lib/carla/carla-bridge-lv2-gtk2</Path>
	<Path fileType="library">/usr/lib/carla/carla-bridge-lv2-gtk3</Path>
	+ <Path fileType="library">/usr/lib/carla/carla-bridge-lv2-modgui</Path>
	<Path fileType="library">/usr/lib/carla/carla-bridge-lv2-qt5</Path>
	<Path fileType="library">/usr/lib/carla/carla-bridge-lv2-x11</Path>
	<Path fileType="library">/usr/lib/carla/carla-bridge-lv2.so</Path>
	@@ -44,9 +45,13 @@
	<Path fileType="library">/usr/lib/carla/libcarla_utils.so</Path>
	<Path fileType="library">/usr/lib/carla/styles/carlastyle.json</Path>
	<Path fileType="library">/usr/lib/carla/styles/carlastyle.so</Path>
	+ <Path fileType="library">/usr/lib/lv2/carla.lv2/audiofile.ttl</Path>
	+ <Path fileType="library">/usr/lib/lv2/carla.lv2/audiogain.ttl</Path>
	+ <Path fileType="library">/usr/lib/lv2/carla.lv2/audiogain_s.ttl</Path>
	<Path fileType="library">/usr/lib/lv2/carla.lv2/bigmeter.ttl</Path>
	<Path fileType="library">/usr/lib/lv2/carla.lv2/carla-bridge-lv2-gtk2</Path>
	<Path fileType="library">/usr/lib/lv2/carla.lv2/carla-bridge-lv2-gtk3</Path>
	+ <Path fileType="library">/usr/lib/lv2/carla.lv2/carla-bridge-lv2-modgui</Path>
	<Path fileType="library">/usr/lib/lv2/carla.lv2/carla-bridge-lv2-qt5</Path>
	<Path fileType="library">/usr/lib/lv2/carla.lv2/carla-bridge-lv2-x11</Path>
	<Path fileType="library">/usr/lib/lv2/carla.lv2/carla-bridge-lv2.so</Path>
	@@ -57,6 +62,8 @@
	<Path fileType="library">/usr/lib/lv2/carla.lv2/carlapatchbay16.ttl</Path>
	<Path fileType="library">/usr/lib/lv2/carla.lv2/carlapatchbay32.ttl</Path>
	<Path fileType="library">/usr/lib/lv2/carla.lv2/carlapatchbay3s.ttl</Path>
	+ <Path fileType="library">/usr/lib/lv2/carla.lv2/carlapatchbay64.ttl</Path>
	+ <Path fileType="library">/usr/lib/lv2/carla.lv2/carlapatchbaycv.ttl</Path>
	<Path fileType="library">/usr/lib/lv2/carla.lv2/carlarack.ttl</Path>
	<Path fileType="library">/usr/lib/lv2/carla.lv2/jack</Path>
	<Path fileType="library">/usr/lib/lv2/carla.lv2/lfo.ttl</Path>
	@@ -68,22 +75,25 @@
	<Path fileType="library">/usr/lib/lv2/carla.lv2/manifest.ttl</Path>
	<Path fileType="library">/usr/lib/lv2/carla.lv2/midichanab.ttl</Path>
	<Path fileType="library">/usr/lib/lv2/carla.lv2/midichanfilter.ttl</Path>
	+ <Path fileType="library">/usr/lib/lv2/carla.lv2/midichannelize.ttl</Path>
	+ <Path fileType="library">/usr/lib/lv2/carla.lv2/midifile.ttl</Path>
	<Path fileType="library">/usr/lib/lv2/carla.lv2/midigain.ttl</Path>
	<Path fileType="library">/usr/lib/lv2/carla.lv2/midijoin.ttl</Path>
	<Path fileType="library">/usr/lib/lv2/carla.lv2/midipattern.ttl</Path>
	<Path fileType="library">/usr/lib/lv2/carla.lv2/midisplit.ttl</Path>
	- <Path fileType="library">/usr/lib/lv2/carla.lv2/midithrough.ttl</Path>
	<Path fileType="library">/usr/lib/lv2/carla.lv2/miditranspose.ttl</Path>
	<Path fileType="library">/usr/lib/lv2/carla.lv2/resources</Path>
	<Path fileType="library">/usr/lib/lv2/carla.lv2/styles</Path>
	<Path fileType="library">/usr/lib/vst/carla.vst/CarlaPatchbay.so</Path>
	<Path fileType="library">/usr/lib/vst/carla.vst/CarlaPatchbay16.so</Path>
	<Path fileType="library">/usr/lib/vst/carla.vst/CarlaPatchbay32.so</Path>
	+ <Path fileType="library">/usr/lib/vst/carla.vst/CarlaPatchbay64.so</Path>
	<Path fileType="library">/usr/lib/vst/carla.vst/CarlaPatchbayFX.so</Path>
	<Path fileType="library">/usr/lib/vst/carla.vst/CarlaRack.so</Path>
	<Path fileType="library">/usr/lib/vst/carla.vst/CarlaRackFX.so</Path>
	<Path fileType="library">/usr/lib/vst/carla.vst/carla-bridge-lv2-gtk2</Path>
	<Path fileType="library">/usr/lib/vst/carla.vst/carla-bridge-lv2-gtk3</Path>
	+ <Path fileType="library">/usr/lib/vst/carla.vst/carla-bridge-lv2-modgui</Path>
	<Path fileType="library">/usr/lib/vst/carla.vst/carla-bridge-lv2-qt5</Path>
	<Path fileType="library">/usr/lib/vst/carla.vst/carla-bridge-lv2-x11</Path>
	<Path fileType="library">/usr/lib/vst/carla.vst/carla-bridge-lv2.so</Path>
	@@ -109,10 +119,10 @@
	<Path fileType="data">/usr/share/carla/carla_backend.py</Path>
	<Path fileType="data">/usr/share/carla/carla_backend_qt.py</Path>
	<Path fileType="data">/usr/share/carla/carla_backend_qtweb.py</Path>
	- <Path fileType="data">/usr/share/carla/carla_config.py</Path>
	<Path fileType="data">/usr/share/carla/carla_control.py</Path>
	<Path fileType="data">/usr/share/carla/carla_database.py</Path>
	<Path fileType="data">/usr/share/carla/carla_host.py</Path>
	+ <Path fileType="data">/usr/share/carla/carla_modgui.py</Path>
	<Path fileType="data">/usr/share/carla/carla_settings.py</Path>
	<Path fileType="data">/usr/share/carla/carla_shared.py</Path>
	<Path fileType="data">/usr/share/carla/carla_skin.py</Path>
	@@ -120,15 +130,30 @@
	<Path fileType="data">/usr/share/carla/carla_widgets.py</Path>
	<Path fileType="data">/usr/share/carla/externalui.py</Path>
	<Path fileType="data">/usr/share/carla/ladspa_rdf.py</Path>
	- <Path fileType="data">/usr/share/carla/patchcanvas.py</Path>
	- <Path fileType="data">/usr/share/carla/patchcanvas_theme.py</Path>
	+ <Path fileType="data">/usr/share/carla/modgui/__init__.py</Path>
	+ <Path fileType="data">/usr/share/carla/modgui/host.py</Path>
	+ <Path fileType="data">/usr/share/carla/modgui/webserver.py</Path>
	+ <Path fileType="data">/usr/share/carla/patchcanvas/__init__.py</Path>
	+ <Path fileType="data">/usr/share/carla/patchcanvas/canvasbezierline.py</Path>
	+ <Path fileType="data">/usr/share/carla/patchcanvas/canvasbezierlinemov.py</Path>
	+ <Path fileType="data">/usr/share/carla/patchcanvas/canvasbox.py</Path>
	+ <Path fileType="data">/usr/share/carla/patchcanvas/canvasboxshadow.py</Path>
	+ <Path fileType="data">/usr/share/carla/patchcanvas/canvasfadeanimation.py</Path>
	+ <Path fileType="data">/usr/share/carla/patchcanvas/canvasicon.py</Path>
	+ <Path fileType="data">/usr/share/carla/patchcanvas/canvasline.py</Path>
	+ <Path fileType="data">/usr/share/carla/patchcanvas/canvaslinemov.py</Path>
	+ <Path fileType="data">/usr/share/carla/patchcanvas/canvasport.py</Path>
	+ <Path fileType="data">/usr/share/carla/patchcanvas/canvasportglow.py</Path>
	+ <Path fileType="data">/usr/share/carla/patchcanvas/patchcanvas.py</Path>
	+ <Path fileType="data">/usr/share/carla/patchcanvas/scene.py</Path>
	+ <Path fileType="data">/usr/share/carla/patchcanvas/theme.py</Path>
	+ <Path fileType="data">/usr/share/carla/patchcanvas/utils.py</Path>
	<Path fileType="data">/usr/share/carla/resources/bigmeter-ui</Path>
	<Path fileType="data">/usr/share/carla/resources/carla-plugin</Path>
	<Path fileType="data">/usr/share/carla/resources/carla-plugin-patchbay</Path>
	<Path fileType="data">/usr/share/carla/resources/carla_app.py</Path>
	<Path fileType="data">/usr/share/carla/resources/carla_backend.py</Path>
	<Path fileType="data">/usr/share/carla/resources/carla_backend_qt.py</Path>
	- <Path fileType="data">/usr/share/carla/resources/carla_config.py</Path>
	<Path fileType="data">/usr/share/carla/resources/carla_control.py</Path>
	<Path fileType="data">/usr/share/carla/resources/carla_database.py</Path>
	<Path fileType="data">/usr/share/carla/resources/carla_host.py</Path>
	@@ -139,11 +164,12 @@
	<Path fileType="data">/usr/share/carla/resources/carla_widgets.py</Path>
	<Path fileType="data">/usr/share/carla/resources/externalui.py</Path>
	<Path fileType="data">/usr/share/carla/resources/midipattern-ui</Path>
	+ <Path fileType="data">/usr/share/carla/resources/modgui</Path>
	<Path fileType="data">/usr/share/carla/resources/notes-ui</Path>
	- <Path fileType="data">/usr/share/carla/resources/patchcanvas.py</Path>
	- <Path fileType="data">/usr/share/carla/resources/patchcanvas_theme.py</Path>
	+ <Path fileType="data">/usr/share/carla/resources/patchcanvas</Path>
	<Path fileType="data">/usr/share/carla/resources/resources_rc.py</Path>
	<Path fileType="data">/usr/share/carla/resources/ui_carla_about.py</Path>
	+ <Path fileType="data">/usr/share/carla/resources/ui_carla_about_juce.py</Path>
	<Path fileType="data">/usr/share/carla/resources/ui_carla_add_jack.py</Path>
	<Path fileType="data">/usr/share/carla/resources/ui_carla_database.py</Path>
	<Path fileType="data">/usr/share/carla/resources/ui_carla_edit.py</Path>
	@@ -170,10 +196,12 @@
	<Path fileType="data">/usr/share/carla/resources/zynaddsubfx/window_backdrop.png</Path>
	<Path fileType="data">/usr/share/carla/resources_rc.py</Path>
	<Path fileType="data">/usr/share/carla/ui_carla_about.py</Path>
	+ <Path fileType="data">/usr/share/carla/ui_carla_about_juce.py</Path>
	<Path fileType="data">/usr/share/carla/ui_carla_add_jack.py</Path>
	<Path fileType="data">/usr/share/carla/ui_carla_database.py</Path>
	<Path fileType="data">/usr/share/carla/ui_carla_edit.py</Path>
	<Path fileType="data">/usr/share/carla/ui_carla_host.py</Path>
	+ <Path fileType="data">/usr/share/carla/ui_carla_osc_connect.py</Path>
	<Path fileType="data">/usr/share/carla/ui_carla_parameter.py</Path>
	<Path fileType="data">/usr/share/carla/ui_carla_plugin_calf.py</Path>
	<Path fileType="data">/usr/share/carla/ui_carla_plugin_classic.py</Path>
	@@ -187,6 +215,7 @@
	<Path fileType="data">/usr/share/carla/ui_midipattern.py</Path>
	<Path fileType="data">/usr/share/carla/widgets/__init__.py</Path>
	<Path fileType="data">/usr/share/carla/widgets/canvaspreviewframe.py</Path>
	+ <Path fileType="data">/usr/share/carla/widgets/collapsablewidget.py</Path>
	<Path fileType="data">/usr/share/carla/widgets/digitalpeakmeter.py</Path>
	<Path fileType="data">/usr/share/carla/widgets/draggablegraphicsview.py</Path>
	<Path fileType="data">/usr/share/carla/widgets/ledbutton.py</Path>
	@@ -216,7 +245,7 @@
	</Description>
	<PartOf>programming.devel</PartOf>
	<RuntimeDependencies>
	- <Dependency release="5">carla</Dependency>
	+ <Dependency release="6">carla</Dependency>
	</RuntimeDependencies>
	<Files>
	<Path fileType="header">/usr/include/carla/CarlaBackend.h</Path>
	@@ -235,12 +264,12 @@
	</Files>
	</Package>
	<History>
	- <Update release="5">
	- <Date>2020-02-10</Date>
	- <Version>2.0.0</Version>
	+ <Update release="6">
	+ <Date>2020-04-13</Date>
	+ <Version>2.1.0</Version>
	<Comment>Packaging update</Comment>
	- <Name>Joshua Strobl</Name>
	- <Email>joshua@stroblindustries.com</Email>
	+ <Name>Jacob Alzén</Name>
	+ <Email>jacob.alzen@gmail.com</Email>
	</Update>
	</History>
	</PISI>
	\ No newline at end of file

File Metadata

Mime Type: text/plain
Expires: Jun 26 2023, 9:37 PM (6 w, 3 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 5799162
Default Alt Text: D8660.id20841.diff (18 KB)

D8660.id20841.diffNo OneTemporaryActions

D8660.id20841.diffView Options

File Metadata

Event Timeline

D8660.id20841.diff
No OneTemporary
Actions

D8660.id20841.diff
View Options