From f8d201dab41c445636dd1ed7e7f0c64c75dee404 Mon Sep 17 00:00:00 2001 From: amak Date: Fri, 24 Feb 2023 15:13:22 +1100 Subject: [PATCH] snapcast: update to 0.27.0 --- srcpkgs/snapcast/patches/boost-1.81.patch | 51 ------------------- .../patches/meta_mpd.py-permission-fix.patch | 19 ------- srcpkgs/snapcast/template | 4 +- 3 files changed, 2 insertions(+), 72 deletions(-) delete mode 100644 srcpkgs/snapcast/patches/boost-1.81.patch delete mode 100644 srcpkgs/snapcast/patches/meta_mpd.py-permission-fix.patch diff --git a/srcpkgs/snapcast/patches/boost-1.81.patch b/srcpkgs/snapcast/patches/boost-1.81.patch deleted file mode 100644 index 032bc5213a37..000000000000 --- a/srcpkgs/snapcast/patches/boost-1.81.patch +++ /dev/null @@ -1,51 +0,0 @@ -Index: snapcast-0.26.0/server/control_session_http.cpp -=================================================================== ---- snapcast-0.26.0.orig/server/control_session_http.cpp -+++ snapcast-0.26.0/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 path; -+ std::string result = base; - char constexpr path_separator = '/'; - if (result.back() == path_separator) - result.resize(result.size() - 1); -@@ -140,7 +140,7 @@ std::string path_cat(boost::beast::strin - ControlSessionHttp::ControlSessionHttp(ControlMessageReceiver* receiver, tcp::socket&& socket, const ServerSettings::Http& settings) - : ControlSession(receiver), socket_(std::move(socket)), settings_(settings) - { -- LOG(DEBUG, LOG_TAG) << "ControlSessionHttp, Local IP: " << socket_.local_endpoint().address().to_string() << "\n"; -+ LOG(DEBUG, LOG_TAG) << "ControlSessionHttp, Local IP: " << socket_.local_endpoint().address() << "\n"; - } - - -@@ -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() = 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 '" + 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: '" + std::string{what} + "'"; - res.prepare_payload(); - return res; - }; diff --git a/srcpkgs/snapcast/patches/meta_mpd.py-permission-fix.patch b/srcpkgs/snapcast/patches/meta_mpd.py-permission-fix.patch deleted file mode 100644 index ebff8013f574..000000000000 --- a/srcpkgs/snapcast/patches/meta_mpd.py-permission-fix.patch +++ /dev/null @@ -1,19 +0,0 @@ -This patch fixes an issue where meta_mpd.py is installed with executable -permissions only. This results in a 'Permission denied' message for -03-rewrite-python-shebang, and a fatal error for xbps-create when processing -the file hash. Fixed upstream in 7ab3daa. - -https://github.com/badaix/snapcast/issues/1021 - -diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt -index e1271b80..25432cd5 100644 ---- a/server/CMakeLists.txt -+++ b/server/CMakeLists.txt -@@ -117,6 +117,6 @@ else() - install(FILES etc/snapserver.conf COMPONENT server DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}) - 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/) -+ install(FILES etc/plug-ins/meta_mpd.py PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION ${CMAKE_INSTALL_DATADIR}/snapserver/plug-ins/) - #install(FILES ../debian/snapserver.service DESTINATION ${SYSTEMD_SERVICES_INSTALL_DIR}) - endif() diff --git a/srcpkgs/snapcast/template b/srcpkgs/snapcast/template index e330653723ed..2440d44d8f51 100644 --- a/srcpkgs/snapcast/template +++ b/srcpkgs/snapcast/template @@ -1,6 +1,6 @@ # Template file for 'snapcast' pkgname=snapcast -version=0.26.0 +version=0.27.0 revision=1 build_style=cmake configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc -DBUILD_WITH_TREMOR=OFF @@ -16,7 +16,7 @@ license="GPL-3.0-or-later" homepage="https://github.com/badaix/snapcast" changelog="https://raw.githubusercontent.com/badaix/snapcast/master/changelog.md" distfiles="https://github.com/badaix/snapcast/archive/v${version}.tar.gz" -checksum=166353267a5c461a3a0e7cbd05d78c4bfdaebeda078801df3b76820b54f27683 +checksum=c662c6eafbaa42a4797a4ed6ba4a7602332abf99f6ba6ea88ff8ae59978a86ba build_options="avahi pulseaudio" build_options_default="avahi pulseaudio"