From 12ab3befc9864038315787f7709f280f741e652b Mon Sep 17 00:00:00 2001
From: mglae <mglmail@arcor.de>
Date: Wed, 8 May 2024 23:02:18 +0200
Subject: [PATCH 1/3] boblightd: Revert "boblightd: enable lib.private via
 RPATH"

This reverts commit d608f68c9b8378fb151b766b53721bbca6ea4743.

script.xbmc.boblight require libboblight.so in lib path to be found from Python.

See https://forum.libreelec.tv/thread/28505-boblight-not-working-on-12-0-anymore/?postID=191714#post191714
---
 packages/addons/service/boblightd/package.mk | 23 ++++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/packages/addons/service/boblightd/package.mk b/packages/addons/service/boblightd/package.mk
index c1c5e719b5..31f49eb313 100644
--- a/packages/addons/service/boblightd/package.mk
+++ b/packages/addons/service/boblightd/package.mk
@@ -46,20 +46,19 @@ makeinstall_target() {
 }
 
 addon() {
-  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private
-    cp -P ${PKG_BUILD}/.${TARGET_NAME}/src/.libs/libboblight.so* ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib
+  cp -P ${PKG_BUILD}/.${TARGET_NAME}/src/.libs/libboblight.so* ${ADDON_BUILD}/${PKG_ADDON_ID}/lib
 
   mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
-    cp -P ${PKG_BUILD}/.${TARGET_NAME}/src/boblightd ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
-    cp -P ${PKG_BUILD}/.${TARGET_NAME}/src/boblight-constant ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
-    if [ "${DISPLAYSERVER}" = "x11" ]; then
-      cp -P ${PKG_BUILD}/.${TARGET_NAME}/src/boblight-X11 ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
-    fi
-    patchelf --add-rpath '$ORIGIN/../lib.private' ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/boblight-*
+  cp -P ${PKG_BUILD}/.${TARGET_NAME}/src/boblightd ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+  cp -P ${PKG_BUILD}/.${TARGET_NAME}/src/boblight-constant ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+  if [ "${DISPLAYSERVER}" = "x11" ]; then
+    cp -P ${PKG_BUILD}/.${TARGET_NAME}/src/boblight-X11 ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+  fi
 
   mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/config
-    cp -R ${PKG_DIR}/config/boblight.conf ${ADDON_BUILD}/${PKG_ADDON_ID}/config
-    if [ "${DISPLAYSERVER}" = "x11" ]; then
-      cp -R ${PKG_DIR}/config/boblight.X11.sample ${ADDON_BUILD}/${PKG_ADDON_ID}/config
-    fi
+  cp -R ${PKG_DIR}/config/boblight.conf ${ADDON_BUILD}/${PKG_ADDON_ID}/config
+  if [ "${DISPLAYSERVER}" = "x11" ]; then
+    cp -R ${PKG_DIR}/config/boblight.X11.sample ${ADDON_BUILD}/${PKG_ADDON_ID}/config
+  fi
 }

From 1713564d3858c5c926e021b30cf285b8ca921951 Mon Sep 17 00:00:00 2001
From: mglae <mglmail@arcor.de>
Date: Wed, 8 May 2024 23:29:49 +0200
Subject: [PATCH 2/3] boblightd: only include required libboblight.so

---
 packages/addons/service/boblightd/package.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/addons/service/boblightd/package.mk b/packages/addons/service/boblightd/package.mk
index 31f49eb313..7d714a8a73 100644
--- a/packages/addons/service/boblightd/package.mk
+++ b/packages/addons/service/boblightd/package.mk
@@ -47,7 +47,7 @@ makeinstall_target() {
 
 addon() {
   mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib
-  cp -P ${PKG_BUILD}/.${TARGET_NAME}/src/.libs/libboblight.so* ${ADDON_BUILD}/${PKG_ADDON_ID}/lib
+  cp -PL ${PKG_BUILD}/.${TARGET_NAME}/src/.libs/libboblight.so ${ADDON_BUILD}/${PKG_ADDON_ID}/lib
 
   mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
   cp -P ${PKG_BUILD}/.${TARGET_NAME}/src/boblightd ${ADDON_BUILD}/${PKG_ADDON_ID}/bin

From 9cda6f976bdb2d605a29c8731676da6492152a95 Mon Sep 17 00:00:00 2001
From: mglae <mglmail@arcor.de>
Date: Wed, 8 May 2024 23:30:17 +0200
Subject: [PATCH 3/3] boblightd: update addon (1)

---
 packages/addons/service/boblightd/package.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/addons/service/boblightd/package.mk b/packages/addons/service/boblightd/package.mk
index 7d714a8a73..f2b4e79108 100644
--- a/packages/addons/service/boblightd/package.mk
+++ b/packages/addons/service/boblightd/package.mk
@@ -4,7 +4,7 @@
 PKG_NAME="boblightd"
 PKG_VERSION="478"
 PKG_SHA256="78b82c9b133ce20c3d24aba96abe4a8302ec8dc640460b3b7302aa1d368c543a"
-PKG_REV="0"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://code.google.com/p/boblight"