Skip to content

liblo: fix pkgconf file #27965

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 26, 2025
Merged

liblo: fix pkgconf file #27965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8381fb2
liblo: fix pkgconf file
neheb Nov 25, 2025
3a7a233
ola: fix compilation with newer liblo
neheb Nov 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions libs/liblo/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=liblo
PKG_VERSION:=0.34
PKG_RELEASE:=1
PKG_RELEASE:=2

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/liblo
Expand All @@ -19,7 +19,6 @@ PKG_MAINTAINER:=
PKG_LICENSE:=LGPL-2.1-or-later
PKG_LICENSE_FILES:=COPYING

CMAKE_INSTALL:=1
CMAKE_SOURCE_SUBDIR:=cmake
PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_liblo-utils

Expand Down Expand Up @@ -55,6 +54,12 @@ CMAKE_OPTIONS += \
-DWITH_STATIC=OFF \
-DTHREADING=ON

define Build/InstallDev
$(call Build/InstallDev/cmake,$(1))
$(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/liblo.pc
$(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/liblo.pc
endef

define Package/liblo/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/liblo.so.* $(1)/usr/lib/
Expand Down
2 changes: 1 addition & 1 deletion net/ola/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
29 changes: 29 additions & 0 deletions net/ola/patches/040-liblo.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
From e083653d2d18018fe6ef42f757bc06462de87f28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20H=C3=BClsmann?= <[email protected]>
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<OSCNode*>(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<uint32_t>(DMX_UNIVERSE_SIZE),
lo_blob_datasize(blob));
node->SetUniverse(