Merge pull request #5914 from heitbaum/mpd10

[le10] Fix mpd build

packages/addons/addon-depends/libmpdclient/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libmpdclient"
-PKG_VERSION="2.19"
-PKG_SHA256="158aad4c2278ab08e76a3f2b0166c99b39fae00ee17231bd225c5a36e977a189"
+PKG_VERSION="2.20"
+PKG_SHA256="18793f68e939c3301e34d8fcadea1f7daa24143941263cecadb80126194e277d"
 PKG_LICENSE="BSD-3c"
 PKG_SITE="https://www.musicpd.org"
 PKG_URL="https://www.musicpd.org/download/libmpdclient/2/libmpdclient-${PKG_VERSION}.tar.xz"

packages/addons/service/mpd/changelog.txt

@@ -1,3 +1,8 @@
+113
+- Update to version 0.23.5
+- libmpdclient: update to 2.20
+- Update libopenmpt to 0.5.15
+
 112
 - Update to version 0.23.3
 

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.3"
-PKG_SHA256="b300625701005c6b14649f11dac118d05540529a5385d05b7c3062c0ce08f399"
-PKG_REV="112"
+PKG_VERSION="0.23.5"
+PKG_SHA256="f22c2c25093a05f4566f9cd7207cfbcd8405af67ed29a989bcf8905f80b7a299"
+PKG_REV="113"
 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 libsamplerate libvorbis \
-                    libnfs libogg mpd-mpc opus pulseaudio samba wavpack yajl"
+                    libgcrypt libiconv libid3tag libmad libmpdclient libopenmpt libsamplerate \
+                    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"
@@ -22,80 +22,79 @@ PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Music Player Daemon (MPD)"
 PKG_ADDON_TYPE="xbmc.service"
 
-PKG_MESON_OPTS_TARGET=" \
-  -Dadplug=disabled \
-  -Dalsa=enabled \
-  -Dao=disabled \
-  -Daudiofile=disabled \
-  -Dbzip2=enabled \
-  -Dcdio_paranoia=disabled \
-  -Dchromaprint=disabled \
-  -Dcue=true \
-  -Dcurl=enabled \
-  -Ddatabase=true \
-  -Ddocumentation=disabled \
-  -Ddsd=true \
-  -Dexpat=enabled \
-  -Dfaad=enabled \
-  -Dffmpeg=enabled \
-  -Dfifo=true \
-  -Dflac=enabled \
-  -Dfluidsynth=disabled \
-  -Dfuzzer=false \
-  -Dgme=disabled \
-  -Dhttpd=true \
-  -Dhtml_manual=false \
-  -Diconv=disabled \
-  -Dicu=disabled \
-  -Did3tag=enabled \
-  -Dipv6=enabled \
-  -Diso9660=enabled \
-  -Djack=disabled \
-  -Dlame=enabled \
-  -Dlibmpdclient=enabled \
-  -Dlibsamplerate=enabled \
-  -Dlocal_socket=false \
-  -Dmad=enabled \
-  -Dmanpages=false \
-  -Dmikmod=disabled \
-  -Dmms=disabled \
-  -Dmodplug=disabled \
-  -Dmpcdec=disabled \
-  -Dmpg123=disabled \
-  -Dneighbor=false \
-  -Dnfs=enabled \
-  -Dopenal=disabled \
-  -Dopus=enabled \
-  -Doss=disabled \
-  -Dpipe=true \
-  -Dpulse=enabled \
-  -Dqobuz=enabled \
-  -Drecorder=false \
-  -Dshine=disabled \
-  -Dshout=disabled \
-  -Dsidplay=disabled \
-  -Dsmbclient=enabled \
-  -Dsndfile=enabled \
-  -Dsndio=disabled \
-  -Dsolaris_output=disabled \
-  -Dsoundcloud=enabled \
-  -Dsoxr=enabled \
-  -Dsqlite=enabled \
-  -Dsyslog=disabled \
-  -Dsystemd=disabled \
-  -Dtest=false \
-  -Dtwolame=disabled \
-  -Dupnp=disabled \
-  -Dvorbis=enabled \
-  -Dvorbisenc=enabled \
-  -Dwave_encoder=true \
-  -Dwavpack=enabled \
-  -Dwebdav=enabled \
-  -Dwildmidi=disabled \
-  -Dyajl=enabled \
-  -Dzeroconf=avahi \
-  -Dzlib=enabled \
-  -Dzzip=disabled"
+PKG_MESON_OPTS_TARGET="-Dadplug=disabled \
+                       -Dalsa=enabled \
+                       -Dao=disabled \
+                       -Daudiofile=disabled \
+                       -Dbzip2=enabled \
+                       -Dcdio_paranoia=disabled \
+                       -Dchromaprint=disabled \
+                       -Dcue=true \
+                       -Dcurl=enabled \
+                       -Ddatabase=true \
+                       -Ddocumentation=disabled \
+                       -Ddsd=true \
+                       -Dexpat=enabled \
+                       -Dfaad=enabled \
+                       -Dffmpeg=enabled \
+                       -Dfifo=true \
+                       -Dflac=enabled \
+                       -Dfluidsynth=disabled \
+                       -Dfuzzer=false \
+                       -Dgme=disabled \
+                       -Dhttpd=true \
+                       -Dhtml_manual=false \
+                       -Diconv=disabled \
+                       -Dicu=disabled \
+                       -Did3tag=enabled \
+                       -Dipv6=enabled \
+                       -Diso9660=enabled \
+                       -Djack=disabled \
+                       -Dlame=enabled \
+                       -Dlibmpdclient=enabled \
+                       -Dlibsamplerate=enabled \
+                       -Dlocal_socket=false \
+                       -Dmad=enabled \
+                       -Dmanpages=false \
+                       -Dmikmod=disabled \
+                       -Dmms=disabled \
+                       -Dmodplug=disabled \
+                       -Dmpcdec=disabled \
+                       -Dmpg123=disabled \
+                       -Dneighbor=false \
+                       -Dnfs=enabled \
+                       -Dopenal=disabled \
+                       -Dopus=enabled \
+                       -Doss=disabled \
+                       -Dpipe=true \
+                       -Dpulse=enabled \
+                       -Dqobuz=enabled \
+                       -Drecorder=false \
+                       -Dshine=disabled \
+                       -Dshout=disabled \
+                       -Dsidplay=disabled \
+                       -Dsmbclient=enabled \
+                       -Dsndfile=enabled \
+                       -Dsndio=disabled \
+                       -Dsolaris_output=disabled \
+                       -Dsoundcloud=enabled \
+                       -Dsoxr=enabled \
+                       -Dsqlite=enabled \
+                       -Dsyslog=disabled \
+                       -Dsystemd=disabled \
+                       -Dtest=false \
+                       -Dtwolame=disabled \
+                       -Dupnp=disabled \
+                       -Dvorbis=enabled \
+                       -Dvorbisenc=enabled \
+                       -Dwave_encoder=true \
+                       -Dwavpack=enabled \
+                       -Dwebdav=enabled \
+                       -Dwildmidi=disabled \
+                       -Dyajl=enabled \
+                       -Dzeroconf=avahi \
+                       -Dzlib=enabled \
+                       -Dzzip=disabled"
 
 addon() {
   mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin

packages/audio/libopenmpt/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libopenmpt"
-PKG_VERSION="0.4.17"
-PKG_SHA256="1df99191400c62dbdfd144f5ffd6aedbfd39fb9c6c47e83355a222632b793593"
+PKG_VERSION="0.5.15"
+PKG_SHA256="bca80f897b479d39926e16058db4fb9fd618ab8be6cbe96608736628bfd8b15c"
 PKG_LICENSE="BSD"
 PKG_SITE="https://lib.openmpt.org/libopenmpt/"
 PKG_URL="https://lib.openmpt.org/files/libopenmpt/src/${PKG_NAME}-${PKG_VERSION}+release.autotools.tar.gz"

packages/audio/libopenmpt/patches/libopenmpt-add-libvorbisfile-to-pkgconfig.patch

@@ -0,0 +1,11 @@
+--- a/libopenmpt/libopenmpt.pc.in	2016-07-09 18:17:00.000000000 +0000
++++ b/libopenmpt/libopenmpt.pc.in	2021-12-25 00:53:54.189008995 +0000
+@@ -8,7 +8,7 @@
+ Description: Tracker module player based on OpenMPT
+ Version: @VERSION@
+ Requires.private: @LIBOPENMPT_REQUIRES_PRIVATE@
+-Libs: -L${libdir} -lopenmpt
++Libs: -L${libdir} -lopenmpt -lvorbisfile
+ Libs.private: @LIBOPENMPT_LIBS_PRIVATE@
+ Cflags: -I${includedir}
+