From 0ebcd2cbf178600b5eb36b2f24cdbb3d2f4a9000 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Thu, 13 Jun 2024 00:08:30 +0100
Subject: gentoo auto-resync : 13:06:2024 - 00:08:29

---
 app-misc/ola/Manifest                     |  3 ++-
 app-misc/ola/files/ola-0.10.9-liblo.patch | 27 +++++++++++++++++++++++++++
 app-misc/ola/ola-0.10.9-r2.ebuild         |  3 +++
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 app-misc/ola/files/ola-0.10.9-liblo.patch

(limited to 'app-misc/ola')

diff --git a/app-misc/ola/Manifest b/app-misc/ola/Manifest
index 98d1c258960b..08f8dd649d16 100644
--- a/app-misc/ola/Manifest
+++ b/app-misc/ola/Manifest
@@ -1,4 +1,5 @@
+AUX ola-0.10.9-liblo.patch 1236 BLAKE2B 072f35fcd8c475025945b66b1d71b09e3b666dad876c464bb94fd9f6aff54b785d111a4c7a39fc7d245d4bdfdb3d949d55959cce7f986633f762dd50c57fa3c9 SHA512 1a192667839611871134000fcbf3c1e05933c664efac6c65f840351126c6cd4d015a83d7787d71adf5acfd7fed338f72657694728619be0983210788a7b3a780
 AUX ola-0.10.9-nullptr.patch 7412 BLAKE2B f03facd9b48493a47d35744d33edab8fbae87e0440053cd7f1610af40fae1a4d56b6a20beb2b3ca8b4fb64d023795ca9e12fd8149d69a150bc105f9978eaddbb SHA512 669ab2bab44cbab87f8c99f92799faa1422a0d0aaeb7da3c8b2dcdb71f47515e93f773b8fab372c66aa47a23797fce0725722ca25354e868ae2926510282058d
 DIST ola-0.10.9.tar.gz 2578760 BLAKE2B 8cace370b21788d0fe65e56d33fdc9436a5103837d370e3e7e07b43318d4ec3b29536b55c4b117f515a4698ebab88f58718759a0cf9a00f79d0b839e7a79d581 SHA512 e8e2f4249d6e1f63f6c36ae548d9e3a82080f0da82829f923ba6b4d63685fb89f9baccf4588fd6fcbf756708d91e27d022c0d623e7c03c84ec058e7dc7c46bdf
-EBUILD ola-0.10.9-r2.ebuild 2437 BLAKE2B 36f4aa7fe9a2f4027ca307aecc0c025f405f2773e6987e4f9f2e0806c079b785dc0240f4872f061199ad7339b2b7f26d1f90d59b3e8f732370ba8d50f54f2f06 SHA512 82b91b2469bd5b723b60d28910e3efd90f10c0f8e4cff8db06a08f198f63aaf929328d43653e28f116d0538d8c45f2267974fdb7a72cf73c1d9277d6728fa2da
+EBUILD ola-0.10.9-r2.ebuild 2588 BLAKE2B 8662178c6e92158c0155515eddade5998e87929c917103e08a9f39a15d6d49d51df7cbc7615837f135ee1b3f2359b4d4d4457283e0fcc3427975e0ec0a0a1daf SHA512 b3f9a085e034bed14a39b61d55bc43ceed8eaec945aee9f372d78b76e3f11d5eb64696d5114e1afac70e301d9ae8c8618c30c1fde925600e76726052a04c8fde
 MISC metadata.xml 1012 BLAKE2B 181177e538c6cdc37b3ba630b3bd3cffd1701e4f674cd51c6032c3b0367c11a0090482055328961e150203f47a1662597e2d0164c65c12662ce3ae2407db5a98 SHA512 01e6e96741b65a895229e7626e6fbfc51132d7b841c597933ea7055c302369264d014da1ff9c9bbad014c1cb812bb43d120a1d40c473c40eef6353ed4bfafc11
diff --git a/app-misc/ola/files/ola-0.10.9-liblo.patch b/app-misc/ola/files/ola-0.10.9-liblo.patch
new file mode 100644
index 000000000000..ac80a2503d49
--- /dev/null
+++ b/app-misc/ola/files/ola-0.10.9-liblo.patch
@@ -0,0 +1,27 @@
+From e083653d2d18018fe6ef42f757bc06462de87f28 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20H=C3=BClsmann?= <fh@cbix.de>
+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
+--- 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 b/app-misc/ola/ola-0.10.9-r2.ebuild
index a9d0c36ac512..1cd74bb29e17 100644
--- a/app-misc/ola/ola-0.10.9-r2.ebuild
+++ b/app-misc/ola/ola-0.10.9-r2.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() {
-- 
cgit v1.2.3