jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2717 from awiouy/82-snapcast-14

Browse Source 
snapcast: backport of #2716
This commit is contained in:
Christian Hewitt 2018-07-12 01:04:46 +04:00 committed by GitHub
commit 4b72147729
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 66 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/addons/addon-depends/snapcast-depends/aixlog/package.mk
View File

@ -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"

36
packages/addons/addon-depends/snapcast-depends/alsa-plugins/package.mk Normal file
View File

@ -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 <http://www.gnu.org/licenses/>.
################################################################################
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"

5
packages/addons/addon-depends/snapcast-depends/asio/package.mk
View File

@ -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"

2
packages/addons/addon-depends/snapcast-depends/popl/package.mk
View File

@ -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"

2
packages/addons/addon-depends/snapcast-depends/shairport-sync/package.mk
View File

@ -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"

2
packages/addons/addon-depends/snapcast-depends/snapcast/package.mk
View File

@ -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"

15
packages/addons/addon-depends/snapcast-depends/snapcast/patches/snapcast-01_makefiles.patch
View File

@ -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

4
packages/addons/service/snapclient/changelog.txt
View File

@ -1,3 +1,7 @@
102
- Update to 0.15.0
- Add alsa-plugins
101
- Always restart service
- Improve latency setting

10
packages/addons/service/snapclient/package.mk
View File

@ -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"
}

3
packages/addons/service/snapserver/changelog.txt
View File

@ -1,3 +1,6 @@
102
- Update to 0.15.0
101
- Add streaming from Kodi
- Keep daemon state

4
packages/addons/service/snapserver/package.mk
View File

@ -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"