From 1f0a1f9f2d2b3c533fbac641c579759f2bc35c49 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 25 Nov 2025 16:07:47 -0800 Subject: [PATCH] ola: fix compilation with newer liblo Upstream backport. Signed-off-by: Rosen Penev --- net/ola/Makefile | 2 +- net/ola/patches/040-liblo.patch | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 net/ola/patches/040-liblo.patch diff --git a/net/ola/Makefile b/net/ola/Makefile index 3139cc5cd7..9cf3f4fd93 100644 --- a/net/ola/Makefile +++ b/net/ola/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ola PKG_VERSION:=0.10.9 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_VERSION:=$(PKG_VERSION) diff --git a/net/ola/patches/040-liblo.patch b/net/ola/patches/040-liblo.patch new file mode 100644 index 0000000000..4caa30f3cd --- /dev/null +++ b/net/ola/patches/040-liblo.patch @@ -0,0 +1,29 @@ +From e083653d2d18018fe6ef42f757bc06462de87f28 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20H=C3=BClsmann?= +Date: Sat, 30 Mar 2024 12:43:55 +0100 +Subject: [PATCH] Fix liblo 0.32 header compatibility + +--- + plugins/osc/OSCNode.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/plugins/osc/OSCNode.cpp ++++ b/plugins/osc/OSCNode.cpp +@@ -141,7 +141,7 @@ bool ExtractSlotValueFromPair(const stri + * @param user_data a pointer to the OSCNode object. + */ + int OSCDataHandler(const char *osc_address, const char *types, lo_arg **argv, +- int argc, void *, void *user_data) { ++ int argc, lo_message, void *user_data) { + OLA_DEBUG << "Got OSC message for " << osc_address << ", types are " << types; + + OSCNode *node = reinterpret_cast(user_data); +@@ -150,7 +150,7 @@ int OSCDataHandler(const char *osc_addre + + if (argc == 1) { + if (type == "b") { +- lo_blob blob = argv[0]; ++ lo_blob blob = (lo_blob)argv[0]; + unsigned int size = min(static_cast(DMX_UNIVERSE_SIZE), + lo_blob_datasize(blob)); + node->SetUniverse( -- 2.30.2