CVS commit: pkgsrc/audio/snapcast

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/audio/snapcast
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Tue, 30 Sep 2025 06:49:38 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Sep 30 06:49:38 UTC 2025

Modified Files:
        pkgsrc/audio/snapcast: Makefile PLIST distinfo
        pkgsrc/audio/snapcast/patches: patch-CMakeLists.txt
            patch-client_CMakeLists.txt patch-client_snapclient.cpp
            patch-common_utils.hpp patch-server_CMakeLists.txt
            patch-server_etc_snapserver.conf patch-server_server__settings.hpp
            patch-server_snapserver.1
            patch-server_streamreader_pipe__stream.cpp
Removed Files:
        pkgsrc/audio/snapcast/patches: patch-client_client__connection.cpp
            patch-server_control__server.cpp
            patch-server_control__session__http.cpp
            patch-server_stream__server.cpp
            patch-server_stream__session__ws.cpp
            patch-server_streamreader_tcp__stream.cpp

Log Message:
snapcast: updated to 0.33.0

0.33.0

Features

Server: Add PipeWire stream reader
Client: Add PipeWire player
Server: process stream sources can be added via RPC
Server: mDNS can be disabled
Server: Audio streaming over plain TCP (port 1704) can be disabled
Server: Add control script for go-librespot

Bugfixes

Client: Fix case of command line arguments
Client: Fix deadlock during shutdown
Fix building with boost v1.89.0
Fix MacOS CI

General

Server: Log warning if default config is missing
Server: Make SSL support optional (-DBUILD_WITH_SSL)
Make ALSA optional
Enable OpenSSL support for Android builds in CMakeLists.txt
Update Readme
Build Trixie packages for amd64
tcp section in snapserver.conf renamed to tcp-control
TCP streaming settings moved from stream to tcp-streaming


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/audio/snapcast/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/snapcast/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/audio/snapcast/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/snapcast/patches/patch-CMakeLists.txt \
    pkgsrc/audio/snapcast/patches/patch-client_CMakeLists.txt \
    pkgsrc/audio/snapcast/patches/patch-client_snapclient.cpp \
    pkgsrc/audio/snapcast/patches/patch-common_utils.hpp \
    pkgsrc/audio/snapcast/patches/patch-server_CMakeLists.txt \
    pkgsrc/audio/snapcast/patches/patch-server_server__settings.hpp \
    pkgsrc/audio/snapcast/patches/patch-server_snapserver.1 \
    pkgsrc/audio/snapcast/patches/patch-server_streamreader_pipe__stream.cpp
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/audio/snapcast/patches/patch-client_client__connection.cpp \
    pkgsrc/audio/snapcast/patches/patch-server_control__server.cpp \
    pkgsrc/audio/snapcast/patches/patch-server_control__session__http.cpp \
    pkgsrc/audio/snapcast/patches/patch-server_stream__server.cpp \
    pkgsrc/audio/snapcast/patches/patch-server_stream__session__ws.cpp \
    pkgsrc/audio/snapcast/patches/patch-server_streamreader_tcp__stream.cpp
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/audio/snapcast/patches/patch-server_etc_snapserver.conf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/snapcast/Makefile
diff -u pkgsrc/audio/snapcast/Makefile:1.16 pkgsrc/audio/snapcast/Makefile:1.17
--- pkgsrc/audio/snapcast/Makefile:1.16 Sat Sep 27 09:57:06 2025
+++ pkgsrc/audio/snapcast/Makefile      Tue Sep 30 06:49:37 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2025/09/27 09:57:06 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2025/09/30 06:49:37 adam Exp $
 
-DISTNAME=      snapcast-0.26.0
-PKGREVISION=   8
+DISTNAME=      snapcast-0.33.0
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=badaix/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -11,14 +10,11 @@ HOMEPAGE=   https://github.com/badaix/snap
 COMMENT=       Multiroom client-server audio player
 LICENSE=       gnu-gpl-v3
 
-USE_TOOLS+=    pkg-config
-USE_LANGUAGES= c c++
+USE_CXX_FEATURES=      filesystem
+USE_LANGUAGES=         c c++
+USE_TOOLS+=            pkg-config
 
-USE_CXX_FEATURES+=     filesystem
-
-CMAKE_CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
-
-REPLACE_PYTHON+=       server/etc/plug-ins/meta_mpd.py
+REPLACE_PYTHON+=       server/etc/plug-ins/*.py
 
 CONF_FILES+=   ${PREFIX}/share/examples/snapcast/snapserver.conf \
                ${PKG_SYSCONFDIR}/snapserver.conf
@@ -68,13 +64,14 @@ post-install:
        cd ${WRKSRC} && ${CHMOD} +r ${DESTDIR}${PREFIX}/share/snapserver/plug-ins/meta_mpd.py
 
 .include "options.mk"
-.include "../../devel/cmake/build.mk"
 .include "../../audio/flac/buildlink3.mk"
 .include "../../audio/libopus/buildlink3.mk"
 .include "../../audio/libsoxr/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../devel/boost-headers/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 .include "../../lang/python/application.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/audio/snapcast/PLIST
diff -u pkgsrc/audio/snapcast/PLIST:1.1 pkgsrc/audio/snapcast/PLIST:1.2
--- pkgsrc/audio/snapcast/PLIST:1.1     Sun Jul  3 16:09:15 2022
+++ pkgsrc/audio/snapcast/PLIST Tue Sep 30 06:49:37 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2022/07/03 16:09:15 nia Exp $
+@comment $NetBSD: PLIST,v 1.2 2025/09/30 06:49:37 adam Exp $
 bin/snapclient
 bin/snapserver
 man/man1/snapclient.1
@@ -6,19 +6,8 @@ man/man1/snapserver.1
 share/examples/snapcast/snapserver.conf
 share/pixmaps/snapcast.svg
 share/snapserver/index.html
+share/snapserver/plug-ins/meta_go-librespot.py
+share/snapserver/plug-ins/meta_librespot-java.py
+share/snapserver/plug-ins/meta_mopidy.py
 share/snapserver/plug-ins/meta_mpd.py
-share/snapserver/snapweb/10-seconds-of-silence.mp3
-share/snapserver/snapweb/3rd-party/libflac.js
-share/snapserver/snapweb/config.js
-share/snapserver/snapweb/favicon.ico
 share/snapserver/snapweb/index.html
-share/snapserver/snapweb/launcher-icon.png
-share/snapserver/snapweb/manifest.json
-share/snapserver/snapweb/mute_icon.png
-share/snapserver/snapweb/play.png
-share/snapserver/snapweb/snapcast-512.png
-share/snapserver/snapweb/snapcontrol.js
-share/snapserver/snapweb/snapstream.js
-share/snapserver/snapweb/speaker_icon.png
-share/snapserver/snapweb/stop.png
-share/snapserver/snapweb/styles.css

Index: pkgsrc/audio/snapcast/distinfo
diff -u pkgsrc/audio/snapcast/distinfo:1.4 pkgsrc/audio/snapcast/distinfo:1.5
--- pkgsrc/audio/snapcast/distinfo:1.4  Fri Jan 31 16:20:06 2025
+++ pkgsrc/audio/snapcast/distinfo      Tue Sep 30 06:49:37 2025
@@ -1,24 +1,18 @@
-$NetBSD: distinfo,v 1.4 2025/01/31 16:20:06 wiz Exp $
+$NetBSD: distinfo,v 1.5 2025/09/30 06:49:37 adam Exp $
 
-BLAKE2s (snapcast-0.26.0.tar.gz) = e0ef56ee25d30c8536158949c5e5f85b32a8c410303da939ef844bb3dc300012
-SHA512 (snapcast-0.26.0.tar.gz) = fc7885e42a11794e33314544083251ffbb91a0cf160c6d4b854c56f57ffe9f38f75c7594478c9edabfe9076959938cd8de891dd456e66202692de664a75cde71
-Size (snapcast-0.26.0.tar.gz) = 1537036 bytes
-SHA1 (patch-CMakeLists.txt) = c3f02503c918e6843ab18d987b3e886e22e13865
-SHA1 (patch-client_CMakeLists.txt) = 48559046bd578e2d75f97b4ec422d4a56b567733
-SHA1 (patch-client_client__connection.cpp) = 73d5497336d8c27e29e0d4da47fa577a3ca9c9e1
+BLAKE2s (snapcast-0.33.0.tar.gz) = cdb29784d58b1b1ddc28fb5b8e410e957de4ce0e562922d6b55c811d5f6eaa39
+SHA512 (snapcast-0.33.0.tar.gz) = bc677261a6e9ad274e1ac5984a024573f855814432cc7e04d23bfb87b9aca22747e764a8c16ed126c23486999da5c8c35d7e9faafcf0bdc6d384ebed1dd30f48
+Size (snapcast-0.33.0.tar.gz) = 1172373 bytes
+SHA1 (patch-CMakeLists.txt) = 9390ba542163543eeb644fa0d9a2f51bdfc25992
+SHA1 (patch-client_CMakeLists.txt) = 89d975e5d1f98d2a48b0edd316f71874b27a04b7
 SHA1 (patch-client_controller.cpp) = a87b5515a519ab579c36786b9727b58934128148
 SHA1 (patch-client_player_sun__player.cpp) = 6e98d22c9deaccc3bf2ac14b7e275dc1c8bc771a
 SHA1 (patch-client_player_sun__player.hpp) = d8eeba9f4c16e85833baba95c07f9a0600763752
-SHA1 (patch-client_snapclient.cpp) = d682d4c1de438251d1510d40387e9a0b2bcf926f
-SHA1 (patch-common_utils.hpp) = 8184a65459accd76b55e8e9e95d1911439fb4d8a
-SHA1 (patch-server_CMakeLists.txt) = 49144e902844bd3308871a625f5da56575904855
-SHA1 (patch-server_control__server.cpp) = e0d7c5527e725ced125e92044b3fd117e17176fb
-SHA1 (patch-server_control__session__http.cpp) = ed34f6922fec7787e13e538b4683082a3e08befe
-SHA1 (patch-server_etc_snapserver.conf) = f274e31ab54d76ea8ce839f5d2d918c111a80604
-SHA1 (patch-server_server__settings.hpp) = 50950a4855ecc336dbec146b86935fa18942dc1d
-SHA1 (patch-server_snapserver.1) = 3459c6109635d1ad72c1aee92e302088a2317007
+SHA1 (patch-client_snapclient.cpp) = 196f3a3031749578f7b7fb78a31b043726dca0bf
+SHA1 (patch-common_utils.hpp) = 5e048e0fa0d0cda0a2bf2b42884ce7316465f641
+SHA1 (patch-server_CMakeLists.txt) = 567597d4cbdc9551b5260edd7ff7322d0bde861f
+SHA1 (patch-server_etc_snapserver.conf) = 6d8d7acdff575c5d2c7d9c40a19e8608d6035dcf
+SHA1 (patch-server_server__settings.hpp) = 14b9fe73489606fae99a6fcd4982806e751a0d2a
+SHA1 (patch-server_snapserver.1) = d7578400ef60e0e4877564797d523a06a707f8a4
 SHA1 (patch-server_snapserver.cpp) = 62d5dcbfe369f9095e9b6c695680650f7eb458b6
-SHA1 (patch-server_stream__server.cpp) = 4d9d01ee809331ce18540c59f603dfbdefbaad94
-SHA1 (patch-server_stream__session__ws.cpp) = d228ba5af0adc593b243150bef1ffdfbbf826659
-SHA1 (patch-server_streamreader_pipe__stream.cpp) = aec6fd900e0aca776510c3b413e457b9082b01b5
-SHA1 (patch-server_streamreader_tcp__stream.cpp) = 335fbf8eb1de0244a228d980be4b14bedb368e1c
+SHA1 (patch-server_streamreader_pipe__stream.cpp) = 112f5bdb46744ba52f40d30bca38bdc285902a7f

Index: pkgsrc/audio/snapcast/patches/patch-CMakeLists.txt
diff -u pkgsrc/audio/snapcast/patches/patch-CMakeLists.txt:1.1 pkgsrc/audio/snapcast/patches/patch-CMakeLists.txt:1.2
--- pkgsrc/audio/snapcast/patches/patch-CMakeLists.txt:1.1      Sun Jul  3 16:09:15 2022
+++ pkgsrc/audio/snapcast/patches/patch-CMakeLists.txt  Tue Sep 30 06:49:37 2025
@@ -1,32 +1,18 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2022/07/03 16:09:15 nia Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2025/09/30 06:49:37 adam Exp $
 
-Make ALSA optional. Add Sun Audio support for NetBSD.
+Add Sun Audio support for NetBSD.
 
---- CMakeLists.txt.orig        2021-12-22 17:40:36.000000000 +0000
+--- CMakeLists.txt.orig        2025-09-23 19:02:05.000000000 +0000
 +++ CMakeLists.txt
-@@ -178,10 +178,12 @@ if(NOT WIN32 AND NOT ANDROID)
-         list(APPEND INCLUDE_DIRS "/usr/local/include")
-     else()
- 
--        pkg_search_module(ALSA REQUIRED alsa)
-+        if(BUILD_WITH_ALSA)
-+        pkg_search_module(ALSA alsa)
-         if (ALSA_FOUND)
-             add_definitions(-DHAS_ALSA)
-         endif (ALSA_FOUND)
-+        endif(BUILD_WITH_ALSA)
- 
-         if(BUILD_WITH_PULSE)
-             pkg_search_module(PULSE libpulse)
-@@ -206,6 +208,11 @@ if(NOT WIN32 AND NOT ANDROID)
-             link_directories("/usr/local/lib")
-             list(APPEND INCLUDE_DIRS "/usr/local/include")
-         endif()
-+
-+        check_include_file("sys/audioio.h" SUN_FOUND)
-+        if (SUN_FOUND)
-+            add_definitions(-DHAS_SUN)
-+        endif (SUN_FOUND)
+@@ -254,6 +254,11 @@ if(NOT WIN32 AND NOT ANDROID)
+       link_directories("/usr/local/lib")
+       list(APPEND INCLUDE_DIRS "/usr/local/include")
      endif()
++
++    check_include_file("sys/audioio.h" SUN_FOUND)
++    if(SUN_FOUND)
++      add_definitions(-DHAS_SUN)
++    endif(SUN_FOUND)
+   endif()
  
-     pkg_search_module(SOXR soxr)
+   pkg_search_module(SOXR soxr)
Index: pkgsrc/audio/snapcast/patches/patch-client_CMakeLists.txt
diff -u pkgsrc/audio/snapcast/patches/patch-client_CMakeLists.txt:1.1 pkgsrc/audio/snapcast/patches/patch-client_CMakeLists.txt:1.2
--- pkgsrc/audio/snapcast/patches/patch-client_CMakeLists.txt:1.1       Sun Jul  3 16:09:15 2022
+++ pkgsrc/audio/snapcast/patches/patch-client_CMakeLists.txt   Tue Sep 30 06:49:37 2025
@@ -1,17 +1,27 @@
-$NetBSD: patch-client_CMakeLists.txt,v 1.1 2022/07/03 16:09:15 nia Exp $
+$NetBSD: patch-client_CMakeLists.txt,v 1.2 2025/09/30 06:49:37 adam Exp $
 
+Use correct variable: Boost_INCLUDE_DIRS.
 Add Sun Audio support for NetBSD.
 
---- client/CMakeLists.txt.orig 2021-12-22 17:40:36.000000000 +0000
+--- client/CMakeLists.txt.orig 2025-09-23 19:02:05.000000000 +0000
 +++ client/CMakeLists.txt
-@@ -53,6 +53,10 @@ elseif(NOT ANDROID)
-         list(APPEND CLIENT_LIBRARIES ${PULSE_LIBRARIES})
-         list(APPEND CLIENT_INCLUDE ${PULSE_INCLUDE_DIRS})
-     endif (PULSE_FOUND)
-+
-+    if (SUN_FOUND)
-+        list(APPEND CLIENT_SOURCES player/sun_player.cpp)
-+    endif (SUN_FOUND)
- endif (MACOSX)
+@@ -13,7 +13,7 @@ set(CLIENT_LIBRARIES ${CMAKE_THREAD_LIBS
+ 
+ include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/client)
+ 
+-include_directories(SYSTEM ${Boost_INCLUDE_DIR})
++include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
  
- if (ANDROID)
+ if(MACOSX)
+   # Bonjour
+@@ -61,6 +61,10 @@ elseif(NOT ANDROID)
+     include_directories(${PULSE_INCLUDE_DIRS})
+   endif(PULSE_FOUND)
+ 
++  if(SUN_FOUND)
++    list(APPEND CLIENT_SOURCES player/sun_player.cpp)
++  endif(UN_FOUND)
++
+   if(PIPEWIRE_FOUND)
+     list(APPEND CLIENT_SOURCES player/pipewire_player.cpp)
+     list(APPEND CLIENT_LIBRARIES ${PIPEWIRE_LIBRARIES})
Index: pkgsrc/audio/snapcast/patches/patch-client_snapclient.cpp
diff -u pkgsrc/audio/snapcast/patches/patch-client_snapclient.cpp:1.1 pkgsrc/audio/snapcast/patches/patch-client_snapclient.cpp:1.2
--- pkgsrc/audio/snapcast/patches/patch-client_snapclient.cpp:1.1       Sun Jul  3 16:09:15 2022
+++ pkgsrc/audio/snapcast/patches/patch-client_snapclient.cpp   Tue Sep 30 06:49:37 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-client_snapclient.cpp,v 1.1 2022/07/03 16:09:15 nia Exp $
+$NetBSD: patch-client_snapclient.cpp,v 1.2 2025/09/30 06:49:37 adam Exp $
 
 Add Sun Audio support for NetBSD.
 
---- client/snapclient.cpp.orig 2021-12-22 17:40:36.000000000 +0000
+--- client/snapclient.cpp.orig 2025-09-23 19:02:05.000000000 +0000
 +++ client/snapclient.cpp
-@@ -32,6 +32,9 @@
+@@ -28,6 +28,9 @@
  #ifdef HAS_PULSE
  #include "player/pulse_player.hpp"
  #endif
@@ -14,39 +14,34 @@ Add Sun Audio support for NetBSD.
  #ifdef HAS_WASAPI
  #include "player/wasapi_player.hpp"
  #endif
-@@ -62,8 +65,12 @@ PcmDevice getPcmDevice(const std::string
+@@ -73,7 +76,7 @@ namespace
+ PcmDevice getPcmDevice(const std::string& player, const std::string& parameter, const std::string& soundcard)
  {
-     LOG(DEBUG, LOG_TAG) << "Trying to get PCM device for player: " << player << ", parameter: "
-                         << ", card: " << soundcard << "\n";
--#if defined(HAS_ALSA) || defined(HAS_PULSE) || defined(HAS_WASAPI)
-+#if defined(HAS_ALSA) || defined(HAS_PULSE) || defined(HAS_WASAPI) || defined(HAS_SUN)
+     LOG(DEBUG, LOG_TAG) << "Trying to get PCM device for player: " << player << ", parameter: " << ", card: " << soundcard << "\n";
+-#if defined(HAS_ALSA) || defined(HAS_PULSE) || defined(HAS_WASAPI) || defined(HAS_PIPEWIRE)
++#if defined(HAS_ALSA) || defined(HAS_PULSE) || defined(HAS_WASAPI) || defined(HAS_PIPEWIRE) || defined(HAS_SUN)
      vector<PcmDevice> pcm_devices;
-+#if defined(HAS_SUN)
-+    if (player == player::SUN)
-+        pcm_devices = SunPlayer::pcm_list();
-+#endif
  #if defined(HAS_ALSA)
      if (player == player::ALSA)
-         pcm_devices = AlsaPlayer::pcm_list();
-@@ -142,7 +149,7 @@ int main(int argc, char** argv)
-         op.add<Value<string>>("", "hostID", "unique host id, default is MAC address", "", &settings.host_id);
+@@ -186,7 +189,7 @@ int main(int argc, char** argv)
+             op.add<Implicit<std::filesystem::path>>("", "server-cert", "Verify server with CA certificate (PEM format)", "default certificates");
  
  // PCM device specific
--#if defined(HAS_ALSA) || defined(HAS_PULSE) || defined(HAS_WASAPI)
-+#if defined(HAS_ALSA) || defined(HAS_PULSE) || defined(HAS_WASAPI) || defined(HAS_SUN)
-         auto listSwitch = op.add<Switch>("l", "list", "list PCM devices");
-         /*auto soundcardValue =*/op.add<Value<string>>("s", "soundcard", "index or name of the pcm device", pcm_device, &pcm_device);
+-#if defined(HAS_ALSA) || defined(HAS_PULSE) || defined(HAS_WASAPI) || defined(HAS_PIPEWIRE)
++#if defined(HAS_ALSA) || defined(HAS_PULSE) || defined(HAS_WASAPI) || defined(HAS_PIPEWIRE) || defined(HAS_SUN)
+         auto listSwitch = op.add<Switch>("l", "list", "List PCM devices");
+         op.add<Value<string>>("s", "soundcard", "Index or name of the PCM device", pcm_device, &pcm_device);
  #endif
-@@ -210,7 +217,7 @@ int main(int argc, char** argv)
+@@ -258,7 +261,7 @@ int main(int argc, char** argv)
  
          settings.player.player_name = utils::string::split_left(settings.player.player_name, ':', settings.player.parameter);
  
--#if defined(HAS_ALSA) || defined(HAS_PULSE) || defined(HAS_WASAPI)
-+#if defined(HAS_ALSA) || defined(HAS_PULSE) || defined(HAS_WASAPI) || defined(HAS_SUN)
+-#if defined(HAS_ALSA) || defined(HAS_PULSE) || defined(HAS_WASAPI) || defined(HAS_PIPEWIRE)
++#if defined(HAS_ALSA) || defined(HAS_PULSE) || defined(HAS_WASAPI) || defined(HAS_PIPEWIRE) || defined(HAS_SUN)
          if (listSwitch->is_set())
          {
              try
-@@ -224,6 +231,10 @@ int main(int argc, char** argv)
+@@ -272,6 +275,10 @@ int main(int argc, char** argv)
                  if (settings.player.player_name == player::PULSE)
                      pcm_devices = PulsePlayer::pcm_list(settings.player.parameter);
  #endif
Index: pkgsrc/audio/snapcast/patches/patch-common_utils.hpp
diff -u pkgsrc/audio/snapcast/patches/patch-common_utils.hpp:1.1 pkgsrc/audio/snapcast/patches/patch-common_utils.hpp:1.2
--- pkgsrc/audio/snapcast/patches/patch-common_utils.hpp:1.1    Sun Jul  3 16:09:15 2022
+++ pkgsrc/audio/snapcast/patches/patch-common_utils.hpp        Tue Sep 30 06:49:37 2025
@@ -1,26 +1,19 @@
-$NetBSD: patch-common_utils.hpp,v 1.1 2022/07/03 16:09:15 nia Exp $
+$NetBSD: patch-common_utils.hpp,v 1.2 2025/09/30 06:49:37 adam Exp $
 
 Add NetBSD support.
 
---- common/utils.hpp.orig      2021-12-22 17:40:36.000000000 +0000
+--- common/utils.hpp.orig      2025-09-23 19:02:05.000000000 +0000
 +++ common/utils.hpp
-@@ -1,5 +1,4 @@
--/***
--    This file is part of snapcast
-+/*** This file is part of snapcast
-     Copyright (C) 2014-2020  Johannes Pohl
- 
-     This program is free software: you can redistribute it and/or modify
-@@ -44,7 +43,7 @@
+@@ -38,7 +38,7 @@
+ #include <string>
  #include <sys/stat.h>
  #include <sys/types.h>
- #include <vector>
 -#if !defined(WINDOWS) && !defined(FREEBSD)
-+#if defined(MACOS) || defined(__linux__)
++#if !defined(WINDOWS) && !defined(FREEBSD) && !defined(__NetBSD__)
  #include <sys/sysinfo.h>
  #endif
  #ifdef MACOS
-@@ -53,6 +52,10 @@
+@@ -47,6 +47,10 @@
  #include <ifaddrs.h>
  #include <net/if_dl.h>
  #endif
@@ -31,7 +24,7 @@ Add NetBSD support.
  #ifdef ANDROID
  #include <sys/system_properties.h>
  #endif
-@@ -306,7 +309,7 @@ static std::string getMacAddress(int soc
+@@ -304,7 +308,7 @@ static std::string getMacAddress(int soc
          {
              if (!(ifr.ifr_flags & IFF_LOOPBACK)) // don't count loopback
              {
@@ -40,7 +33,7 @@ Add NetBSD support.
                  /// Dirty Mac version
                  struct ifaddrs *ifap, *ifaptr;
                  unsigned char* ptr;
-@@ -333,6 +336,7 @@ static std::string getMacAddress(int soc
+@@ -331,6 +335,7 @@ static std::string getMacAddress(int soc
                  }
  #endif
  
@@ -48,7 +41,7 @@ Add NetBSD support.
  #ifdef FREEBSD
                  if (ioctl(sock, SIOCGIFMAC, &ifr) == 0)
  #else
-@@ -355,6 +359,7 @@ static std::string getMacAddress(int soc
+@@ -353,6 +358,7 @@ static std::string getMacAddress(int soc
                              return line;
                      }
                  }
@@ -56,7 +49,7 @@ Add NetBSD support.
              }
          }
          else
-@@ -369,7 +374,7 @@ static std::string getMacAddress(int soc
+@@ -367,7 +373,7 @@ static std::string getMacAddress(int soc
          return "";
  
      char mac[19];
Index: pkgsrc/audio/snapcast/patches/patch-server_CMakeLists.txt
diff -u pkgsrc/audio/snapcast/patches/patch-server_CMakeLists.txt:1.1 pkgsrc/audio/snapcast/patches/patch-server_CMakeLists.txt:1.2
--- pkgsrc/audio/snapcast/patches/patch-server_CMakeLists.txt:1.1       Sun Jul  3 16:09:15 2022
+++ pkgsrc/audio/snapcast/patches/patch-server_CMakeLists.txt   Tue Sep 30 06:49:37 2025
@@ -1,15 +1,27 @@
-$NetBSD: patch-server_CMakeLists.txt,v 1.1 2022/07/03 16:09:15 nia Exp $
+$NetBSD: patch-server_CMakeLists.txt,v 1.2 2025/09/30 06:49:37 adam Exp $
 
+Use correct variable: Boost_INCLUDE_DIRS.
 Install config files to examples, per pkgsrc conventions.
 
---- server/CMakeLists.txt.orig 2021-12-22 17:40:36.000000000 +0000
+--- server/CMakeLists.txt.orig 2025-09-23 19:02:05.000000000 +0000
 +++ server/CMakeLists.txt
-@@ -114,7 +114,7 @@ else()
+@@ -35,7 +35,7 @@ set(SERVER_LIBRARIES ${CMAKE_THREAD_LIBS
  
-     install(TARGETS snapserver COMPONENT server DESTINATION ${CMAKE_INSTALL_BINDIR})
-     install(FILES snapserver.1 COMPONENT server DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
--    install(FILES etc/snapserver.conf COMPONENT server DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
-+    install(FILES etc/snapserver.conf COMPONENT server DESTINATION ${CMAKE_INSTALL_DATADIR}/examples/snapcast)
-     install(FILES etc/index.html COMPONENT server DESTINATION ${CMAKE_INSTALL_DATADIR}/snapserver)
-     install(DIRECTORY etc/snapweb/ DESTINATION ${CMAKE_INSTALL_DATADIR}/snapserver/snapweb)
-     install(FILES etc/plug-ins/meta_mpd.py PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE DESTINATION ${CMAKE_INSTALL_DATADIR}/snapserver/plug-ins/)
+ include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/server)
+ 
+-include_directories(SYSTEM ${Boost_INCLUDE_DIR})
++include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
+ 
+ if(ANDROID)
+   find_package(vorbis REQUIRED CONFIG)
+@@ -155,8 +155,8 @@ else()
+   install(
+     FILES etc/snapserver.conf
+     COMPONENT server
+-    DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
+-  install(DIRECTORY DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/snapserver/certs)
++    DESTINATION ${CMAKE_INSTALL_DATADIR}/examples/snapcast)
++  install(DIRECTORY DESTINATION ${CMAKE_INSTALL_DATADIR}/examples/snapcast/snapserver/certs)
+   install(
+     FILES etc/index.html
+     COMPONENT server
Index: pkgsrc/audio/snapcast/patches/patch-server_server__settings.hpp
diff -u pkgsrc/audio/snapcast/patches/patch-server_server__settings.hpp:1.1 pkgsrc/audio/snapcast/patches/patch-server_server__settings.hpp:1.2
--- pkgsrc/audio/snapcast/patches/patch-server_server__settings.hpp:1.1 Sun Jul  3 16:09:15 2022
+++ pkgsrc/audio/snapcast/patches/patch-server_server__settings.hpp     Tue Sep 30 06:49:37 2025
@@ -1,15 +1,27 @@
-$NetBSD: patch-server_server__settings.hpp,v 1.1 2022/07/03 16:09:15 nia Exp $
+$NetBSD: patch-server_server__settings.hpp,v 1.2 2025/09/30 06:49:37 adam Exp $
 
 Don't hardcode various paths, allow pkgsrc to substitute them.
 
---- server/server_settings.hpp.orig    2021-12-22 17:40:36.000000000 +0000
+--- server/server_settings.hpp.orig    2025-09-29 07:26:16.191558938 +0000
 +++ server/server_settings.hpp
-@@ -30,7 +30,7 @@ struct ServerSettings
-     struct Server
-     {
+@@ -40,7 +40,7 @@ struct ServerSettings
+         /// Number of worker threads
          int threads{-1};
+         /// PID file, if running as daemon
 -        std::string pid_file{"/var/run/snapserver/pid"};
 +        std::string pid_file{"@VARBASE@/run/snapserver/pid"};
+         /// User when running as deaemon
          std::string user{"snapserver"};
-         std::string group{""};
-         std::string data_dir{""};
+         /// Group when running as deaemon
+@@ -213,9 +213,9 @@ struct ServerSettings
+     struct Stream
+     {
+         /// Directory for stream plugins
+-        std::filesystem::path plugin_dir{"/usr/share/snapserver/plug-ins"};
++        std::filesystem::path plugin_dir{"@PREFIX@/share/snapserver/plug-ins"};
+         /// Directory for executable process stream sources
+-        std::filesystem::path sandbox_dir{"/usr/share/snapserver/sandbox"};
++        std::filesystem::path sandbox_dir{"@PREFIX@/share/snapserver/sandbox"};
+         /// Stream sources
+         std::vector<std::string> sources;
+         /// Default codec
Index: pkgsrc/audio/snapcast/patches/patch-server_snapserver.1
diff -u pkgsrc/audio/snapcast/patches/patch-server_snapserver.1:1.1 pkgsrc/audio/snapcast/patches/patch-server_snapserver.1:1.2
--- pkgsrc/audio/snapcast/patches/patch-server_snapserver.1:1.1 Sun Jul  3 16:09:15 2022
+++ pkgsrc/audio/snapcast/patches/patch-server_snapserver.1     Tue Sep 30 06:49:37 2025
@@ -1,24 +1,25 @@
-$NetBSD: patch-server_snapserver.1,v 1.1 2022/07/03 16:09:15 nia Exp $
+$NetBSD: patch-server_snapserver.1,v 1.2 2025/09/30 06:49:37 adam Exp $
 
 Don't hardcode various paths, allow pkgsrc to substitute them.
 
---- server/snapserver.1.orig   2021-12-22 17:40:36.000000000 +0000
+--- server/snapserver.1.orig   2025-09-29 07:26:16.207945388 +0000
 +++ server/snapserver.1
-@@ -25,20 +25,17 @@ Show version number
+@@ -25,20 +25,20 @@ Show version number
  Daemonize
  optional process priority [-20..19]
  .TP
 -\fB-c, --config arg (=/etc/snapserver.conf)\fR
 +\fB-c, --config arg (=@PKG_SYSCONFDIR@/snapserver.conf)\fR
- path to the configuration file
+ Path to the configuration file
  .SH FILES
  .TP
  \fI/tmp/snapfifo\fR
  PCM input fifo file
  .TP
 -\fI/etc/default/snapserver\fR
--the daemon default configuration file
--.TP
++\fI@PKG_SYSCONFDIR@/default/snapserver\fR
+ the daemon default configuration file
+ .TP
 -\fI/etc/snapserver.conf\fR
 +\fI@PKG_SYSCONFDIR@/snapserver.conf\fR
  the snapserver configuration file
@@ -27,4 +28,4 @@ Don't hardcode various paths, allow pkgs
 +\fI~/.config/snapcast/server.json\fR or (if $HOME is not set) \fI@VARBASE@/lib/snapcast/server.json\fR
  persistent server data file
  .SH "COPYRIGHT"
- Copyright (C) 2014-2020 Johannes Pohl (snapcast%badaix.de@localhost).
+ Copyright (C) 2014-2025 Johannes Pohl (snapcast%badaix.de@localhost).
Index: pkgsrc/audio/snapcast/patches/patch-server_streamreader_pipe__stream.cpp
diff -u pkgsrc/audio/snapcast/patches/patch-server_streamreader_pipe__stream.cpp:1.1 pkgsrc/audio/snapcast/patches/patch-server_streamreader_pipe__stream.cpp:1.2
--- pkgsrc/audio/snapcast/patches/patch-server_streamreader_pipe__stream.cpp:1.1        Sun Jul  3 16:09:15 2022
+++ pkgsrc/audio/snapcast/patches/patch-server_streamreader_pipe__stream.cpp    Tue Sep 30 06:49:38 2025
@@ -1,12 +1,12 @@
-$NetBSD: patch-server_streamreader_pipe__stream.cpp,v 1.1 2022/07/03 16:09:15 nia Exp $
+$NetBSD: patch-server_streamreader_pipe__stream.cpp,v 1.2 2025/09/30 06:49:38 adam Exp $
 
 Add NetBSD support.
 
---- server/streamreader/pipe_stream.cpp.orig   2021-12-22 17:40:36.000000000 +0000
+--- server/streamreader/pipe_stream.cpp.orig   2025-09-29 07:26:16.257566594 +0000
 +++ server/streamreader/pipe_stream.cpp
-@@ -59,7 +59,7 @@ void PipeStream::do_connect()
- {
-     int fd = open(uri_.path.c_str(), O_RDONLY | O_NONBLOCK);
+@@ -73,7 +73,7 @@ void PipeStream::connect()
+     }
+ 
      int pipe_size = -1;
 -#if !defined(MACOS) && !defined(FREEBSD)
 +#ifdef __linux__

Index: pkgsrc/audio/snapcast/patches/patch-server_etc_snapserver.conf
diff -u pkgsrc/audio/snapcast/patches/patch-server_etc_snapserver.conf:1.2 pkgsrc/audio/snapcast/patches/patch-server_etc_snapserver.conf:1.3
--- pkgsrc/audio/snapcast/patches/patch-server_etc_snapserver.conf:1.2  Wed Jul  6 10:04:46 2022
+++ pkgsrc/audio/snapcast/patches/patch-server_etc_snapserver.conf      Tue Sep 30 06:49:37 2025
@@ -1,17 +1,17 @@
-$NetBSD: patch-server_etc_snapserver.conf,v 1.2 2022/07/06 10:04:46 nia Exp $
+$NetBSD: patch-server_etc_snapserver.conf,v 1.3 2025/09/30 06:49:37 adam Exp $
 
 Don't hardcode various paths, allow pkgsrc to substitute them.
 
---- server/etc/snapserver.conf.orig    2021-12-22 17:40:36.000000000 +0000
+--- server/etc/snapserver.conf.orig    2025-09-29 07:26:16.175169946 +0000
 +++ server/etc/snapserver.conf
 @@ -30,7 +30,7 @@
  #threads = -1
  
- # the pid file when running as daemon
+ # the pid file when running as daemon (-d or --daemon)
 -#pidfile = /var/run/snapserver/pid
 +#pidfile = @VARBASE@/run/snapserver/pid
  
- # the user to run as when daemonized
+ # the user to run as when daemonized (-d or --daemon)
  #user = snapserver
 @@ -39,7 +39,7 @@
  
@@ -20,14 +20,18 @@ Don't hardcode various paths, allow pkgs
 -#  - "/var/lib/snapserver/" when running as daemon
 +#  - "@VARBASE@/lib/snapserver/" when running as daemon
  #  - "$HOME/.config/snapserver/" when not running as daemon
- #datadir = 
+ #datadir =
  
-@@ -65,7 +65,7 @@
+@@ -190,10 +190,10 @@ doc_root = @PREFIX@/share/snapserver/sna
+ source = pipe:///tmp/snapfifo?name=default
  
- # serve a website from the doc_root location
- # disabled if commented or empty
--doc_root = /usr/share/snapserver/snapweb
-+doc_root = @PREFIX@/share/snapserver/snapweb
+ # Plugin directory, containing scripts, referred by "controlscript"
+-#plugin_dir = /usr/share/snapserver/plug-ins
++#plugin_dir = @PREFIX@/share/snapserver/plug-ins
  
- # Hostname or IP under which clients can reach this host
- # used to serve cached cover art
+ # Sandbox directory, containing executables, started by "process" and "librespot" streams
+-#sandbox_dir = /usr/share/snapserver/sandbox
++#sandbox_dir = @PREFIX@/share/snapserver/sandbox
+ 
+ # Default sample format: <sample rate>:<bits per sample>:<channels>
+ #sampleformat = 48000:16:2

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/graphics/py-tifffile
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/graphics/py-tifffile
Indexes:

Home | Main Index | Thread Index | Old Index