mirror of
https://github.com/void-linux/void-packages.git
synced 2025-07-30 09:22:57 +02:00
Merge 24edf8c5b3
into 9f47aebee5
This commit is contained in:
commit
02cfbcc8b4
8 changed files with 72 additions and 72 deletions
13
srcpkgs/Carla/patches/pyliblo3.patch
Normal file
13
srcpkgs/Carla/patches/pyliblo3.patch
Normal file
|
@ -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,
|
|
@ -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 <roger_freitas@live.com>"
|
||||
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)
|
||||
|
|
|
@ -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)
|
|
@ -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])
|
|
@ -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 <orphan@voidlinux.org>"
|
||||
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
|
||||
}
|
40
srcpkgs/python3-pyliblo3/patches/Cython 3.1.2.patch
Normal file
40
srcpkgs/python3-pyliblo3/patches/Cython 3.1.2.patch
Normal file
|
@ -0,0 +1,40 @@
|
|||
From 6b53ac0f1768f5f2f017b7011030ef6461366639 Mon Sep 17 00:00:00 2001
|
||||
From: Muhammad Alfi Syahrin <malfisya.dev@hotmail.com>
|
||||
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, <int32_t>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
|
13
srcpkgs/python3-pyliblo3/template
Normal file
13
srcpkgs/python3-pyliblo3/template
Normal file
|
@ -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 <roger_freitas@live.com>"
|
||||
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
|
|
@ -625,6 +625,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
|
||||
|
|
Loading…
Add table
Reference in a new issue