Merge pull request #4808 from heitbaum/snap

Update snapcast addons to 0.22.0 (103) and their dependencies

packages/addons/addon-depends/snapcast-depends/aixlog/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="aixlog"
-PKG_VERSION="1.2.1"
+PKG_VERSION="1.4.0"
-PKG_SHA256="3ed6f47b3658607edfd94faf98034d31906b0f04f3fe4355e87a16f8dd582384"
+PKG_SHA256="cce5b8f5408cfd19b4d4eb678274d0c74490dc0eb2bdc8f97c852036897d6099"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/badaix/aixlog"
 PKG_URL="https://github.com/badaix/aixlog/archive/v$PKG_VERSION.tar.gz"

packages/addons/addon-depends/snapcast-depends/asio/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="asio"
-PKG_VERSION="1.12.0"
+PKG_VERSION="1.18.1"
-PKG_SHA256="3b3f2e38ac18f9a20a405c0852c90e8b637b7733c520829ddc80937d2ee7a5ec"
+PKG_SHA256="01e4c72985af0e19378e763d513ddc0c61886bc14556a14dd4220eb18304c383"
 PKG_LICENSE="BSL"
 PKG_SITE="http://think-async.com/Asio"
 PKG_URL="https://github.com/chriskohlhoff/asio/archive/asio-${PKG_VERSION//./-}.zip"

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="shairport-sync"
-PKG_VERSION="3.3.6"
+PKG_VERSION="3.3.7"
-PKG_SHA256="a8382affd25c473fa38ead5690148c6c3902098f359f9c881eefe139e1f49f49"
+PKG_SHA256="7f8d4ecec53f2f681a962467bf09205568fc936c8c31a9ee07b1bd72d3d95b12"
 PKG_LICENSE="OSS"
 PKG_SITE="https://github.com/mikebrady/shairport-sync"
 PKG_URL="https://github.com/mikebrady/shairport-sync/archive/$PKG_VERSION.tar.gz"

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

@@ -2,12 +2,12 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="snapcast"
-PKG_VERSION="0.15.0"
+PKG_VERSION="0.22.0"
-PKG_SHA256="7c584fad4941a299339fe060174e33c4d810b1cbe80d6efbee54da3dafb252cc"
+PKG_SHA256="b5156f346c32557bc1347c81fd5071fd4a32be61adc582e63323c11b105c9ff6"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/badaix/snapcast"
 PKG_URL="https://github.com/badaix/snapcast/archive/v$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain aixlog alsa-lib asio avahi flac libvorbis popl"
+PKG_DEPENDS_TARGET="toolchain aixlog alsa-lib asio avahi flac libvorbis popl boost opus"
 PKG_LONGDESC="Synchronous multi-room audio player."
 PKG_TOOLCHAIN="make"
 PKG_BUILD_FLAGS="-sysroot"

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

@@ -1,29 +1,23 @@
 --- 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 @@
+@@ -83,7 +83,6 @@
  
  else
  
 -CXX       = g++
--STRIP     = strip
  CXXFLAGS += -pthread -DHAS_VORBIS -DHAS_ALSA -DHAS_AVAHI -DHAS_DAEMON
--LDFLAGS  += -lrt -lasound -lvorbis -lavahi-client -lavahi-common -static-libgcc -static-libstdc++ -latomic
+-LDFLAGS  += -lrt -lasound -lvorbis -lavahi-client -lavahi-common -latomic
 +LDFLAGS  += -lrt -lasound -lvorbis -lavahi-client -lavahi-common -logg
- OBJ      += ../common/daemon.o player/alsaPlayer.o browseZeroConf/browseAvahi.o
+ OBJ      += ../common/daemon.o player/alsa_player.o browseZeroConf/browse_avahi.o
- 
- endif
 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 @@
+@@ -88,7 +88,6 @@
  
  else
  
 -CXX       = g++
--STRIP     = strip
+ CXXFLAGS += -DHAS_AVAHI -DHAS_DAEMON -DHAS_ALSA -pthread
- CXXFLAGS += -DHAS_AVAHI -DHAS_DAEMON -pthread
+-LDFLAGS  += -lrt -lasound -lavahi-client -lavahi-common -latomic
--LDFLAGS  += -lrt -lavahi-client -lavahi-common -static-libgcc -static-libstdc++
++LDFLAGS  += -lrt -lasound -lavahi-client -lavahi-common
-+LDFLAGS  += -lrt -lavahi-client -lavahi-common -logg
+ OBJ      += ../common/daemon.o publishZeroConf/publish_avahi.o streamreader/alsa_stream.o
- OBJ      += ../common/daemon.o publishZeroConf/publishAvahi.o 
- 
- endif

packages/addons/service/snapclient/changelog.txt

@@ -1,3 +1,6 @@
+103
+- Update to 0.22.0
+
 102
 - Update to 0.15.0
 - Add alsa-plugins

packages/addons/service/snapclient/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="snapclient"
-PKG_VERSION="0.15.0"
+PKG_VERSION="0.22.0"
-PKG_REV="102"
+PKG_REV="103"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
 PKG_DEPENDS_TARGET="toolchain alsa-plugins snapcast"

packages/addons/service/snapserver/changelog.txt

@@ -1,3 +1,6 @@
+103
+- Update to 0.22.0
+
 102
 - Update to 0.15.0
 

packages/addons/service/snapserver/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="snapserver"
-PKG_VERSION="0.15.0"
+PKG_VERSION="0.22.0"
-PKG_REV="102"
+PKG_REV="103"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
 PKG_DEPENDS_TARGET="toolchain shairport-sync snapcast"