Skip to content

Commit df0e183

Browse files
author
Rudi Heitbaum
committed
snapclient: find the alsa plugin via ALSA_PLUGIN_DIR not an rpath and addon (3)
An rpath on the snapclient binary does not locate ALSA plugins - alsa-lib dlopens them from ALSA_PLUGIN_DIR, and the pulse plugin's libpulse dependency resolves from the system /usr/lib. Drop the patchelf rpath and point ALSA_PLUGIN_DIR at lib.private, where the plugins are actually copied (it previously pointed at a nonexistent lib/).
1 parent f4ed3b0 commit df0e183

2 files changed

Lines changed: 2 additions & 3 deletions

File tree

packages/addons/service/snapclient/package.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
PKG_NAME="snapclient"
55
PKG_VERSION="0.35.0"
6-
PKG_REV="2"
6+
PKG_REV="3"
77
PKG_ARCH="any"
88
PKG_LICENSE="GPL-3.0-or-later"
99
PKG_DEPENDS_TARGET="toolchain alsa-plugins snapcast"
@@ -22,7 +22,6 @@ addon() {
2222

2323
cp $(get_install_dir snapcast)/usr/bin/snapclient \
2424
${ADDON_BUILD}/${PKG_ADDON_ID}/bin
25-
patchelf --add-rpath '${ORIGIN}/../lib.private' ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/snapclient
2625

2726
cp $(get_install_dir alsa-plugins)/usr/lib/alsa/*.so \
2827
${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private

packages/addons/service/snapclient/source/system.d/service.snapclient.service

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ After=kodi.service network-online.target sound.target
44
Requires=kodi.service network-online.target sound.target
55

66
[Service]
7-
Environment=ALSA_PLUGIN_DIR=/storage/.kodi/addons/service.snapclient/lib
7+
Environment=ALSA_PLUGIN_DIR=/storage/.kodi/addons/service.snapclient/lib.private
88
ExecStart=/bin/sh /storage/.kodi/addons/service.snapclient/bin/snapclient.start
99
Restart=always
1010

0 commit comments

Comments
 (0)