diff --git a/packages/addons/addon-depends/snapcast-depends/aixlog/package.mk b/packages/addons/addon-depends/snapcast-depends/aixlog/package.mk index 721dd28cc2..75c0f4ff39 100644 --- a/packages/addons/addon-depends/snapcast-depends/aixlog/package.mk +++ b/packages/addons/addon-depends/snapcast-depends/aixlog/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="aixlog" -PKG_VERSION="1.1.0" +PKG_VERSION="1.2.1" PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="https://github.com/badaix/aixlog" diff --git a/packages/addons/addon-depends/snapcast-depends/alsa-plugins/package.mk b/packages/addons/addon-depends/snapcast-depends/alsa-plugins/package.mk new file mode 100644 index 0000000000..89fa93d6a3 --- /dev/null +++ b/packages/addons/addon-depends/snapcast-depends/alsa-plugins/package.mk @@ -0,0 +1,36 @@ +################################################################################ +# This file is part of LibreELEC - https://libreelec.tv +# Copyright (C) 2018-present Team LibreELEC +# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# +# 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="alsa-plugins" +PKG_VERSION="1.1.6" +PKG_ARCH="any" +PKG_LICENSE="GPL" +PKG_SITE="http://www.alsa-project.org/" +PKG_URL="ftp://ftp.alsa-project.org/pub/plugins/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_DEPENDS_TARGET="toolchain alsa-lib" +PKG_LONGDESC="Alsa plugins" + +if [ "$PULSEAUDIO_SUPPORT" = yes ]; then + PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET pulseaudio" + SUBDIR_PULSEAUDIO="pulse" +fi + +PKG_CONFIGURE_OPTS_TARGET="--with-plugindir=/usr/lib/alsa" +PKG_MAKE_OPTS_TARGET="SUBDIRS=$SUBDIR_PULSEAUDIO" +PKG_MAKEINSTALL_OPTS_TARGET="SUBDIRS=$SUBDIR_PULSEAUDIO" diff --git a/packages/addons/addon-depends/snapcast-depends/asio/package.mk b/packages/addons/addon-depends/snapcast-depends/asio/package.mk index 955616452e..ca774dbfe4 100644 --- a/packages/addons/addon-depends/snapcast-depends/asio/package.mk +++ b/packages/addons/addon-depends/snapcast-depends/asio/package.mk @@ -17,11 +17,12 @@ ################################################################################ PKG_NAME="asio" -PKG_VERSION="9229964" +PKG_VERSION="1-12-0" PKG_ARCH="any" PKG_LICENSE="BSL" PKG_SITE="http://think-async.com/Asio" -PKG_URL="https://github.com/chriskohlhoff/asio/archive/$PKG_VERSION.zip" +PKG_URL="https://github.com/chriskohlhoff/asio/archive/asio-$PKG_VERSION.zip" +PKG_SOURCE_DIR="asio-asio-$PKG_VERSION" PKG_DEPENDS_TARGET="toolchain" PKG_SECTION="tools" PKG_LONGDESC="Asio C++ Library" diff --git a/packages/addons/addon-depends/snapcast-depends/popl/package.mk b/packages/addons/addon-depends/snapcast-depends/popl/package.mk index 68c1038590..a468933fcc 100644 --- a/packages/addons/addon-depends/snapcast-depends/popl/package.mk +++ b/packages/addons/addon-depends/snapcast-depends/popl/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="popl" -PKG_VERSION="1.0.0" +PKG_VERSION="1.2.0" PKG_ARCH="any" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/badaix/popl" diff --git a/packages/addons/addon-depends/snapcast-depends/shairport-sync/package.mk b/packages/addons/addon-depends/snapcast-depends/shairport-sync/package.mk index 6a8651a9e8..6d2b6da250 100644 --- a/packages/addons/addon-depends/snapcast-depends/shairport-sync/package.mk +++ b/packages/addons/addon-depends/snapcast-depends/shairport-sync/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="shairport-sync" -PKG_VERSION="3.1.7" +PKG_VERSION="3.2" PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="https://github.com/mikebrady/shairport-sync" diff --git a/packages/addons/addon-depends/snapcast-depends/snapcast/package.mk b/packages/addons/addon-depends/snapcast-depends/snapcast/package.mk index 1df659d2ca..cbcb40351c 100644 --- a/packages/addons/addon-depends/snapcast-depends/snapcast/package.mk +++ b/packages/addons/addon-depends/snapcast-depends/snapcast/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="snapcast" -PKG_VERSION="0.13.0" +PKG_VERSION="0.15.0" PKG_ARCH="any" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/badaix/snapcast" diff --git a/packages/addons/addon-depends/snapcast-depends/snapcast/patches/snapcast-01_makefiles.patch b/packages/addons/addon-depends/snapcast-depends/snapcast/patches/snapcast-01_makefiles.patch index e9fada239e..2ae5c85dbd 100644 --- a/packages/addons/addon-depends/snapcast-depends/snapcast/patches/snapcast-01_makefiles.patch +++ b/packages/addons/addon-depends/snapcast-depends/snapcast/patches/snapcast-01_makefiles.patch @@ -1,6 +1,5 @@ -diff -Naur snapcast-0.13.0/client/Makefile snapcast-0.13.0.Makefiles/client/Makefile ---- snapcast-0.13.0/client/Makefile 2018-03-04 21:43:32.000000000 +0100 -+++ snapcast-0.13.0.Makefiles/client/Makefile 2018-03-05 13:33:36.686709820 +0100 +--- snapcast-0.14.0/client/Makefile 2018-04-27 19:43:25.000000000 +0200 ++++ snapcast-0.14.0.makefiles/client/Makefile 2018-05-21 13:14:12.388757526 +0200 @@ -78,10 +78,8 @@ else @@ -13,9 +12,9 @@ diff -Naur snapcast-0.13.0/client/Makefile snapcast-0.13.0.Makefiles/client/Make OBJ += ../common/daemon.o player/alsaPlayer.o browseZeroConf/browseAvahi.o endif -diff -Naur snapcast-0.13.0/server/Makefile snapcast-0.13.0.Makefiles/server/Makefile ---- snapcast-0.13.0/server/Makefile 2018-03-04 21:43:32.000000000 +0100 -+++ snapcast-0.13.0.Makefiles/server/Makefile 2018-03-05 13:34:03.530858350 +0100 +diff -Naur snapcast-0.14.0/server/Makefile snapcast-0.14.0.makefiles/server/Makefile +--- snapcast-0.14.0/server/Makefile 2018-04-27 19:43:25.000000000 +0200 ++++ snapcast-0.14.0.makefiles/server/Makefile 2018-05-21 13:14:56.881206277 +0200 @@ -84,10 +84,8 @@ else @@ -23,8 +22,8 @@ diff -Naur snapcast-0.13.0/server/Makefile snapcast-0.13.0.Makefiles/server/Make -CXX = g++ -STRIP = strip CXXFLAGS += -DHAS_AVAHI -DHAS_DAEMON -pthread --LDFLAGS = -lrt -lvorbis -lvorbisenc -logg -lFLAC -lavahi-client -lavahi-common -static-libgcc -static-libstdc++ -+LDFLAGS = -lrt -lvorbis -lvorbisenc -logg -lFLAC -lavahi-client -lavahi-common +-LDFLAGS += -lrt -lavahi-client -lavahi-common -static-libgcc -static-libstdc++ ++LDFLAGS += -lrt -lavahi-client -lavahi-common -logg OBJ += ../common/daemon.o publishZeroConf/publishAvahi.o endif diff --git a/packages/addons/service/snapclient/changelog.txt b/packages/addons/service/snapclient/changelog.txt index 506b29b22d..cefa2a9d7b 100644 --- a/packages/addons/service/snapclient/changelog.txt +++ b/packages/addons/service/snapclient/changelog.txt @@ -1,3 +1,7 @@ +102 +- Update to 0.15.0 +- Add alsa-plugins + 101 - Always restart service - Improve latency setting diff --git a/packages/addons/service/snapclient/package.mk b/packages/addons/service/snapclient/package.mk index 8320360062..b734ac01c5 100644 --- a/packages/addons/service/snapclient/package.mk +++ b/packages/addons/service/snapclient/package.mk @@ -17,11 +17,11 @@ ################################################################################ PKG_NAME="snapclient" -PKG_VERSION="0.13.0" -PKG_REV="101" +PKG_VERSION="0.15.0" +PKG_REV="102" PKG_ARCH="any" PKG_LICENSE="GPLv3" -PKG_DEPENDS_TARGET="toolchain snapcast" +PKG_DEPENDS_TARGET="toolchain alsa-plugins snapcast" PKG_SECTION="service" PKG_SHORTDESC="Snapclient: Synchronous multi-room audio client" PKG_LONGDESC="Snapclient ($PKG_VERSION) is a Snapcast client. Snapcast is a multi-room client-server audio system, where all clients are time synchronized with the server to play perfectly synced audioplays." @@ -44,4 +44,8 @@ addon() { mkdir -p "$ADDON_BUILD/$PKG_ADDON_ID/bin" cp "$(get_build_dir snapcast)/client/snapclient" \ "$ADDON_BUILD/$PKG_ADDON_ID/bin" + + mkdir -p "$ADDON_BUILD/$PKG_ADDON_ID/lib" + cp "$(get_build_dir alsa-plugins)/.install_pkg/usr/lib/alsa"/*.so \ + "$ADDON_BUILD/$PKG_ADDON_ID/lib" } diff --git a/packages/addons/service/snapserver/changelog.txt b/packages/addons/service/snapserver/changelog.txt index b2c0fa1580..8981fddc4a 100644 --- a/packages/addons/service/snapserver/changelog.txt +++ b/packages/addons/service/snapserver/changelog.txt @@ -1,3 +1,6 @@ +102 +- Update to 0.15.0 + 101 - Add streaming from Kodi - Keep daemon state diff --git a/packages/addons/service/snapserver/package.mk b/packages/addons/service/snapserver/package.mk index 4598ecbcf3..2596ed35ec 100644 --- a/packages/addons/service/snapserver/package.mk +++ b/packages/addons/service/snapserver/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="snapserver" -PKG_VERSION="0.13.0" -PKG_REV="101" +PKG_VERSION="0.15.0" +PKG_REV="102" PKG_ARCH="any" PKG_LICENSE="GPLv3" PKG_DEPENDS_TARGET="toolchain shairport-sync snapcast"