CVS commit: pkgsrc/audio/snapcast

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Jan 30 10:41:57 UTC 2023

Modified Files:
        pkgsrc/audio/snapcast: distinfo
Added Files:
        pkgsrc/audio/snapcast/patches: patch-server_control__session__http.cpp

Log Message:
snapcast: fix build with boost 1.81.0 using upstream patch


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/snapcast/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/audio/snapcast/patches/patch-server_control__session__http.cpp

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/distinfo
diff -u pkgsrc/audio/snapcast/distinfo:1.2 pkgsrc/audio/snapcast/distinfo:1.3
--- pkgsrc/audio/snapcast/distinfo:1.2  Wed Jul  6 10:04:46 2022
+++ pkgsrc/audio/snapcast/distinfo      Mon Jan 30 10:41:57 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2022/07/06 10:04:46 nia Exp $
+$NetBSD: distinfo,v 1.3 2023/01/30 10:41:57 wiz Exp $
 
 BLAKE2s (snapcast-0.26.0.tar.gz) = e0ef56ee25d30c8536158949c5e5f85b32a8c410303da939ef844bb3dc300012
 SHA512 (snapcast-0.26.0.tar.gz) = fc7885e42a11794e33314544083251ffbb91a0cf160c6d4b854c56f57ffe9f38f75c7594478c9edabfe9076959938cd8de891dd456e66202692de664a75cde71
@@ -11,6 +11,7 @@ SHA1 (patch-client_player_sun__player.hp
 SHA1 (patch-client_snapclient.cpp) = d682d4c1de438251d1510d40387e9a0b2bcf926f
 SHA1 (patch-common_utils.hpp) = 8184a65459accd76b55e8e9e95d1911439fb4d8a
 SHA1 (patch-server_CMakeLists.txt) = 49144e902844bd3308871a625f5da56575904855
+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

Added files:

Index: pkgsrc/audio/snapcast/patches/patch-server_control__session__http.cpp
diff -u /dev/null pkgsrc/audio/snapcast/patches/patch-server_control__session__http.cpp:1.1
--- /dev/null   Mon Jan 30 10:41:57 2023
+++ pkgsrc/audio/snapcast/patches/patch-server_control__session__http.cpp       Mon Jan 30 10:41:57 2023
@@ -0,0 +1,45 @@
+$NetBSD: patch-server_control__session__http.cpp,v 1.1 2023/01/30 10:41:57 wiz Exp $
+
+Build fix for boost 1.81.0
+https://github.com/badaix/snapcast/commit/853c3f622ff2262b56681ee04dd20b4266c72493
+
+--- server/control_session_http.cpp.orig       2021-12-22 17:40:36.000000000 +0000
++++ server/control_session_http.cpp
+@@ -127,8 +127,8 @@ boost::beast::string_view mime_type(boos
+ std::string path_cat(boost::beast::string_view base, boost::beast::string_view path)
+ {
+     if (base.empty())
+-        return path.to_string();
+-    std::string result = base.to_string();
++        return static_cast<std::string>(path);
++    std::string result = static_cast<std::string>(base);
+     char constexpr path_separator = '/';
+     if (result.back() == path_separator)
+         result.resize(result.size() - 1);
+@@ -171,7 +171,7 @@ void ControlSessionHttp::handle_request(
+         res.set(http::field::server, HTTP_SERVER_NAME);
+         res.set(http::field::content_type, "text/html");
+         res.keep_alive(req.keep_alive());
+-        res.body() = why.to_string();
++        res.body() = static_cast<std::string>(why);
+         res.prepare_payload();
+         return res;
+     };
+@@ -182,7 +182,7 @@ void ControlSessionHttp::handle_request(
+         res.set(http::field::server, HTTP_SERVER_NAME);
+         res.set(http::field::content_type, "text/html");
+         res.keep_alive(req.keep_alive());
+-        res.body() = "The resource '" + target.to_string() + "' was not found.";
++        res.body() = "The resource '" + static_cast<std::string>(target) + "' was not found.";
+         res.prepare_payload();
+         return res;
+     };
+@@ -204,7 +204,7 @@ void ControlSessionHttp::handle_request(
+         res.set(http::field::server, HTTP_SERVER_NAME);
+         res.set(http::field::content_type, "text/html");
+         res.keep_alive(req.keep_alive());
+-        res.body() = "An error occurred: '" + what.to_string() + "'";
++        res.body() = "An error occurred: '" + static_cast<std::string>(what) + "'";
+         res.prepare_payload();
+         return res;
+     };