From 2f9a32ebeef729347425fa0e90addef311605bb1 Mon Sep 17 00:00:00 2001 From: Roger Freitas Pereira Date: Thu, 24 Jul 2025 21:29:36 -0300 Subject: [PATCH 1/3] New package: python3-pyliblo3-0.16.3 --- .../patches/Cython 3.1.2.patch | 40 +++++++++++++++++++ srcpkgs/python3-pyliblo3/template | 13 ++++++ 2 files changed, 53 insertions(+) create mode 100644 srcpkgs/python3-pyliblo3/patches/Cython 3.1.2.patch create mode 100644 srcpkgs/python3-pyliblo3/template diff --git a/srcpkgs/python3-pyliblo3/patches/Cython 3.1.2.patch b/srcpkgs/python3-pyliblo3/patches/Cython 3.1.2.patch new file mode 100644 index 00000000000..d320f311e3b --- /dev/null +++ b/srcpkgs/python3-pyliblo3/patches/Cython 3.1.2.patch @@ -0,0 +1,40 @@ +From 6b53ac0f1768f5f2f017b7011030ef6461366639 Mon Sep 17 00:00:00 2001 +From: Muhammad Alfi Syahrin +Date: Tue, 17 Jun 2025 19:58:19 +0700 +Subject: [PATCH] Fix compilation with Cython 3.1.2 + +--- + pyliblo3/_liblo.pyx | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/pyliblo3/_liblo.pyx b/pyliblo3/_liblo.pyx +index 4fa70df..dcc4da9 100644 +--- a/pyliblo3/_liblo.pyx ++++ b/pyliblo3/_liblo.pyx +@@ -971,7 +971,7 @@ cdef class Message: + if t == 'i': + lo_message_add_int32(self._message, int(value)) + elif t == 'h': +- lo_message_add_int64(self._message, long(value)) ++ lo_message_add_int64(self._message, int(value)) + elif t == 'f': + lo_message_add_float(self._message, float(value)) + elif t == 'd': +@@ -1012,7 +1012,7 @@ cdef class Message: + lo_message_add_true(self._message) + elif value is False: + lo_message_add_false(self._message) +- elif isinstance(value, (int, long)): ++ elif isinstance(value, (int)): + try: + lo_message_add_int32(self._message, value) + except OverflowError: +@@ -1067,7 +1067,7 @@ cdef class Bundle: + + if len(messages) and not isinstance(messages[0], Message): + t = messages[0] +- if isinstance(t, (float, int, long)): ++ if isinstance(t, (float, int)): + tt = _double_to_timetag(t) + elif isinstance(t, tuple) and len(t) == 2: + tt.sec, tt.frac = t diff --git a/srcpkgs/python3-pyliblo3/template b/srcpkgs/python3-pyliblo3/template new file mode 100644 index 00000000000..9c0021339c3 --- /dev/null +++ b/srcpkgs/python3-pyliblo3/template @@ -0,0 +1,13 @@ +# Template file for 'python3-pyliblo3' +pkgname=python3-pyliblo3 +version=0.16.3 +revision=1 +build_style=python3-module +hostmakedepends="python3-setuptools python3-Cython" +makedepends="python3-devel liblo-devel" +short_desc="Python bindings for the liblo OSC library, a fork of pyliblo" +maintainer="Rutpiv " +license="LGPL-2.1-or-later" +homepage="https://github.com/gesellkammer/pyliblo3" +distfiles="https://github.com/gesellkammer/pyliblo3/archive/v${version}.tar.gz" +checksum=625ddf1b435eb7c1f1a1f187e11cd74e14995e108ba5d32482ff709bf6ffb2a8 From 5c3837ab3e23cc6798dadf6c7443a69eec038062 Mon Sep 17 00:00:00 2001 From: Roger Freitas Pereira Date: Thu, 24 Jul 2025 21:38:57 -0300 Subject: [PATCH 2/3] Carla: revbump for python3-pyliblo3 --- srcpkgs/Carla/patches/pyliblo3.patch | 13 +++++++++++++ srcpkgs/Carla/template | 7 +++++-- 2 files changed, 18 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..801ea04af65 --- /dev/null +++ b/srcpkgs/Carla/patches/pyliblo3.patch @@ -0,0 +1,13 @@ +diff --git a/source/frontend/carla_host_control.py b/source/frontend/carla_host_control.py +index 00c6958..2d5d4da 100755 +--- a/source/frontend/carla_host_control.py ++++ b/source/frontend/carla_host_control.py +@@ -32,7 +32,7 @@ from carla_host import * + # ------------------------------------------------------------------------------------------------------------ + # Imports (liblo) + +-from liblo import ( ++from pyliblo3 import ( + Address, + AddressError, + ServerError, 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) From 24edf8c5b3ec010ae5e80ec967784efa2bb0621d Mon Sep 17 00:00:00 2001 From: Roger Freitas Pereira Date: Thu, 24 Jul 2025 21:44:08 -0300 Subject: [PATCH 3/3] pyliblo: remove package --- srcpkgs/pyliblo/patches/cython3.patch | 32 ----------------------- srcpkgs/pyliblo/patches/python-3.11.patch | 19 -------------- srcpkgs/pyliblo/template | 19 -------------- srcpkgs/removed-packages/template | 1 + 4 files changed, 1 insertion(+), 70 deletions(-) delete mode 100644 srcpkgs/pyliblo/patches/cython3.patch delete mode 100644 srcpkgs/pyliblo/patches/python-3.11.patch delete mode 100644 srcpkgs/pyliblo/template diff --git a/srcpkgs/pyliblo/patches/cython3.patch b/srcpkgs/pyliblo/patches/cython3.patch deleted file mode 100644 index 6f01930e175..00000000000 --- a/srcpkgs/pyliblo/patches/cython3.patch +++ /dev/null @@ -1,32 +0,0 @@ -Taken from - - https://gitlab.archlinux.org/archlinux/packaging/packages/python-pyliblo - -diff -urN pyliblo-0.10.0-orig/src/liblo.pxd pyliblo-0.10.0/src/liblo.pxd ---- pyliblo-0.10.0-orig/src/liblo.pxd 2015-03-14 23:32:24.000000000 -0300 -+++ pyliblo-0.10.0/src/liblo.pxd 2023-08-02 04:17:47.601508337 -0400 -@@ -53,20 +53,20 @@ - int lo_send_bundle_from(lo_address targ, lo_server serv, lo_bundle b) - - # server -- lo_server lo_server_new_with_proto(char *port, int proto, lo_err_handler err_h) -+ lo_server lo_server_new_with_proto(char *port, int proto, void(*err_h)(int num, const_char *msg, const_char *where) except * nogil) - void lo_server_free(lo_server s) - char *lo_server_get_url(lo_server s) - int lo_server_get_port(lo_server s) - int lo_server_get_protocol(lo_server s) -- lo_method lo_server_add_method(lo_server s, char *path, char *typespec, lo_method_handler h, void *user_data) -+ lo_method lo_server_add_method(lo_server s, char *path, char *typespec, int(*h)(const_char *path, const_char *types, lo_arg **argv, int argc, lo_message msg, void *user_data) except?-1 nogil, void *user_data) - void lo_server_del_method(lo_server s, char *path, char *typespec) -- int lo_server_add_bundle_handlers(lo_server s, lo_bundle_start_handler sh, lo_bundle_end_handler eh, void *user_data) -+ int lo_server_add_bundle_handlers(lo_server s, int(*sh)(lo_timetag time, void *user_data) except?-1 nogil , int(*eh)(void *user_data) except?-1 nogil, void *user_data) - int lo_server_recv(lo_server s) nogil - int lo_server_recv_noblock(lo_server s, int timeout) nogil - int lo_server_get_socket_fd(lo_server s) - - # server thread -- lo_server_thread lo_server_thread_new_with_proto(char *port, int proto, lo_err_handler err_h) -+ lo_server_thread lo_server_thread_new_with_proto(char *port, int proto, void(*err_h)(int num, const_char *msg, const_char *where) except * nogil) - void lo_server_thread_free(lo_server_thread st) - lo_server lo_server_thread_get_server(lo_server_thread st) - void lo_server_thread_start(lo_server_thread st) diff --git a/srcpkgs/pyliblo/patches/python-3.11.patch b/srcpkgs/pyliblo/patches/python-3.11.patch deleted file mode 100644 index b8bdbb8397d..00000000000 --- a/srcpkgs/pyliblo/patches/python-3.11.patch +++ /dev/null @@ -1,19 +0,0 @@ -Taken from - - https://gitlab.archlinux.org/archlinux/packaging/packages/python-pyliblo - -diff -ruN a/src/liblo.pyx b/src/liblo.pyx ---- a/src/liblo.pyx 2015-04-14 09:02:22.000000000 +0200 -+++ b/src/liblo.pyx 2023-04-06 19:51:56.042679208 +0200 -@@ -258,9 +258,9 @@ - cb.user_data) - - # call function -- if _inspect.getargspec(func)[1] == None: -+ if _inspect.getfullargspec(func)[1] == None: - # determine number of arguments to call the function with -- n = len(_inspect.getargspec(func)[0]) -+ n = len(_inspect.getfullargspec(func)[0]) - if _inspect.ismethod(func): - n -= 1 # self doesn't count - r = cb.func(*func_args[0:n]) diff --git a/srcpkgs/pyliblo/template b/srcpkgs/pyliblo/template deleted file mode 100644 index 9c823e9e109..00000000000 --- a/srcpkgs/pyliblo/template +++ /dev/null @@ -1,19 +0,0 @@ -# Template file for 'pyliblo' -pkgname=pyliblo -version=0.10.0 -revision=5 -build_style=python3-module -hostmakedepends="python3-setuptools python3-Cython" -makedepends="python3-devel liblo-devel" -depends="python3" -short_desc="Python bindings for the liblo OSC library" -maintainer="Orphaned " -license="LGPL-2.1-or-later" -homepage="http://das.nasophon.de/pyliblo/" -distfiles="${PYPI_SITE}/p/pyliblo/pyliblo-${version}.tar.gz" -checksum=fc67f1950b827272b00f9f0dc4ed7113c0ccef0c1c09e9976dead40ebbf1798f -make_check=ci-skip # fails "test.test_liblo.ServerCreationTestCase" due to root - -do_check() { - PYTHONPATH="$(cd build/lib* && pwd)" python3 ./test/test_liblo.py -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index b261556bb75..62312e01995 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -624,6 +624,7 @@ replaces=" pygtk-devel<=2.24.0_14 pygtk<=2.24.0_14 pygtksourceview<=2.10.1_5 + pyliblo<=0.10.0_5 pyside-tools<=0.2.15_2 pyside2-tools<=5.15.5_1 pystopwatch<=2019_2