mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
snapcast: fix hash
upstream included our patch in their re tagged 0.28.0
This commit is contained in:
parent
8b6155791f
commit
c5e4f09c00
@ -3,7 +3,7 @@
|
||||
|
||||
PKG_NAME="snapcast"
|
||||
PKG_VERSION="0.28.0"
|
||||
PKG_SHA256="ce7edf2db19835c0c4c2bf47af3bc3088a4740144df10fead9e7fb2741b8b51e"
|
||||
PKG_SHA256="86339627c7dbf3fec2d5b4ff0e07a45fe0a7aaa68bb7e19501ce307664eeb5cf"
|
||||
PKG_LICENSE="GPLv3"
|
||||
PKG_SITE="https://github.com/badaix/snapcast"
|
||||
PKG_URL="https://github.com/badaix/snapcast/archive/v${PKG_VERSION}.tar.gz"
|
||||
|
@ -1,62 +0,0 @@
|
||||
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(
|
Loading…
x
Reference in New Issue
Block a user