Merge LibreELEC 8.2.4 (#434)

* NOOBS: shorten partition labels, change tar filename [backport] * Fix Cinergy S2 USB Rev.4 * samba: fix synonyms in a custom config * samba: use documented browseable/writeable properties not synonyms * pastebinit: sprunge.us is worse than useless * linux: revert softirq commit, temporarily fix DVB issues See: https://forum.libreelec.tv/thread/4235-dvb-issue-since-le-switched-to-kernel-4-9-x/?postID=75965#post75965 * linux: add BayTrail patches * settings: update to include first-run repo fix * intel_nuc_led: initial package * options: add intel_nuc_led to Generic * config: set version to 8.2.3 * config: set version to devel * curl: update to curl-7.58.0 * webgrabplus: update to 2.1.5_beta * rust: update to 1.23.0 * librespot: update to bc7ceb3 * LibreELEC-settings: update to LibreELEC-settings-b73fb11 * brcmfmac_sdio-firmware-rpi: update to brcmfmac_sdio-firmware-rpi-c0d516c * librespot: update to 685fb4e * aixlog: initial package * asio: initial package * popl: initial package * shairport-sync: initial package * snapcast: initial package * snapclient: initial addon * snapserver: initial addon * licenses: add BSL * settings: bump version to 0768930 * RPi: update firmware to 6e3c5f8 * RPi: update firmware to 3347884 * samba: update to samba-4.6.14 * samba: fix build without ADS enabled https://lists.samba.org/archive/samba-technical/2017-December/124629.html * config: set version to 8.2.4 * config: set version to devel * Revert "linux: revert softirq commit, temporarily fix DVB issues" This reverts commit 728a03c.
libretro · Apr 1, 2018 · 3c449c9 · 3c449c9
1 parent 867ff9f
commit 3c449c9
Show file tree

Hide file tree

Showing 71 changed files with 2,228 additions and 376 deletions.
diff --git a/config/noobs/partitions.json b/config/noobs/partitions.json
@@ -1,15 +1,15 @@
 {
   "partitions": [
     {
-      "label":                     "@DISTRONAME@_@PROJECT@_System",
+      "label":                     "System",
       "filesystem_type":           "FAT",
       "partition_size_nominal":    @SYSTEM_SIZE@,
       "want_maximised":            false,
       "uncompressed_tarball_size": 120,
       "mkfs_options":              ""
     },
     {
-      "label":                     "@DISTRONAME@_@PROJECT@_Storage",
+      "label":                     "Storage",
       "filesystem_type":           "ext4",
       "partition_size_nominal":    512,
       "want_maximised":            true,

diff --git a/licenses/BSL.txt b/licenses/BSL.txt
@@ -0,0 +1,23 @@
+Boost Software License - Version 1.0 - August 17th, 2003
+
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff --git a/packages/addons/addon-depends/librespot-depends/rust/package.mk b/packages/addons/addon-depends/librespot-depends/rust/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="rust"
-PKG_VERSION="1.20.0"
+PKG_VERSION="1.23.0"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://www.rust-lang.org"

diff --git a/packages/addons/addon-depends/snapcast-depends/aixlog/package.mk b/packages/addons/addon-depends/snapcast-depends/aixlog/package.mk
@@ -0,0 +1,37 @@
+################################################################################
+#      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 <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="aixlog"
+PKG_VERSION="1.1.0"
+PKG_ARCH="any"
+PKG_LICENSE="MIT"
+PKG_SITE="https://github.com/badaix/aixlog"
+PKG_URL="https://github.com/badaix/aixlog/archive/v$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_SECTION="tools"
+PKG_LONGDESC="Header-only C++ logging library"
+PKG_IS_ADDON="no"
+PKG_USE_CMAKE="no"
+
+make_target() {
+  :
+}
+
+makeinstall_target() {
+  :
+}
diff --git a/packages/addons/addon-depends/snapcast-depends/asio/package.mk b/packages/addons/addon-depends/snapcast-depends/asio/package.mk
@@ -0,0 +1,36 @@
+################################################################################
+#      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 <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="asio"
+PKG_VERSION="9229964"
+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_DEPENDS_TARGET="toolchain"
+PKG_SECTION="tools"
+PKG_LONGDESC="Asio C++ Library"
+PKG_IS_ADDON="no"
+
+make_target() {
+  :
+}
+
+makeinstall_target() {
+  :
+}
diff --git a/packages/addons/addon-depends/snapcast-depends/popl/package.mk b/packages/addons/addon-depends/snapcast-depends/popl/package.mk
@@ -0,0 +1,37 @@
+################################################################################
+#      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 <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="popl"
+PKG_VERSION="1.0.0"
+PKG_ARCH="any"
+PKG_LICENSE="GPLv3"
+PKG_SITE="https://github.com/badaix/popl"
+PKG_URL="https://github.com/badaix/popl/archive/v$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_SECTION="tools"
+PKG_LONGDESC="Header-only C++ program options parser library"
+PKG_IS_ADDON="no"
+PKG_USE_CMAKE="no"
+
+make_target() {
+  :
+}
+
+makeinstall_target() {
+  :
+}
diff --git a/packages/addons/addon-depends/snapcast-depends/shairport-sync/package.mk b/packages/addons/addon-depends/snapcast-depends/shairport-sync/package.mk
@@ -0,0 +1,43 @@
+################################################################################
+#      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 <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="shairport-sync"
+PKG_VERSION="3.1.7"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="https://github.com/mikebrady/shairport-sync"
+PKG_URL="https://github.com/mikebrady/shairport-sync/archive/$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain alsa-lib avahi libconfig libdaemon openssl popt pulseaudio soxr"
+PKG_SECTION="tools"
+PKG_LONGDESC="AirPlay audio player"
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--with-alsa \
+                           --with-avahi \
+                           --with-convolution \
+                           --with-metadata \
+                           --with-pa \
+                           --with-pipe \
+                           --with-soxr \
+                           --with-ssl=openssl \
+                           --with-stdout"
+
+makeinstall_target() {
+  :
+}
diff --git a/packages/addons/addon-depends/snapcast-depends/snapcast/package.mk b/packages/addons/addon-depends/snapcast-depends/snapcast/package.mk
@@ -0,0 +1,42 @@
+################################################################################
+#      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 <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="snapcast"
+PKG_VERSION="0.13.0"
+PKG_ARCH="any"
+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_SECTION="tools"
+PKG_LONGDESC="Synchronous multi-room audio player"
+PKG_IS_ADDON="no"
+PKG_USE_CMAKE="no"
+
+pre_configure_target() {
+  cd ..
+  rm -rf .$TARGET_NAME
+  CXXFLAGS="$CXXFLAGS -pthread \
+                      -I$(get_build_dir aixlog)/include \
+                      -I$(get_build_dir asio)/asio/include \
+                      -I$(get_build_dir popl)/include"
+}
+
+makeinstall_target() {
+  :
+}
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
@@ -0,0 +1,30 @@
+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
+@@ -78,10 +78,8 @@
+
+ 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 -logg
+ 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
+@@ -84,10 +84,8 @@
+
+ else
+
+-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
+ OBJ      += ../common/daemon.o publishZeroConf/publishAvahi.o 
+
+ endif
diff --git a/packages/addons/service/librespot/changelog.txt b/packages/addons/service/librespot/changelog.txt
@@ -1,3 +1,13 @@
+110
+- Update to 685fb4e
+- Add kSupportsPlaylistV2 enum
+
+109
+- Refer librespot-org repository
+- Update to bc7ceb3
+- Set stream type to audio in Kodi mode
+- Initial volume as a setting
+
 108
 - Correct bug which prevented disabling the service from Kodi
 - Place named pipe in /var/run/librespot

diff --git a/packages/addons/service/librespot/package.mk b/packages/addons/service/librespot/package.mk
@@ -18,13 +18,13 @@
 ################################################################################
 
 PKG_NAME="librespot"
-PKG_VERSION="ddfc28f"
-PKG_REV="108"
+PKG_VERSION="685fb4e"
+PKG_REV="110"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
-PKG_SITE="https://github.com/plietar/$PKG_NAME/"
-PKG_URL="https://github.com/plietar/$PKG_NAME/archive/$PKG_VERSION.zip"
-PKG_DEPENDS_TARGET="toolchain avahi libvorbis pulseaudio pyalsaaudio rust"
+PKG_SITE="https://github.com/librespot-org/$PKG_NAME/"
+PKG_URL="https://github.com/librespot-org/$PKG_NAME/archive/$PKG_VERSION.zip"
+PKG_DEPENDS_TARGET="toolchain avahi pulseaudio pyalsaaudio rust"
 PKG_SECTION="service"
 PKG_SHORTDESC="Librespot: play Spotify through LibreELEC using a Spotify app as a remote"
 PKG_LONGDESC="Librespot ($PKG_VERSION) plays Spotify through LibreELEC using the open source librespot library using a Spotify app as a remote."
@@ -43,7 +43,7 @@ configure_target() {
 
 make_target() {
   cd src
-  $CARGO_BUILD --no-default-features --features "alsa-backend pulseaudio-backend"
+  $CARGO_BUILD --no-default-features --features "alsa-backend pulseaudio-backend with-dns-sd"
   cd "$PKG_BUILD/.$TARGET_NAME"/*/release
   $STRIP librespot
 }