1
0

media-sound/carla: add 2.5.8

This commit is contained in:
Ryan Fox 2024-03-28 00:18:00 -07:00
parent 0258fce237
commit 702fdad936
Signed by: flewkey
GPG Key ID: 94F56ADFD848851E
3 changed files with 168 additions and 0 deletions

View File

@ -1,2 +1,3 @@
DIST carla-2.5.6.tar.gz 11527564 BLAKE2B 29016bb6fbad400bc1c2e67a5a40db769ab72c18109de43b18622724633318ecc073237a4fc773f2a32dd15392615cb4402325b8310fd975ef40819915645201 SHA512 ed4faf79aa079022c394da6deb7d9dcdcf2738e110dc1591c4441e8c19a474987d5db5df40d5d9f2afb91738d0b35a4dea826de7402272fe69e87c443c6bff4b
DIST carla-2.5.7.tar.gz 11542751 BLAKE2B b7ed18f0743caeb3a95d43756ce640ac3bad510979387f720f2bf819143587fc608d0a7e612554e7ef7dd3cccd3353eaa22964dba5cb8f9d3dc5b0310502f9ce SHA512 c634ade64ff8ab66b0c06b17e33ea6fc758837e19156abbfe214d81fc084d96278bc49cb2941ab7328ed4452bb539cde5afa7f16352b18349ffddd1b53a65f3d
DIST carla-2.5.8.tar.gz 11542514 BLAKE2B 26adbf24abecab04810b82d550b7f598747c80a29c0a9d66e9799cee94aba2c384852e2aa31dee0ef949697c089c379575f9c1919646a8513313429d6c391c50 SHA512 0f87ebe053d29a4a455532cc90e66ca7978f0f3678d0814bd5fb3343e852e2a28d0f5e170e67a71bf64fec1c9bd696dd7aa01627b02edd23cfe4994dc357b857

View File

@ -0,0 +1,96 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{8..12} )
inherit python-single-r1 xdg
if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/falkTX/Carla.git"
EGIT_SUBMODULES=() # Prevent Carla-Plugins from installing
else
SRC_URI="https://github.com/falkTX/Carla/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
MY_PN="Carla"
MY_P="${MY_PN}-${PV}"
S="${WORKDIR}/${MY_P}"
fi
DESCRIPTION="Fully-featured audio plugin host, supports many audio drivers and plugin formats"
HOMEPAGE="https://kx.studio/Applications:Carla"
LICENSE="GPL-2 LGPL-3"
SLOT="0"
IUSE="alsa gtk gtk2 opengl osc pulseaudio rdf sf2 sndfile X"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="
${PYTHON_DEPS}
$(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 )
gtk2? ( x11-libs/gtk+:2 )
osc? (
media-libs/liblo
media-libs/pyliblo
)
pulseaudio? ( media-libs/libpulse )
rdf? ( dev-python/rdflib )
sf2? ( media-sound/fluidsynth )
sndfile? ( media-libs/libsndfile )
X? ( x11-libs/libX11 )
"
RDEPEND="${DEPEND}"
BDEPEND="${DEPEND}"
PATCHES=( "${FILESDIR}/${P}-fixliblo.patch" )
src_prepare() {
sed -i -e "s|exec \$PYTHON|exec ${PYTHON}|" \
data/carla \
data/carla-control \
data/carla-database \
data/carla-jack-multi \
data/carla-jack-single \
data/carla-patchbay \
data/carla-rack \
data/carla-settings || die "sed failed"
sed -i "s;/share/appdata;/share/metainfo;g" "${S}/Makefile" || die "sed failed"
default
}
src_compile() {
myemakeargs=(
LIBDIR="/usr/$(get_libdir)"
SKIP_STRIPPING=true
HAVE_FFMPEG=false
HAVE_ZYN_DEPS=false
HAVE_ZYN_UI_DEPS=false
HAVE_QT4=false
HAVE_QT5=true
HAVE_PYQT5=true
DEFAULT_QT=5
HAVE_ALSA=$(usex alsa true false)
HAVE_FLUIDSYNTH=$(usex sf2 true false)
HAVE_GTK2=$(usex gtk2 true false)
HAVE_GTK3=$(usex gtk true false)
HAVE_LIBLO=$(usex osc true false)
HAVE_PULSEAUDIO=$(usex pulseaudio true false)
HAVE_SNDFILE=$(usex sndfile true false)
HAVE_X11=$(usex X true false)
)
# Print which options are enabled/disabled
make features PREFIX="/usr" "${myemakeargs[@]}"
emake PREFIX="/usr" "${myemakeargs[@]}"
}
src_install() {
emake DESTDIR="${D}" PREFIX="/usr" "${myemakeargs[@]}" install
if ! use osc; then
find "${D}/usr" -iname "carla-control*" | xargs rm
fi
}

View File

@ -0,0 +1,71 @@
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();