app-misc/ola: Fix compilation against media-libs/liblo-0.32

Closes: https://bugs.gentoo.org/927000 Upstream-PR: OpenLightingProject/ola#1954 Upstream-Commit: OpenLightingProject/ola@e083653 Signed-off-by: Jannis Achstetter <[email protected]>
kripton · Apr 11, 2024 · aed81b9 · aed81b9
1 parent 4c93231
commit aed81b9
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 0 deletions.
diff --git a/app-misc/ola/files/ola-0.10.9-liblo.patch b/app-misc/ola/files/ola-0.10.9-liblo.patch
@@ -0,0 +1,33 @@
+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
+
+Closes: https://bugs.gentoo.org/927000
+Upstream-PR: https://github.com/OpenLightingProject/ola/pull/1954
+---
+ plugins/osc/OSCNode.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/osc/OSCNode.cpp b/plugins/osc/OSCNode.cpp
+index d25d0d0201..26636ae531 100644
+--- a/plugins/osc/OSCNode.cpp
++++ b/plugins/osc/OSCNode.cpp
+@@ -141,7 +141,7 @@ bool ExtractSlotValueFromPair(const string &type, lo_arg **argv,
+  * @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_address, const char *types, lo_arg **argv,
+
+   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(
diff --git a/app-misc/ola/ola-0.10.9-r2.ebuild → app-misc/ola/ola-0.10.9-r3.ebuild b/app-misc/ola/ola-0.10.9-r2.ebuild → app-misc/ola/ola-0.10.9-r3.ebuild
@@ -61,8 +61,11 @@ BDEPEND="app-alternatives/yacc
 		)
 	)"
 
+# ola-0.10.9-liblo.patch fixes compilation against
+# media-libs/liblo-0.32. See https://bugs.gentoo.org/927000
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.10.9-nullptr.patch
+	"${FILESDIR}"/${PN}-0.10.9-liblo.patch
 )
 
 src_prepare() {