flewkey/flewkey-overlay
1
0
Fork 0
Code Releases Activity

media-sound/carla: add 2.5.9, drop 2.5.8

Browse Source 
I've fixed the invalid PyQt5 dependency too.
This commit is contained in:
Ryan Fox
2025-02-12 10:38:38 -08:00
parent eaf55664fb
commit e2158d0909
4 changed files with 7 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media-sound/carla/Manifest
View File

@@ -1 +1 @@
DIST carla-2.5.8.tar.gz 11542514 BLAKE2B 26adbf24abecab04810b82d550b7f598747c80a29c0a9d66e9799cee94aba2c384852e2aa31dee0ef949697c089c379575f9c1919646a8513313429d6c391c50 SHA512 0f87ebe053d29a4a455532cc90e66ca7978f0f3678d0814bd5fb3343e852e2a28d0f5e170e67a71bf64fec1c9bd696dd7aa01627b02edd23cfe4994dc357b857
DIST carla-2.5.9.tar.gz 11546337 BLAKE2B 1cfcb9326677db069880c9a574903707c226925962e75d85b3fc66a21d6f449d161110fc6410e130de1f12ee3089a498af6c1852b57b386a702a2281dcfcb7c5 SHA512 b82c9633b993fa886a435b60fe74f7a5d8d0d97265bd147a86cab96957c429cceaec078215b36e6ebd3dea69126f1edb267f318239a44a07ee52b8eb3bac8ce3

8
media-sound/carla/carla-2.5.8.ebuild → media-sound/carla/carla-2.5.9.ebuild
View File

@@ -1,9 +1,9 @@
# Copyright 1999-2024 Gentoo Authors
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{8..12} )
PYTHON_COMPAT=( python3_{12..13} )
inherit python-single-r1 xdg
if [[ ${PV} == 9999 ]]; then
@@ -27,7 +27,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="
${PYTHON_DEPS}
$(python_gen_cond_dep 'dev-python/PyQt5[gui,opengl?,svg,widgets,${PYTHON_USEDEP}]')
$(python_gen_cond_dep 'dev-python/pyqt5[gui,opengl?,svg,widgets,${PYTHON_USEDEP}]')
virtual/jack
alsa? ( media-libs/alsa-lib )
gtk? ( x11-libs/gtk+:3 )
@@ -40,8 +40,6 @@ DEPEND="
RDEPEND="${DEPEND}"
BDEPEND="${DEPEND}"
PATCHES=( "${FILESDIR}/${P}-fixliblo.patch" )
src_prepare() {
sed -i -e "s|exec \$PYTHON|exec ${PYTHON}|" \
data/carla \

6
media-sound/carla/carla-9999.ebuild
View File

@@ -1,9 +1,9 @@
# Copyright 1999-2024 Gentoo Authors
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{8..12} )
PYTHON_COMPAT=( python3_{12..13} )
inherit python-single-r1 xdg
if [[ ${PV} == 9999 ]]; then
@@ -27,7 +27,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="
${PYTHON_DEPS}
$(python_gen_cond_dep 'dev-python/PyQt5[gui,opengl?,svg,widgets,${PYTHON_USEDEP}]')
$(python_gen_cond_dep 'dev-python/pyqt5[gui,opengl?,svg,widgets,${PYTHON_USEDEP}]')
virtual/jack
alsa? ( media-libs/alsa-lib )
gtk? ( x11-libs/gtk+:3 )

71
media-sound/carla/files/carla-2.5.8-fixliblo.patch
View File

@@ -1,71 +0,0 @@
From 1950c68edf5138f36b7abaf47548c5ace7c71644 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Thu, 7 Mar 2024 10:10:56 +0100
Subject: [PATCH] Adjust for liblo API breakage, dont define lo_message type
Signed-off-by: falkTX <falktx@falktx.com>
---
source/backend/CarlaPlugin.hpp | 3 +--
source/backend/plugin/CarlaPlugin.cpp | 2 +-
source/backend/plugin/CarlaPluginLADSPADSSI.cpp | 6 +++---
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/source/backend/CarlaPlugin.hpp b/source/backend/CarlaPlugin.hpp
index fe581bcfe0..04026e0809 100644
--- a/source/backend/CarlaPlugin.hpp
+++ b/source/backend/CarlaPlugin.hpp
@@ -24,7 +24,6 @@
// -----------------------------------------------------------------------
// Avoid including extra libs here
-typedef void* lo_message;
typedef struct _NativePluginDescriptor NativePluginDescriptor;
struct LADSPA_RDF_Descriptor;
@@ -774,7 +773,7 @@ class CARLA_API CarlaPlugin
int argc,
const void* argv,
const char* types,
- lo_message msg);
+ void* msg);
// -------------------------------------------------------------------
// MIDI events
diff --git a/source/backend/plugin/CarlaPlugin.cpp b/source/backend/plugin/CarlaPlugin.cpp
index 58eae89635..fcc2f3ecc7 100644
--- a/source/backend/plugin/CarlaPlugin.cpp
+++ b/source/backend/plugin/CarlaPlugin.cpp
@@ -2350,7 +2350,7 @@ void CarlaPlugin::clearBuffers() noexcept
// OSC stuff
// FIXME
-void CarlaPlugin::handleOscMessage(const char* const, const int, const void* const, const char* const, const lo_message)
+void CarlaPlugin::handleOscMessage(const char*, int, const void*, const char*, void*)
{
// do nothing
}
diff --git a/source/backend/plugin/CarlaPluginLADSPADSSI.cpp b/source/backend/plugin/CarlaPluginLADSPADSSI.cpp
index b24224fec3..bcc04ad57d 100644
--- a/source/backend/plugin/CarlaPluginLADSPADSSI.cpp
+++ b/source/backend/plugin/CarlaPluginLADSPADSSI.cpp
@@ -2395,9 +2395,9 @@ class CarlaPluginLADSPADSSI : public CarlaPlugin
// -------------------------------------------------------------------
// OSC stuff
- void handleOscMessage(const char* const method, const int argc, const void* const argvx, const char* const types, const lo_message msg) override
+ void handleOscMessage(const char* const method, const int argc, const void* const argvx, const char* const types, void* const msg) override
{
- const lo_address source(lo_message_get_source(msg));
+ const lo_address source = lo_message_get_source(static_cast<lo_message>(msg));
CARLA_SAFE_ASSERT_RETURN(source != nullptr,);
// protocol for DSSI UIs *must* be UDP
@@ -2432,7 +2432,7 @@ class CarlaPluginLADSPADSSI : public CarlaPlugin
if (std::strcmp(method, "midi") == 0)
return handleOscMessageMIDI(argc, argv, types);
if (std::strcmp(method, "update") == 0)
- return handleOscMessageUpdate(argc, argv, types, lo_message_get_source(msg));
+ return handleOscMessageUpdate(argc, argv, types, source);
if (std::strcmp(method, "exiting") == 0)
return handleOscMessageExiting();