diff --git a/packages/addons/service/mpd/package.mk b/packages/addons/service/mpd/package.mk index 3d6a3caf89..03b4da98e7 100644 --- a/packages/addons/service/mpd/package.mk +++ b/packages/addons/service/mpd/package.mk @@ -3,16 +3,16 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="mpd" -PKG_VERSION="0.23.17" -PKG_SHA256="a86f4fe811695743b08db82a9f1a840b8918bb4f46b06f48aa1d8d1b5386dff2" -PKG_REV="2" +PKG_VERSION="0.24" +PKG_SHA256="1c828a290816d540fb2dec90f78044b55ff5ef8b49dd47a639ac34e3e5226bc5" +PKG_REV="3" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://www.musicpd.org" PKG_URL="http://www.musicpd.org/download/mpd/$(get_pkg_version_maj_min)/mpd-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain alsa-lib avahi boost curl faad2 ffmpeg flac glib lame libcdio libfmt \ libgcrypt libiconv libid3tag libmad libmpdclient libopenmpt libsamplerate \ - libvorbis libnfs5 libogg mpd-mpc opus pulseaudio samba wavpack yajl" + libvorbis libnfs libogg mpd-mpc opus pulseaudio samba wavpack yajl" PKG_SECTION="service.multimedia" PKG_SHORTDESC="Music Player Daemon (MPD): a free and open Music Player Server" PKG_LONGDESC="Music Player Daemon (${PKG_VERSION}) is a flexible and powerful server-side application for playing music" @@ -96,11 +96,6 @@ PKG_MESON_OPTS_TARGET="-Dadplug=disabled \ -Dzlib=enabled \ -Dzzip=disabled" -pre_configure_target() { - export PKG_CONFIG_PATH="$(get_install_dir libnfs5)/usr/lib/pkgconfig:${PKG_CONFIG_PATH}" - export TARGET_CXXFLAGS+=" -I$(get_install_dir libnfs5)/usr/include" -} - addon() { mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin cp -P ${PKG_INSTALL}/usr/bin/mpd ${ADDON_BUILD}/${PKG_ADDON_ID}/bin diff --git a/packages/addons/service/mpd/patches/mpd-9999-link-against-static-libopenmpt.patch b/packages/addons/service/mpd/patches/mpd-9999-link-against-static-libopenmpt.patch index 2735500585..04fd0adb17 100644 --- a/packages/addons/service/mpd/patches/mpd-9999-link-against-static-libopenmpt.patch +++ b/packages/addons/service/mpd/patches/mpd-9999-link-against-static-libopenmpt.patch @@ -1,11 +1,11 @@ --- a/src/decoder/plugins/meson.build 2024-12-03 11:56:57.000000000 +0000 +++ b/src/decoder/plugins/meson.build 2024-12-30 14:15:29.590502435 +0000 -@@ -108,7 +108,7 @@ +@@ -110,7 +110,7 @@ ] endif -libopenmpt_dep = dependency('libopenmpt', required: get_option('openmpt')) +libopenmpt_dep = dependency('libopenmpt', required: get_option('openmpt'), static: true) decoder_features.set('ENABLE_OPENMPT', libopenmpt_dep.found()) - decoder_features.set('HAVE_LIBOPENMPT_VERSION_0_5', libopenmpt_dep.version().version_compare('>= 0.5')) if libopenmpt_dep.found() + decoder_plugins_sources += [