commit: 89547824da6b29fa835a747c4e45de06ec6fae95 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Feb 15 17:01:04 2026 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Feb 16 19:24:36 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89547824
media-sound/snapcast: drop 0.31.0 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-sound/snapcast/Manifest | 1 - .../files/snapcast-0.31.0-boost-1.88-fixup.patch | 257 --------------------- .../files/snapcast-0.31.0-boost-1.88.patch | 55 ----- .../snapcast/files/snapcast-0.31.0-drop-lint.patch | 12 - media-sound/snapcast/snapcast-0.31.0.ebuild | 85 ------- 5 files changed, 410 deletions(-) diff --git a/media-sound/snapcast/Manifest b/media-sound/snapcast/Manifest index 86960e37e41d..a688ca34006b 100644 --- a/media-sound/snapcast/Manifest +++ b/media-sound/snapcast/Manifest @@ -1,2 +1 @@ -DIST snapcast-0.31.0.tar.gz 1128037 BLAKE2B 82444e9fc75e82b5f57e3e115a8bfbde2a5839bc68e25db47df0f25675cf73a836f2e8b09afb077410bd3c36917abb17ce302c18b67b440567c55b673301e7f5 SHA512 9c3eef7a18aaf6479a96810aeb58d11cc87654021d8d07b29f9b623c70bd7fd9aa08f5dee430c11de72abafa1a1b5abe500b93eef4b17b7c56df55c2f2a29867 DIST snapcast-0.34.0.tar.gz 1173157 BLAKE2B e141c7fe264801ba598e09edad41cc543811e36ee51c02597dc180bd79370b6693aeaed919ce4c56749064f6034c26409c6aa7273a01b33fdc265315d501f76d SHA512 509c76432f71c1f08975740f7e633289254d157d2676f0c20d4a2578515e5ed5bb0036706df35fd2d4cba091881fc6c84d870c80e6cf7c6923392daf9c1cfbb1 diff --git a/media-sound/snapcast/files/snapcast-0.31.0-boost-1.88-fixup.patch b/media-sound/snapcast/files/snapcast-0.31.0-boost-1.88-fixup.patch deleted file mode 100644 index 36045c0e902a..000000000000 --- a/media-sound/snapcast/files/snapcast-0.31.0-boost-1.88-fixup.patch +++ /dev/null @@ -1,257 +0,0 @@ -https://github.com/badaix/snapcast/commit/0de502f565c6f26ab9ea4e18aa005ab3ebc6a01a -https://github.com/badaix/snapcast/commit/7c27acb3c7db28d8e74795ccb163b38efdf2625c -https://github.com/badaix/snapcast/commit/e617654e17aa09c28aad07822777b696298f92d0 - -From 0de502f565c6f26ab9ea4e18aa005ab3ebc6a01a Mon Sep 17 00:00:00 2001 -From: badaix <[email protected]> -Date: Fri, 6 Jun 2025 14:01:26 +0200 -Subject: [PATCH] Define BOOST_PROCESS_VERSION=1 globally - ---- - CMakeLists.txt | 3 ++- - client/player/player.cpp | 1 - - server/streamreader/stream_control.hpp | 4 ++-- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b35291f7..e6dccd2f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -332,7 +332,8 @@ else() - add_compile_definitions(HAS_TREMOR) - endif() - --add_compile_definitions(BOOST_ERROR_CODE_HEADER_ONLY BOOST_ASIO_NO_TS_EXECUTORS) -+add_compile_definitions(BOOST_ERROR_CODE_HEADER_ONLY BOOST_ASIO_NO_TS_EXECUTORS -+ BOOST_PROCESS_VERSION=1) - - if(WIN32) - include(FindPackageHandleStandardArgs) -diff --git a/client/player/player.cpp b/client/player/player.cpp -index 047a9ab1..968cb723 100644 ---- a/client/player/player.cpp -+++ b/client/player/player.cpp -@@ -27,7 +27,6 @@ - - // 3rd party headers - #ifdef SUPPORTS_VOLUME_SCRIPT --#define BOOST_PROCESS_VERSION 1 - #include <boost/process/v1/args.hpp> - #include <boost/process/v1/child.hpp> - #include <boost/process/v1/detail/on_exit.hpp> -diff --git a/server/streamreader/stream_control.hpp b/server/streamreader/stream_control.hpp -index 5007f208..5cbc9217 100644 ---- a/server/streamreader/stream_control.hpp -+++ b/server/streamreader/stream_control.hpp -@@ -23,8 +23,8 @@ - #include "server_settings.hpp" - - // 3rd party headers --#define BOOST_PROCESS_VERSION 1 --#include <boost/asio.hpp> -+#include <boost/asio/any_io_executor.hpp> -+#include <boost/process/v1/child.hpp> - #include <boost/process/v1/io.hpp> - #include <boost/process/v1/start_dir.hpp> - #include <boost/process/v1/system.hpp> - -From 7c27acb3c7db28d8e74795ccb163b38efdf2625c Mon Sep 17 00:00:00 2001 -From: badaix <[email protected]> -Date: Fri, 6 Jun 2025 14:05:39 +0200 -Subject: [PATCH] Add missing includes - ---- - server/snapserver.cpp | 1 + - server/stream_session_tcp.cpp | 2 ++ - server/streamreader/airplay_stream.hpp | 3 +-- - server/streamreader/file_stream.hpp | 5 ++++- - server/streamreader/pcm_stream.hpp | 1 + - server/streamreader/pipe_stream.hpp | 6 +++++- - server/streamreader/process_stream.hpp | 5 +++++ - 7 files changed, 19 insertions(+), 4 deletions(-) - -diff --git a/server/snapserver.cpp b/server/snapserver.cpp -index 3e51fb2d..454f3b5d 100644 ---- a/server/snapserver.cpp -+++ b/server/snapserver.cpp -@@ -38,6 +38,7 @@ - - // 3rd party headers - #include <boost/asio/ip/host_name.hpp> -+#include <boost/asio/signal_set.hpp> - - // standard headers - #include <chrono> -diff --git a/server/stream_session_tcp.cpp b/server/stream_session_tcp.cpp -index 0cc05f6a..e9bebfd5 100644 ---- a/server/stream_session_tcp.cpp -+++ b/server/stream_session_tcp.cpp -@@ -23,6 +23,8 @@ - #include "common/aixlog.hpp" - - // 3rd party headers -+#include <boost/asio/read.hpp> -+#include <boost/asio/write.hpp> - - // standard headers - #include <iostream> -diff --git a/server/streamreader/airplay_stream.hpp b/server/streamreader/airplay_stream.hpp -index 05ec2d4b..44c89752 100644 ---- a/server/streamreader/airplay_stream.hpp -+++ b/server/streamreader/airplay_stream.hpp -@@ -23,6 +23,7 @@ - #include "process_stream.hpp" - - // 3rd party headers -+#include <boost/asio/streambuf.hpp> - // Expat is used in metadata parsing from Shairport-sync. - // Without HAS_EXPAT defined no parsing will occur. - #ifdef HAS_EXPAT -@@ -42,8 +43,6 @@ struct TageEntry - int length{0}; ///< length - }; - --/// Starts shairport-sync and reads PCM data from stdout -- - /** - * Starts shairport-sync, reads PCM data from stdout, and passes the data to an encoder. - * Implements EncoderListener to get the encoded data. -diff --git a/server/streamreader/file_stream.hpp b/server/streamreader/file_stream.hpp -index 243fceb8..5d1641fd 100644 ---- a/server/streamreader/file_stream.hpp -+++ b/server/streamreader/file_stream.hpp -@@ -1,6 +1,6 @@ - /*** - This file is part of snapcast -- Copyright (C) 2014-2024 Johannes Pohl -+ Copyright (C) 2014-2025 Johannes Pohl - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by -@@ -22,6 +22,9 @@ - // local headers - #include "asio_stream.hpp" - -+// 3rd party headers -+#include <boost/asio/posix/stream_descriptor.hpp> -+ - namespace streamreader - { - -diff --git a/server/streamreader/pcm_stream.hpp b/server/streamreader/pcm_stream.hpp -index 6392fea6..7af99bab 100644 ---- a/server/streamreader/pcm_stream.hpp -+++ b/server/streamreader/pcm_stream.hpp -@@ -35,6 +35,7 @@ - #include <boost/asio/io_context.hpp> - #include <boost/asio/read_until.hpp> - #include <boost/asio/steady_timer.hpp> -+#include <boost/asio/strand.hpp> - - // standard headers - #include <atomic> -diff --git a/server/streamreader/pipe_stream.hpp b/server/streamreader/pipe_stream.hpp -index 75339ce2..0f7d41f5 100644 ---- a/server/streamreader/pipe_stream.hpp -+++ b/server/streamreader/pipe_stream.hpp -@@ -1,6 +1,6 @@ - /*** - This file is part of snapcast -- Copyright (C) 2014-2024 Johannes Pohl -+ Copyright (C) 2014-2025 Johannes Pohl - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by -@@ -22,6 +22,10 @@ - // local headers - #include "asio_stream.hpp" - -+// 3rd party headers -+#include <boost/asio/posix/stream_descriptor.hpp> -+ -+ - namespace streamreader - { - -diff --git a/server/streamreader/process_stream.hpp b/server/streamreader/process_stream.hpp -index 2a19fecb..5c495655 100644 ---- a/server/streamreader/process_stream.hpp -+++ b/server/streamreader/process_stream.hpp -@@ -23,6 +23,11 @@ - #include "asio_stream.hpp" - #include "watchdog.hpp" - -+// 3rd party headers -+#include <boost/asio/posix/stream_descriptor.hpp> -+#include <boost/process/v1/child.hpp> -+#include <boost/process/v1/pipe.hpp> -+ - // standard headers - #include <memory> - #include <string> - -From e617654e17aa09c28aad07822777b696298f92d0 Mon Sep 17 00:00:00 2001 -From: badaix <[email protected]> -Date: Fri, 6 Jun 2025 21:52:26 +0200 -Subject: [PATCH] Include process v1 headers for Boost version >= v1.88.0 - ---- - client/client_connection.cpp | 1 - - client/player/player.cpp | 4 ++++ - server/streamreader/process_stream.hpp | 3 --- - server/streamreader/stream_control.hpp | 4 ++++ - 4 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/client/player/player.cpp b/client/player/player.cpp -index 968cb723..76ca3818 100644 ---- a/client/player/player.cpp -+++ b/client/player/player.cpp -@@ -27,10 +27,14 @@ - - // 3rd party headers - #ifdef SUPPORTS_VOLUME_SCRIPT -+#if BOOST_VERSION >= 108800 - #include <boost/process/v1/args.hpp> - #include <boost/process/v1/child.hpp> - #include <boost/process/v1/detail/on_exit.hpp> - #include <boost/process/v1/exe.hpp> -+#else -+#include <boost/process.hpp> -+#endif - #endif - - // standard headers -diff --git a/server/streamreader/process_stream.hpp b/server/streamreader/process_stream.hpp -index 5c495655..0774b9e9 100644 ---- a/server/streamreader/process_stream.hpp -+++ b/server/streamreader/process_stream.hpp -@@ -24,9 +24,6 @@ - #include "watchdog.hpp" - - // 3rd party headers --#include <boost/asio/posix/stream_descriptor.hpp> --#include <boost/process/v1/child.hpp> --#include <boost/process/v1/pipe.hpp> - - // standard headers - #include <memory> -diff --git a/server/streamreader/stream_control.hpp b/server/streamreader/stream_control.hpp -index 5cbc9217..6a448d52 100644 ---- a/server/streamreader/stream_control.hpp -+++ b/server/streamreader/stream_control.hpp -@@ -24,10 +24,14 @@ - - // 3rd party headers - #include <boost/asio/any_io_executor.hpp> -+#if BOOST_VERSION >= 108800 - #include <boost/process/v1/child.hpp> - #include <boost/process/v1/io.hpp> - #include <boost/process/v1/start_dir.hpp> - #include <boost/process/v1/system.hpp> -+#else -+#include <boost/process.hpp> -+#endif - - // standard headers - #include <filesystem> - diff --git a/media-sound/snapcast/files/snapcast-0.31.0-boost-1.88.patch b/media-sound/snapcast/files/snapcast-0.31.0-boost-1.88.patch deleted file mode 100644 index 7c05f3430745..000000000000 --- a/media-sound/snapcast/files/snapcast-0.31.0-boost-1.88.patch +++ /dev/null @@ -1,55 +0,0 @@ -https://bugs.gentoo.org/955544 -https://github.com/badaix/snapcast/commit/798e5cb142b90f19542a8bce897a4fe6460e5a10 - -From 798e5cb142b90f19542a8bce897a4fe6460e5a10 Mon Sep 17 00:00:00 2001 -From: Tobias Hochwallner <[email protected]> -Date: Wed, 7 May 2025 22:42:07 +0200 -Subject: [PATCH] Build failure with boost 1.88.0 #1367 fix compilation errors - by including the deprecated boost process v1 APIs - ---- - client/player/player.cpp | 6 +++++- - server/streamreader/stream_control.hpp | 8 +++++--- - 2 files changed, 10 insertions(+), 4 deletions(-) - -diff --git a/client/player/player.cpp b/client/player/player.cpp -index c4b590c7..047a9ab1 100644 ---- a/client/player/player.cpp -+++ b/client/player/player.cpp -@@ -27,7 +27,11 @@ - - // 3rd party headers - #ifdef SUPPORTS_VOLUME_SCRIPT --#include <boost/process.hpp> -+#define BOOST_PROCESS_VERSION 1 -+#include <boost/process/v1/args.hpp> -+#include <boost/process/v1/child.hpp> -+#include <boost/process/v1/detail/on_exit.hpp> -+#include <boost/process/v1/exe.hpp> - #endif - - // standard headers -diff --git a/server/streamreader/stream_control.hpp b/server/streamreader/stream_control.hpp -index 358d9708..5007f208 100644 ---- a/server/streamreader/stream_control.hpp -+++ b/server/streamreader/stream_control.hpp -@@ -18,14 +18,16 @@ - - #pragma once - -- - // local headers - #include "jsonrpcpp.hpp" - #include "server_settings.hpp" - - // 3rd party headers --#include <boost/asio/any_io_executor.hpp> --#include <boost/process.hpp> -+#define BOOST_PROCESS_VERSION 1 -+#include <boost/asio.hpp> -+#include <boost/process/v1/io.hpp> -+#include <boost/process/v1/start_dir.hpp> -+#include <boost/process/v1/system.hpp> - - // standard headers - #include <filesystem> diff --git a/media-sound/snapcast/files/snapcast-0.31.0-drop-lint.patch b/media-sound/snapcast/files/snapcast-0.31.0-drop-lint.patch deleted file mode 100644 index 36f687baf651..000000000000 --- a/media-sound/snapcast/files/snapcast-0.31.0-drop-lint.patch +++ /dev/null @@ -1,12 +0,0 @@ -We don't want any automagic lint probing. ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -85,8 +85,6 @@ else() - endif() - - include(GNUInstallDirs) --include(${CMAKE_SOURCE_DIR}/cmake/cppcheck.cmake) --include(${CMAKE_SOURCE_DIR}/cmake/reformat.cmake) - - if(NOT WIN32) - option(BUILD_SERVER "Build Snapserver" ON) # no Windows server for now diff --git a/media-sound/snapcast/snapcast-0.31.0.ebuild b/media-sound/snapcast/snapcast-0.31.0.ebuild deleted file mode 100644 index a6ffd602bdc2..000000000000 --- a/media-sound/snapcast/snapcast-0.31.0.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit edo cmake - -DESCRIPTION="Synchronous multi-room audio player" -HOMEPAGE="https://github.com/badaix/snapcast"; -SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 ~arm ppc ppc64 ~riscv x86" -IUSE="+client +expat +flac jack +opus +server test tremor +vorbis +zeroconf" -REQUIRED_USE="|| ( server client )" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/boost:= - dev-libs/openssl:= - media-libs/alsa-lib - client? ( acct-user/snapclient ) - expat? ( dev-libs/expat ) - flac? ( media-libs/flac:= ) - jack? ( virtual/jack ) - opus? ( media-libs/opus ) - server? ( - acct-group/snapserver - acct-user/snapserver - ) - tremor? ( media-libs/tremor ) - vorbis? ( media-libs/libvorbis ) - zeroconf? ( net-dns/avahi[dbus] ) -" -DEPEND=" - ${RDEPEND} - >=dev-cpp/aixlog-1.2.1 - >=dev-cpp/asio-1.12.1 - >=dev-cpp/popl-1.2.0 - test? ( >=dev-cpp/catch-3:0 ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.31.0-boost-1.88.patch - "${FILESDIR}"/${PN}-0.31.0-drop-lint.patch - "${FILESDIR}"/${PN}-0.31.0-boost-1.88-fixup.patch -) - -src_configure() { - local mycmakeargs=( - -DBUILD_CLIENT=$(usex client) - -DBUILD_WITH_EXPAT=$(usex expat) - -DBUILD_WITH_FLAC=$(usex flac) - -DBUILD_WITH_JACK=$(usex jack) - -DBUILD_WITH_OPUS=$(usex opus) - -DBUILD_SERVER=$(usex server) - -DBUILD_STATIC_LIBS=no - -DBUILD_TESTS=$(usex test) - -DBUILD_WITH_TREMOR=$(usex tremor) - -DBUILD_WITH_VORBIS=$(usex vorbis) - -DBUILD_WITH_AVAHI=$(usex zeroconf) - -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" - ) - - cmake_src_configure -} - -src_test() { - cmake_src_test - edo "${S}"/bin/snapcast_test -} - -src_install() { - cmake_src_install - - for bin in server client ; do - if use ${bin} ; then - doman "${bin}/snap${bin}.1" - - newconfd "${FILESDIR}/snap${bin}.confd" "snap${bin}" - newinitd "${FILESDIR}/snap${bin}.initd" "snap${bin}" - fi - done -}
