mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge pull request #8808 from heitbaum/snapcast
snapcast: update to 0.28.0
This commit is contained in:
CvH
GitHub
commit
135ff16551
@ -2,19 +2,16 @@
|
||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="snapcast"
|
||||
PKG_VERSION="0.27.0"
|
||||
PKG_SHA256="c662c6eafbaa42a4797a4ed6ba4a7602332abf99f6ba6ea88ff8ae59978a86ba"
|
||||
PKG_VERSION="0.28.0"
|
||||
PKG_SHA256="ce7edf2db19835c0c4c2bf47af3bc3088a4740144df10fead9e7fb2741b8b51e"
|
||||
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 pulseaudio boost opus"
|
||||
PKG_LONGDESC="Synchronous multi-room audio player."
|
||||
PKG_TOOLCHAIN="make"
|
||||
PKG_BUILD_FLAGS="-sysroot"
|
||||
|
||||
pre_configure_target() {
|
||||
cd ..
|
||||
rm -rf .${TARGET_NAME}
|
||||
CXXFLAGS="${CXXFLAGS} -pthread \
|
||||
-I$(get_install_dir aixlog)/usr/include \
|
||||
-I$(get_install_dir asio)/usr/include \
|
||||
@ -23,5 +20,5 @@ pre_configure_target() {
|
||||
|
||||
makeinstall_target() {
|
||||
mkdir -p ${INSTALL}/usr/bin
|
||||
cp -p server/snapserver client/snapclient ${INSTALL}/usr/bin
|
||||
cp -p ../bin/{snapclient,snapserver} ${INSTALL}/usr/bin
|
||||
}
|
||||
|
||||
@ -0,0 +1,62 @@
|
||||
From d5bc61b0294ad98b8d00ee82576dd4451a888eef Mon Sep 17 00:00:00 2001
|
||||
From: Rudi Heitbaum <rudi@heitbaum.com>
|
||||
Date: Sun, 14 Apr 2024 16:02:18 +0000
|
||||
Subject: [PATCH] reorder ogg and vorbis library linking
|
||||
|
||||
if vorbis has been built to depend of ogg, when trying to
|
||||
statically link, the build of snapclient and snapserver fail.
|
||||
|
||||
reorder the libraries, to allow off symbols in vorbis to be
|
||||
resolved.
|
||||
---
|
||||
client/CMakeLists.txt | 14 +++++++-------
|
||||
server/CMakeLists.txt | 4 ++--
|
||||
2 files changed, 9 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
|
||||
index f3eb3cdf..2834b891 100644
|
||||
--- a/client/CMakeLists.txt
|
||||
+++ b/client/CMakeLists.txt
|
||||
@@ -76,13 +76,6 @@ if(ANDROID)
|
||||
list(APPEND CLIENT_LIBRARIES OpenSLES)
|
||||
|
||||
else()
|
||||
- # if OGG then tremor or vorbis
|
||||
- if(OGG_FOUND)
|
||||
- list(APPEND CLIENT_SOURCES decoder/ogg_decoder.cpp)
|
||||
- list(APPEND CLIENT_LIBRARIES ${OGG_LIBRARIES})
|
||||
- list(APPEND CLIENT_INCLUDE ${OGG_INCLUDE_DIRS})
|
||||
- endif(OGG_FOUND)
|
||||
-
|
||||
# Tremor (fixed-point) or libvorbis (floating-point)
|
||||
if(TREMOR_FOUND)
|
||||
list(APPEND CLIENT_LIBRARIES ${TREMOR_LIBRARIES})
|
||||
@@ -92,6 +85,13 @@ else()
|
||||
list(APPEND CLIENT_INCLUDE ${VORBIS_INCLUDE_DIRS})
|
||||
endif(TREMOR_FOUND)
|
||||
|
||||
+ # if OGG then tremor or vorbis
|
||||
+ if(OGG_FOUND)
|
||||
+ list(APPEND CLIENT_SOURCES decoder/ogg_decoder.cpp)
|
||||
+ list(APPEND CLIENT_LIBRARIES ${OGG_LIBRARIES})
|
||||
+ list(APPEND CLIENT_INCLUDE ${OGG_INCLUDE_DIRS})
|
||||
+ endif(OGG_FOUND)
|
||||
+
|
||||
if(FLAC_FOUND)
|
||||
list(APPEND CLIENT_SOURCES decoder/flac_decoder.cpp)
|
||||
list(APPEND CLIENT_LIBRARIES ${FLAC_LIBRARIES})
|
||||
diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
|
||||
index 59b7d090..dd7f6a47 100644
|
||||
--- a/server/CMakeLists.txt
|
||||
+++ b/server/CMakeLists.txt
|
||||
@@ -65,8 +65,8 @@ else()
|
||||
AND VORBIS_FOUND
|
||||
AND VORBISENC_FOUND)
|
||||
list(APPEND SERVER_SOURCES encoder/ogg_encoder.cpp)
|
||||
- list(APPEND SERVER_LIBRARIES ${OGG_LIBRARIES} ${VORBIS_LIBRARIES}
|
||||
- ${VORBISENC_LIBRARIES})
|
||||
+ list(APPEND SERVER_LIBRARIES ${VORBIS_LIBRARIES} ${VORBISENC_LIBRARIES}
|
||||
+ ${OGG_LIBRARIES})
|
||||
list(APPEND SERVER_INCLUDE ${OGG_INCLUDE_DIRS} ${VORBIS_INCLUDE_DIRS}
|
||||
${VORBISENC_INCLUDE_DIRS})
|
||||
endif(
|
||||
@ -1,23 +0,0 @@
|
||||
--- 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
|
||||
@@ -83,7 +83,6 @@
|
||||
|
||||
else
|
||||
|
||||
-CXX = g++
|
||||
CXXFLAGS += -pthread -DHAS_VORBIS -DHAS_ALSA -DHAS_PULSE -DHAS_AVAHI -DHAS_DAEMON
|
||||
-LDFLAGS += -lrt -lasound -lpulse -lvorbis -lavahi-client -lavahi-common -latomic
|
||||
+LDFLAGS += -lrt -lasound -lpulse -lvorbis -lavahi-client -lavahi-common -logg
|
||||
OBJ += ../common/daemon.o player/alsa_player.o player/pulse_player.o browseZeroConf/browse_avahi.o
|
||||
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
|
||||
@@ -88,7 +88,6 @@
|
||||
|
||||
else
|
||||
|
||||
-CXX = g++
|
||||
CXXFLAGS += -DHAS_AVAHI -DHAS_DAEMON -DHAS_ALSA -pthread
|
||||
-LDFLAGS += -lrt -lasound -lavahi-client -lavahi-common -latomic
|
||||
+LDFLAGS += -lrt -lasound -lavahi-client -lavahi-common
|
||||
OBJ += ../common/daemon.o publishZeroConf/publish_avahi.o streamreader/alsa_stream.o
|
||||
@ -1,11 +1,11 @@
|
||||
--- a/server/streamreader/airplay_stream.cpp 2021-12-22 17:40:36.000000000 +0000
|
||||
+++ b/server/streamreader/airplay_stream.cpp 2022-10-03 12:05:31.690039620 +0000
|
||||
@@ -58,7 +58,7 @@
|
||||
--- a/server/streamreader/airplay_stream.cpp 2024-04-14 10:33:22.000000000 +0000
|
||||
+++ b/server/streamreader/airplay_stream.cpp 2024-04-14 14:42:42.429301110 +0000
|
||||
@@ -56,7 +56,7 @@
|
||||
string devicename = uri_.getQuery("devicename", "Snapcast");
|
||||
string password = uri_.getQuery("password", "");
|
||||
|
||||
- params_wo_port_ = "\"--name=" + devicename + "\" --output=stdout --use-stderr --get-coverart";
|
||||
+ params_wo_port_ = "\"--name=" + devicename + "\" --output=stdout --use-stderr --get-coverart --mdns=avahi";
|
||||
- params_wo_port_ = "\"--name=" + devicename + "\" --output=stdout --get-coverart";
|
||||
+ params_wo_port_ = "\"--name=" + devicename + "\" --output=stdout --get-coverart --mdns=avahi";
|
||||
if (!password.empty())
|
||||
params_wo_port_ += " --password \"" + password + "\"";
|
||||
if (!params_.empty())
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
From 73c75ccb8eb20aa1514e8c86deb859e70bc63290 Mon Sep 17 00:00:00 2001
|
||||
From: Sam James <sam@gentoo.org>
|
||||
Date: Sat, 15 Apr 2023 10:20:47 +0100
|
||||
Subject: [PATCH] Fix build with GCC 13
|
||||
|
||||
GCC 13 (as usual for new compiler releases) shuffles around some internal includes so some
|
||||
are no longer transitively included.
|
||||
|
||||
See https://gnu.org/software/gcc/gcc-13/porting_to.html.
|
||||
|
||||
Bug: https://bugs.gentoo.org/894742
|
||||
---
|
||||
common/sample_format.hpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/common/sample_format.hpp b/common/sample_format.hpp
|
||||
index 900655f7..b68d00a3 100644
|
||||
--- a/common/sample_format.hpp
|
||||
+++ b/common/sample_format.hpp
|
||||
@@ -19,6 +19,7 @@
|
||||
#ifndef SAMPLE_FORMAT_H
|
||||
#define SAMPLE_FORMAT_H
|
||||
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="snapclient"
|
||||
PKG_VERSION="0.27.0"
|
||||
PKG_REV="0"
|
||||
PKG_VERSION="0.28.0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPLv3"
|
||||
PKG_DEPENDS_TARGET="toolchain alsa-plugins snapcast"
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="snapserver"
|
||||
PKG_VERSION="0.27.0"
|
||||
PKG_REV="0"
|
||||
PKG_VERSION="0.28.0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPLv3"
|
||||
PKG_DEPENDS_TARGET="toolchain nqptp shairport-sync snapcast"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user