Merge pull request #3272 from CvH/9.0/mpd-fix

mpd: change to meson

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

@@ -1,15 +1,19 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libid3tag"
 PKG_VERSION="0.15.1b"
 PKG_SHA256="63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151"
 PKG_LICENSE="GPL"
-PKG_SITE="http://www.mars.org/home/rob/proj/mpeg/"
+PKG_SITE="https://www.underbit.com/products/mad/"
-PKG_URL="$SOURCEFORGE_SRC/mad/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="ftp://ftp.mars.org/pub/mpeg/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain zlib"
 PKG_LONGDESC="A library for id3 tagging."
 
-PKG_MAINTAINER="Lukas Sabota (LTsmooth42@gmail.com)"
+PKG_CONFIGURE_OPTS_TARGET="--enable-static \
+                           --disable-shared"
 
-PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"
+post_makeinstall_target(){
+ cp $PKG_BUILD/id3tag.pc $SYSROOT_PREFIX/usr/lib/pkgconfig
+}

packages/addons/addon-depends/libid3tag/sources/id3tag.pc

@@ -0,0 +1,10 @@
+prefix=/usr
+exec_prefix=/usr/bin
+libdir=/usr/lib
+includedir=/usr/include
+
+Name: ID3TAG
+Description: libid3tag - ID3 tag manipulation library
+Version: 0.15.1b
+Libs: -L${libdir} -lid3tag -lz
+Cflags:

packages/addons/service/mpd/package.mk

@@ -10,7 +10,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.musicpd.org"
 PKG_URL="http://www.musicpd.org/download/mpd/${PKG_VERSION%.*}/mpd-${PKG_VERSION}.tar.xz"
-PKG_DEPENDS_TARGET="toolchain alsa-lib boost curl faad2 ffmpeg flac glib lame libcdio libiconv libid3tag \
+PKG_DEPENDS_TARGET="toolchain alsa-lib avahi boost curl faad2 ffmpeg flac glib lame libcdio libiconv libid3tag \
                     libmad libmpdclient libsamplerate libvorbis libnfs libogg mpd-mpc opus pulseaudio samba yajl"
 PKG_SECTION="service.multimedia"
 PKG_SHORTDESC="Music Player Daemon (MPD): a free and open Music Player Server"
@@ -20,71 +20,78 @@ PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Music Player Daemon (MPD)"
 PKG_ADDON_TYPE="xbmc.service"
 
-PKG_CONFIGURE_OPTS_TARGET=" \
+PKG_MESON_OPTS_TARGET=" \
-  --enable-aac \
+  -Dadplug=disabled \
-  --disable-adplug \
+  -Dalsa=enabled \
-  --enable-alsa \
+  -Dao=disabled \
-  --disable-ao \
+  -Daudiofile=disabled \
-  --disable-audiofile \
+  -Dbzip2=enabled \
-  --enable-bzip2 \
+  -Dcdio_paranoia=disabled \
-  --disable-cdio-paranoia \
+  -Dchromaprint=disabled \
-  --enable-cue \
+  -Dcue=true \
-  --enable-curl \
+  -Dcurl=enabled \
-  --enable-database \
+  -Ddatabase=true \
-  --disable-debug \
+  -Ddocumentation=false \
-  --disable-documentation \
+  -Ddsd=true \
-  --enable-expat \
+  -Dexpat=enabled \
-  --enable-ffmpeg \
+  -Dfaad=enabled \
-  --enable-flac \
+  -Dffmpeg=enabled \
-  --disable-fluidsynth \
+  -Dfifo=false \
-  --disable-gme \
+  -Dflac=enabled \
-  --disable-haiku \
+  -Dfluidsynth=disabled \
-  --enable-httpd-output \
+  -Dgme=disabled \
-  --enable-iconv \
+  -Dhttpd=true \
-  --disable-icu \
+  -Diconv=disabled \
-  --enable-id3 \
+  -Dicu=disabled \
-  --enable-iso9660 \
+  -Did3tag=enabled \
-  --disable-jack \
+  -Dipv6=enabled \
-  --enable-lame-encoder \
+  -Diso9660=enabled \
-  --enable-libmpdclient \
+  -Djack=disabled \
-  --disable-libwrap \
+  -Dlame=enabled \
-  --enable-lsr \
+  -Dlibmpdclient=enabled \
-  --enable-mad \
+  -Dlibsamplerate=enabled \
-  --disable-mikmod \
+  -Dlocal_socket=false \
-  --disable-mms \
+  -Dmad=enabled \
-  --disable-modplug \
+  -Dmikmod=disabled \
-  --disable-mpc \
+  -Dmms=disabled \
-  --disable-mpg123 \
+  -Dmodplug=disabled \
-  --enable-nfs \
+  -Dmpcdec=disabled \
-  --disable-openal \
+  -Dmpg123=disabled \
-  --enable-opus \
+  -Dneighbor=false \
-  --disable-oss \
+  -Dnfs=enabled \
-  --enable-pipe-output \
+  -Dopenal=disabled \
-  --enable-pulse \
+  -Dopus=enabled \
-  --disable-recorder-output \
+  -Doss=disabled \
-  --disable-roar \
+  -Dpipe=true \
-  --disable-shout \
+  -Dpulse=enabled \
-  --disable-shine-encoder \
+  -Dqobuz=enabled \
-  --disable-sidplay \
+  -Drecorder=false \
-  --enable-smbclient \
+  -Dshine=disabled \
-  --enable-sndfile \
+  -Dshout=disabled \
-  --disable-sndio \
+  -Dsidplay=disabled \
-  --disable-solaris-output \
+  -Dsmbclient=enabled \
-  --enable-soundcloud \
+  -Dsndfile=enabled \
-  --enable-soxr \
+  -Dsndio=disabled \
-  --enable-sqlite \
+  -Dsolaris_output=disabled \
-  --disable-syslog \
+  -Dsoundcloud=enabled \
-  --disable-systemd-daemon \
+  -Dsoxr=enabled \
-  --disable-test \
+  -Dsqlite=enabled \
-  --disable-twolame-encoder \
+  -Dsyslog=disabled \
-  --disable-upnp \
+  -Dsystemd=disabled \
-  --enable-vorbis \
+  -Dtest=false \
-  --enable-vorbis-encoder \
+  -Dtidal=enabled \
-  --disable-wavpack \
+  -Dtwolame=disabled \
-  --enable-webdav \
+  -Dupnp=disabled \
-  --disable-wildmidi \
+  -Dvorbis=enabled \
-  --enable-zlib \
+  -Dvorbisenc=enabled \
-  --with-zeroconf=no"
+  -Dwave_encoder=true \
+  -Dwavpack=disabled \
+  -Dwebdav=enabled \
+  -Dwildmidi=disabled \
+  -Dyajl=enabled \
+  -Dzeroconf=avahi \
+  -Dzlib=enabled \
+  -Dzzip=disabled"
 
 pre_configure_target() {
   export LIBS="$LIBS -logg -lFLAC -ldl"