wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-09-06 20:12:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Carla: revbump for python3-pyliblo3

Browse source
This commit is contained in:
Roger Freitas Pereira 2025-07-24 21:38:57 -03:00 • committed by Andrew J. Hesford
parent 5a0459fe1c
commit d6f1767587
2 changed files with 66 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
srcpkgs/Carla/patches/pyliblo3.patch Normal file
View file

@ -0,0 +1,61 @@
From 83f0bc98c17e95f761061c2f8445e02fadf6c604 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Fri, 27 Sep 2024 11:59:47 -0700
Subject: [PATCH] carla_host_control: import from pyliblo3 if available
pyliblo has not been touched upstream since 2015 and doesn't
work out of the box with Python releases since 3.11. There is an
actively-maintained fork called 'pyliblo3' at
https://github.com/gesellkammer/pyliblo3 which *does* work with
current upstream Python releases. It provides a library called
'pyliblo3' rather than 'liblo'. Let's support it, and prefer it
over the dead library (though the dead one will still be used if
it is present and pyliblo3 is not).
Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
source/frontend/carla_host_control.py | 32 ++++++++++++++++++---------
1 file changed, 22 insertions(+), 10 deletions(-)
diff --git a/source/frontend/carla_host_control.py b/source/frontend/carla_host_control.py
index 7defa84351..8df839d3aa 100755
--- a/source/frontend/carla_host_control.py
+++ b/source/frontend/carla_host_control.py
@@ -23,16 +23,28 @@
# ------------------------------------------------------------------------------------------------------------
# Imports (liblo)
-from liblo import (
- Address,
- AddressError,
- ServerError,
- Server,
- make_method,
- send as lo_send,
- TCP as LO_TCP,
- UDP as LO_UDP,
-)
+try:
+ from pyliblo3 import (
+ Address,
+ AddressError,
+ ServerError,
+ Server,
+ make_method,
+ send as lo_send,
+ TCP as LO_TCP,
+ UDP as LO_UDP,
+ )
+except ModuleNotFoundError:
+ from liblo import (
+ Address,
+ AddressError,
+ ServerError,
+ Server,
+ make_method,
+ send as lo_send,
+ TCP as LO_TCP,
+ UDP as LO_UDP,
+ )
from random import random

7
srcpkgs/Carla/template
View file

@ -1,7 +1,7 @@
# Template file for 'Carla' # Template file for 'Carla'
pkgname=Carla pkgname=Carla
version=2.5.9 version=2.5.9
revision=1 revision=2
archs="x86_64* i686* aarch64* arm*" archs="x86_64* i686* aarch64* arm*"
build_style=gnu-makefile build_style=gnu-makefile
pycompile_dirs="usr/share/carla" pycompile_dirs="usr/share/carla"
@ -10,7 +10,7 @@ makedepends="python3-PyQt5 libmagic file-devel libsndfile-devel
liblo-devel alsa-lib-devel pulseaudio-devel libX11-devel gtk+3-devel liblo-devel alsa-lib-devel pulseaudio-devel libX11-devel gtk+3-devel
gtk+-devel qt5-devel fluidsynth-devel fftw-devel zlib-devel gtk+-devel qt5-devel fluidsynth-devel fftw-devel zlib-devel
python3-rdflib" python3-rdflib"
depends="python3 python3-PyQt5 python3-PyQt5-svg pyliblo which" depends="python3 python3-PyQt5 python3-PyQt5-svg python3-pyliblo3 which"
short_desc="Audio plugin host" short_desc="Audio plugin host"
maintainer="Rutpiv <roger_freitas@live.com>" maintainer="Rutpiv <roger_freitas@live.com>"
license="GPL-2.0-or-later" license="GPL-2.0-or-later"
@ -25,6 +25,9 @@ desc_option_linux32="Enable building linux32 bridge"
subpackages="Carla-devel" subpackages="Carla-devel"
CFLAGS="-D_LARGEFILE64_SOURCE"
CXXFLAGS="-D_LARGEFILE64_SOURCE"
if [ -z "$CROSS_BUILD" ]; then if [ -z "$CROSS_BUILD" ]; then
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
x86_64) x86_64)