From 2b10e19a36fae78af43d08fca5a8755c05784112 Mon Sep 17 00:00:00 2001 From: CvH Date: Tue, 8 May 2018 23:47:40 +0200 Subject: [PATCH] mpd: update to 0.20.19 - adds mpd cli client (mpc) --- .../addons/addon-depends/mpd-mpc/package.mk | 33 +++++++++++++++++++ packages/addons/service/mpd/changelog.txt | 4 +++ packages/addons/service/mpd/package.mk | 10 +++--- .../addons/service/mpd/source/bin/mpd.start | 17 +++++----- packages/addons/service/mpd/source/default.py | 18 +++++----- .../resources/language/English/strings.po | 14 ++++++++ .../resources/language/English/strings.xml | 5 --- .../service/mpd/source/resources/settings.xml | 4 +-- .../service/mpd/source/settings-default.xml | 4 +-- .../service/mpd/source/sleep.d/mpd.power | 17 +++++----- 10 files changed, 85 insertions(+), 41 deletions(-) create mode 100644 packages/addons/addon-depends/mpd-mpc/package.mk create mode 100644 packages/addons/service/mpd/source/resources/language/English/strings.po delete mode 100644 packages/addons/service/mpd/source/resources/language/English/strings.xml diff --git a/packages/addons/addon-depends/mpd-mpc/package.mk b/packages/addons/addon-depends/mpd-mpc/package.mk new file mode 100644 index 0000000000..3b6b3a7b53 --- /dev/null +++ b/packages/addons/addon-depends/mpd-mpc/package.mk @@ -0,0 +1,33 @@ +################################################################################ +# This file is part of LibreELEC - https://libreelec.tv +# Copyright (C) 2018-present Team LibreELEC +# +# LibreELEC is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# LibreELEC is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with LibreELEC. If not, see . +################################################################################ + +PKG_NAME="mpd-mpc" +PKG_VERSION="0.30" +PKG_SHA256="65fc5b0a8430efe9acbe6e261127960682764b20ab994676371bdc797d867fce" +PKG_ARCH="any" +PKG_LICENSE="GPL" +PKG_SITE="https://www.musicpd.org" +PKG_URL="https://www.musicpd.org/download/mpc/0/mpc-${PKG_VERSION}.tar.xz" +PKG_SOURCE_DIR="mpc-${PKG_VERSION}*" +PKG_DEPENDS_TARGET="toolchain libiconv" +PKG_LONGDESC="Command-line client for MPD" +PKG_TOOLCHAIN="meson" + +makeinstall_target() { + : +} diff --git a/packages/addons/service/mpd/changelog.txt b/packages/addons/service/mpd/changelog.txt index 295c35bf12..2e01a4f35a 100644 --- a/packages/addons/service/mpd/changelog.txt +++ b/packages/addons/service/mpd/changelog.txt @@ -1,3 +1,7 @@ +105 +- updated mpd to 0.20.19 +- added mpd cli client mpc + 104 - update mpd to 0.20.13 - build with more features diff --git a/packages/addons/service/mpd/package.mk b/packages/addons/service/mpd/package.mk index 3867a2cbf2..a91a859208 100644 --- a/packages/addons/service/mpd/package.mk +++ b/packages/addons/service/mpd/package.mk @@ -18,15 +18,15 @@ ################################################################################ PKG_NAME="mpd" -PKG_VERSION="0.20.13" -PKG_SHA256="46c1c534d80a52de00263e8ef43a6011ff9d765232443749539ef26b1b48ff40" -PKG_REV="104" +PKG_VERSION="0.20.19" +PKG_SHA256="01cdef1b9217588a8fa64dc2cba900c138e1363a787837b4c8327c652b7956c3" +PKG_REV="105" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://www.musicpd.org" PKG_URL="http://www.musicpd.org/download/${PKG_NAME}/${PKG_VERSION%.*}/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain alsa-lib boost curl faad2 ffmpeg flac glib lame libcdio libiconv libid3tag \ - libmad libmpdclient libsamplerate libvorbis libnfs libogg opus pulseaudio samba yajl" + 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" PKG_LONGDESC="Music Player Daemon ($PKG_VERSION) is a flexible and powerful server-side application for playing music" @@ -112,6 +112,8 @@ makeinstall_target() { addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin cp -P $PKG_BUILD/.$TARGET_NAME/src/mpd $ADDON_BUILD/$PKG_ADDON_ID/bin + # copy mpd cli binary + cp -P $(get_build_dir mpd-mpc)/.$TARGET_NAME/mpc $ADDON_BUILD/$PKG_ADDON_ID/bin mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib cp -p $(get_build_dir libmpdclient)/.install_pkg/usr/lib/libmpdclient.so $ADDON_BUILD/$PKG_ADDON_ID/lib diff --git a/packages/addons/service/mpd/source/bin/mpd.start b/packages/addons/service/mpd/source/bin/mpd.start index d6a7bc36f1..320946b1a1 100755 --- a/packages/addons/service/mpd/source/bin/mpd.start +++ b/packages/addons/service/mpd/source/bin/mpd.start @@ -1,23 +1,22 @@ #!/bin/sh ################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv +# This file is part of LibreELEC - https://libreelec.tv +# Copyright (C) 2016-present Team LibreELEC # Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) # -# This Program is free software; you can redistribute it and/or modify +# LibreELEC is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. # -# This Program is distributed in the hope that it will be useful, +# LibreELEC is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to the -# Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html +# along with LibreELEC. If not, see . ################################################################################ . /etc/profile diff --git a/packages/addons/service/mpd/source/default.py b/packages/addons/service/mpd/source/default.py index 6f814651a2..9cba488d77 100644 --- a/packages/addons/service/mpd/source/default.py +++ b/packages/addons/service/mpd/source/default.py @@ -1,19 +1,17 @@ ################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) +# This file is part of LibreELEC - https://libreelec.tv +# Copyright (C) 2016-present Team LibreELEC # -# This Program is free software; you can redistribute it and/or modify +# LibreELEC is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. # -# This Program is distributed in the hope that it will be useful, +# LibreELEC is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html +# along with LibreELEC. If not, see . ################################################################################ diff --git a/packages/addons/service/mpd/source/resources/language/English/strings.po b/packages/addons/service/mpd/source/resources/language/English/strings.po new file mode 100644 index 0000000000..49c8a143f2 --- /dev/null +++ b/packages/addons/service/mpd/source/resources/language/English/strings.po @@ -0,0 +1,14 @@ +# Kodi Media Center language file +# Addon Name: mpd +# Addon id: service.mpd +# Addon Provider: Team LibreELEC +msgid "" +msgstr "" + +msgctxt "#30000" +msgid "General" +msgstr "" + +msgctxt "#30001" +msgid "Restart on suspend / resume" +msgstr "" diff --git a/packages/addons/service/mpd/source/resources/language/English/strings.xml b/packages/addons/service/mpd/source/resources/language/English/strings.xml deleted file mode 100644 index d388c262c1..0000000000 --- a/packages/addons/service/mpd/source/resources/language/English/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - General - Restart on suspend / resume - diff --git a/packages/addons/service/mpd/source/resources/settings.xml b/packages/addons/service/mpd/source/resources/settings.xml index ae2693c874..8d6356f46e 100644 --- a/packages/addons/service/mpd/source/resources/settings.xml +++ b/packages/addons/service/mpd/source/resources/settings.xml @@ -1,8 +1,8 @@ - + - + diff --git a/packages/addons/service/mpd/source/settings-default.xml b/packages/addons/service/mpd/source/settings-default.xml index f5afe2c799..1bffc87a42 100644 --- a/packages/addons/service/mpd/source/settings-default.xml +++ b/packages/addons/service/mpd/source/settings-default.xml @@ -1,3 +1,3 @@ - - + + true diff --git a/packages/addons/service/mpd/source/sleep.d/mpd.power b/packages/addons/service/mpd/source/sleep.d/mpd.power index 1ba5ab37c6..a0f3fdac5a 100644 --- a/packages/addons/service/mpd/source/sleep.d/mpd.power +++ b/packages/addons/service/mpd/source/sleep.d/mpd.power @@ -1,23 +1,22 @@ #!/bin/sh ################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv +# This file is part of LibreELEC - https://libreelec.tv +# Copyright (C) 2016-present Team LibreELEC # Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) # -# This Program is free software; you can redistribute it and/or modify +# LibreELEC is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. # -# This Program is distributed in the hope that it will be useful, +# LibreELEC is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html +# along with LibreELEC. If not, see . ################################################################################ . /etc/profile