diff --git a/srcpkgs/Carla/patches/pyliblo3.patch b/srcpkgs/Carla/patches/pyliblo3.patch deleted file mode 100644 index f738f5664b6..00000000000 --- a/srcpkgs/Carla/patches/pyliblo3.patch +++ /dev/null @@ -1,61 +0,0 @@ -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 cc3d0774300..6e83ea054a7 100755 --- a/srcpkgs/Carla/template +++ b/srcpkgs/Carla/template @@ -1,7 +1,7 @@ # Template file for 'Carla' pkgname=Carla -version=2.5.9 -revision=2 +version=2.5.10 +revision=1 archs="x86_64* i686* aarch64* arm*" build_style=gnu-makefile pycompile_dirs="usr/share/carla" @@ -16,7 +16,7 @@ maintainer="Rutpiv " license="GPL-2.0-or-later" homepage="https://kx.studio/Applications:Carla" distfiles="https://github.com/falkTX/Carla/archive/v${version}.tar.gz" -checksum=226fb5d646b7541b82035080190e7440df1f92372fb798b4ad49289570e5ad81 +checksum=ae2835b12081f7271a6b0b25d34b87d36b022c40370028ca4a10f90fcedfa661 python_version=3 build_options="win linux32"