From d6f1767587810dbbc91fbdaff2f4e565f12d8179 Mon Sep 17 00:00:00 2001 From: Roger Freitas Pereira Date: Thu, 24 Jul 2025 21:38:57 -0300 Subject: [PATCH] Carla: revbump for python3-pyliblo3 --- srcpkgs/Carla/patches/pyliblo3.patch | 61 ++++++++++++++++++++++++++++ srcpkgs/Carla/template | 7 +++- 2 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/Carla/patches/pyliblo3.patch diff --git a/srcpkgs/Carla/patches/pyliblo3.patch b/srcpkgs/Carla/patches/pyliblo3.patch new file mode 100644 index 00000000000..f738f5664b6 --- /dev/null +++ b/srcpkgs/Carla/patches/pyliblo3.patch @@ -0,0 +1,61 @@ +From 83f0bc98c17e95f761061c2f8445e02fadf6c604 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +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 +--- + 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 diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template index d3079227e44..cc3d0774300 100755 --- a/srcpkgs/Carla/template +++ b/srcpkgs/Carla/template @@ -1,7 +1,7 @@ # Template file for 'Carla' pkgname=Carla version=2.5.9 -revision=1 +revision=2 archs="x86_64* i686* aarch64* arm*" build_style=gnu-makefile 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 gtk+-devel qt5-devel fluidsynth-devel fftw-devel zlib-devel 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" maintainer="Rutpiv " license="GPL-2.0-or-later" @@ -25,6 +25,9 @@ desc_option_linux32="Enable building linux32 bridge" subpackages="Carla-devel" +CFLAGS="-D_LARGEFILE64_SOURCE" +CXXFLAGS="-D_LARGEFILE64_SOURCE" + if [ -z "$CROSS_BUILD" ]; then case "$XBPS_TARGET_MACHINE" in x86_64)