Skip to content

Commit

Permalink
python-pyliblo: rebuild against cython
Browse files Browse the repository at this point in the history
**Summary**
- Rebuild against cython
  • Loading branch information
androidnisse committed Jul 3, 2024
1 parent debb197 commit b88b80a
Show file tree
Hide file tree
Showing 4 changed files with 64 additions and 12 deletions.
30 changes: 25 additions & 5 deletions packages/py/python-pyliblo/abi_used_symbols
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@ UNKNOWN:PyBytes_FromStringAndSize
UNKNOWN:PyBytes_Type
UNKNOWN:PyCFunction_Type
UNKNOWN:PyCMethod_New
UNKNOWN:PyCapsule_GetPointer
UNKNOWN:PyCapsule_New
UNKNOWN:PyCode_NewEmpty
UNKNOWN:PyCode_NewWithPosOnlyArgs
UNKNOWN:PyDescr_IsData
UNKNOWN:PyDict_Contains
UNKNOWN:PyDict_Copy
Expand All @@ -24,13 +26,12 @@ UNKNOWN:PyErr_Clear
UNKNOWN:PyErr_ExceptionMatches
UNKNOWN:PyErr_Fetch
UNKNOWN:PyErr_Format
UNKNOWN:PyErr_GetExcInfo
UNKNOWN:PyErr_GivenExceptionMatches
UNKNOWN:PyErr_NoMemory
UNKNOWN:PyErr_NormalizeException
UNKNOWN:PyErr_Occurred
UNKNOWN:PyErr_PrintEx
UNKNOWN:PyErr_Restore
UNKNOWN:PyErr_SetExcInfo
UNKNOWN:PyErr_SetObject
UNKNOWN:PyErr_SetString
UNKNOWN:PyErr_WarnEx
Expand All @@ -47,33 +48,41 @@ UNKNOWN:PyExc_KeyError
UNKNOWN:PyExc_NameError
UNKNOWN:PyExc_OverflowError
UNKNOWN:PyExc_RuntimeError
UNKNOWN:PyExc_RuntimeWarning
UNKNOWN:PyExc_StopIteration
UNKNOWN:PyExc_SystemError
UNKNOWN:PyExc_TypeError
UNKNOWN:PyExc_ValueError
UNKNOWN:PyException_GetTraceback
UNKNOWN:PyException_SetTraceback
UNKNOWN:PyFloat_AsDouble
UNKNOWN:PyFloat_FromDouble
UNKNOWN:PyFloat_FromString
UNKNOWN:PyFloat_Type
UNKNOWN:PyFrame_New
UNKNOWN:PyFunction_Type
UNKNOWN:PyGC_Disable
UNKNOWN:PyGC_Enable
UNKNOWN:PyGILState_Ensure
UNKNOWN:PyGILState_Release
UNKNOWN:PyImport_AddModule
UNKNOWN:PyImport_GetModule
UNKNOWN:PyImport_GetModuleDict
UNKNOWN:PyImport_ImportModule
UNKNOWN:PyImport_ImportModuleLevelObject
UNKNOWN:PyInterpreterState_GetID
UNKNOWN:PyList_Append
UNKNOWN:PyList_AsTuple
UNKNOWN:PyList_New
UNKNOWN:PyList_SetSlice
UNKNOWN:PyList_Type
UNKNOWN:PyLong_AsDouble
UNKNOWN:PyLong_AsLong
UNKNOWN:PyLong_AsSsize_t
UNKNOWN:PyLong_AsUnsignedLong
UNKNOWN:PyLong_FromLong
UNKNOWN:PyLong_FromSsize_t
UNKNOWN:PyLong_Type
UNKNOWN:PyMem_Free
UNKNOWN:PyMem_Malloc
UNKNOWN:PyMem_Realloc
UNKNOWN:PyMethodDescr_Type
Expand All @@ -82,13 +91,13 @@ UNKNOWN:PyMethod_Type
UNKNOWN:PyModuleDef_Init
UNKNOWN:PyModule_GetDict
UNKNOWN:PyModule_NewObject
UNKNOWN:PyNumber_Float
UNKNOWN:PyNumber_InPlaceAdd
UNKNOWN:PyNumber_InPlaceSubtract
UNKNOWN:PyNumber_Index
UNKNOWN:PyNumber_Long
UNKNOWN:PyNumber_Remainder
UNKNOWN:PyOS_snprintf
UNKNOWN:PyOS_string_to_double
UNKNOWN:PyObject_Call
UNKNOWN:PyObject_CallFinalizerFromDealloc
UNKNOWN:PyObject_ClearWeakRefs
Expand All @@ -103,6 +112,7 @@ UNKNOWN:PyObject_GetAttrString
UNKNOWN:PyObject_GetItem
UNKNOWN:PyObject_GetIter
UNKNOWN:PyObject_Hash
UNKNOWN:PyObject_IsSubclass
UNKNOWN:PyObject_IsTrue
UNKNOWN:PyObject_Not
UNKNOWN:PyObject_RichCompare
Expand All @@ -111,13 +121,16 @@ UNKNOWN:PyObject_SetAttr
UNKNOWN:PyObject_SetAttrString
UNKNOWN:PyObject_SetItem
UNKNOWN:PyObject_Size
UNKNOWN:PyObject_Str
UNKNOWN:PyObject_VectorcallDict
UNKNOWN:PySequence_Tuple
UNKNOWN:PyThreadState_Get
UNKNOWN:PyTraceBack_Here
UNKNOWN:PyTuple_GetItem
UNKNOWN:PyTuple_GetSlice
UNKNOWN:PyTuple_New
UNKNOWN:PyTuple_Pack
UNKNOWN:PyTuple_Size
UNKNOWN:PyTuple_Type
UNKNOWN:PyType_IsSubtype
UNKNOWN:PyType_Modified
Expand All @@ -133,25 +146,32 @@ UNKNOWN:PyUnicode_FromString
UNKNOWN:PyUnicode_FromStringAndSize
UNKNOWN:PyUnicode_InternFromString
UNKNOWN:PyUnicode_Type
UNKNOWN:PyVectorcall_Function
UNKNOWN:PyWrapperDescr_Type
UNKNOWN:Py_EnterRecursiveCall
UNKNOWN:Py_GetVersion
UNKNOWN:Py_LeaveRecursiveCall
UNKNOWN:Py_Version
UNKNOWN:_PyByteArray_empty_string
UNKNOWN:_PyDict_GetItem_KnownHash
UNKNOWN:_PyDict_SetItem_KnownHash
UNKNOWN:_PyObject_GC_New
UNKNOWN:_PyObject_GenericGetAttrWithDict
UNKNOWN:_PyObject_GetDictPtr
UNKNOWN:_PyThreadState_UncheckedGet
UNKNOWN:_PyType_Lookup
UNKNOWN:_PyUnicode_IsWhitespace
UNKNOWN:_PyUnicode_Ready
UNKNOWN:_Py_Dealloc
UNKNOWN:_Py_FalseStruct
UNKNOWN:_Py_NoneStruct
UNKNOWN:_Py_TrueStruct
UNKNOWN:_Py_ascii_whitespace
libc.so.6:__stack_chk_fail
libc.so.6:free
libc.so.6:malloc
libc.so.6:memcmp
libc.so.6:modf
libc.so.6:strrchr
liblo.so.7:lo_address_errstr
liblo.so.7:lo_address_free
liblo.so.7:lo_address_get_hostname
Expand Down
28 changes: 28 additions & 0 deletions packages/py/python-pyliblo/files/fix_cython.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
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)
5 changes: 4 additions & 1 deletion packages/py/python-pyliblo/package.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
name : python-pyliblo
version : 0.10.0
release : 7
release : 8
source :
- https://github.com/dsacre/pyliblo/archive/0.10.0.tar.gz : 2013fe90e84bbb5bfb81d382f56e974442fd84fa7931c9986d19c5338c6b9883
homepage : https://pypi.org/project/pyliblo/
license : LGPL-2.1-or-later
component : programming.python
summary : Python wrapper for the liblo OSC library
Expand All @@ -13,6 +14,8 @@ builddeps :
- cython
rundeps :
- liblo
setup : |
%patch -p1 -i $pkgfiles/fix_cython.patch
build : |
%python3_setup
install : |
Expand Down
13 changes: 7 additions & 6 deletions packages/py/python-pyliblo/pspec_x86_64.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<PISI>
<Source>
<Name>python-pyliblo</Name>
<Homepage>https://pypi.org/project/pyliblo/</Homepage>
<Packager>
<Name>Joey Riches</Name>
<Email>[email protected]</Email>
<Name>Jakob Gezelius</Name>
<Email>[email protected]</Email>
</Packager>
<License>LGPL-2.1-or-later</License>
<PartOf>programming.python</PartOf>
Expand Down Expand Up @@ -32,12 +33,12 @@
</Files>
</Package>
<History>
<Update release="7">
<Date>2024-02-14</Date>
<Update release="8">
<Date>2024-06-05</Date>
<Version>0.10.0</Version>
<Comment>Packaging update</Comment>
<Name>Joey Riches</Name>
<Email>[email protected]</Email>
<Name>Jakob Gezelius</Name>
<Email>[email protected]</Email>
</Update>
</History>
</PISI>

0 comments on commit b88b80a

Please sign in to comment.