<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5e610aa621336f809b7e02adbfbe0c277a385176">https://github.com/macports/macports-ports/commit/5e610aa621336f809b7e02adbfbe0c277a385176</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 5e610aa6213 lms: update to 3.60.0
</span>5e610aa6213 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5e610aa621336f809b7e02adbfbe0c277a385176
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Thu Oct 31 11:40:00 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> lms: update to 3.60.0
</span>---
audio/lms/Portfile | 15 ++---
audio/lms/files/0001-Fix-lms.conf-path.patch | 94 ++++++----------------------
2 files changed, 26 insertions(+), 83 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/lms/Portfile b/audio/lms/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ee299805684..95910e1aaa9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/lms/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/lms/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ legacysupport.redirect_bins lms lms-metadata lms-recommendation
</span>
boost.version 1.81
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup epoupon lms 3.58.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup epoupon lms 3.60.0 v
</span> revision 0
categories audio multimedia www
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,9 +24,9 @@ description Lightweight Music Server
</span> long_description LMS is a self-hosted music streaming software: \
access your music collection from anywhere using a web interface.
homepage https://lms-demo.poupon.dev
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 a7fee9835ad911aa2fd25796d28586ecf25fe077 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 557476f01f6e6527c656ff6b26383adc785d95c4017df2450d80eb67834ae3e0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 449627
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b9677c05cf8c9fa558b925eb59ee1b557b8aa2e3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ae071c2841b056291fe05f28845be37cb839b0b813c5e52a663e6c9fced4f765 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 458598
</span> github.tarball_from archive
depends_build-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,11 +43,8 @@ depends_lib-append port:ffmpeg \
</span> patchfiles-append 0001-Fix-lms.conf-path.patch
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/src/lms/main.cpp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/src/tools/cover/LmsCover.cpp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/src/tools/db-generator/LmsDbGenerator.cpp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/src/tools/recommendation/LmsRecommendation.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PREFIX@|${prefix}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/src/libs/core/include/core/SystemPaths.hpp
</span> }
configure.args-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/lms/files/0001-Fix-lms.conf-path.patch b/audio/lms/files/0001-Fix-lms.conf-path.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index c4c506ab0d5..57a2c4565a9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/lms/files/0001-Fix-lms.conf-path.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/lms/files/0001-Fix-lms.conf-path.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,69 +1,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From ecf3b2ac7ff058d5a33a498b194fa65af427f2bf Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Sergey Fedorov <barracuda@macos-powerpc.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sat, 14 Sep 2024 14:02:57 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix lms.conf path
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/lms/main.cpp | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/tools/cover/LmsCover.cpp | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/tools/db-generator/LmsDbGenerator.cpp | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/tools/recommendation/LmsRecommendation.cpp | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4 files changed, 4 insertions(+), 4 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/lms/main.cpp src/lms/main.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 63cb1309..7e231261 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/lms/main.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/lms/main.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -211,7 +211,7 @@ namespace lms
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int main(int argc, char* argv[])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- std::filesystem::path configFilePath{ "/etc/lms.conf" };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std::filesystem::path configFilePath{ "/opt/local/etc/lms.conf" };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int res{ EXIT_FAILURE };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(argc > 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/tools/cover/LmsCover.cpp src/tools/cover/LmsCover.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index ce5f5320..fb44d219 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/tools/cover/LmsCover.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/tools/cover/LmsCover.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -66,7 +66,7 @@ int main(int argc, char* argv[])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- core::Service<core::logging::ILogger> logger{ std::make_unique<core::logging::StreamLogger>(std::cout) };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- po::options_description desc{ "Allowed options" };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- desc.add_options()("help,h", "print usage message")("conf,c", po::value<std::string>()->default_value("/etc/lms.conf"), "LMS config file")("default-cover,d", po::value<std::string>(), "Default cover path")("tracks,t", "dump covers for tracks")("size,s", po::value<unsigned>()->default_value(512), "Requested cover size")("quality,q", po::value<unsigned>()->default_value(75), "JPEG quality (1-100)");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ desc.add_options()("help,h", "print usage message")("conf,c", po::value<std::string>()->default_value("/opt/local/etc/lms.conf"), "LMS config file")("default-cover,d", po::value<std::string>(), "Default cover path")("tracks,t", "dump covers for tracks")("size,s", po::value<unsigned>()->default_value(512), "Requested cover size")("quality,q", po::value<unsigned>()->default_value(75), "JPEG quality (1-100)");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- po::variables_map vm;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- po::store(po::parse_command_line(argc, argv, desc), vm);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/tools/db-generator/LmsDbGenerator.cpp src/tools/db-generator/LmsDbGenerator.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e41882ed..fe1a06a9 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/tools/db-generator/LmsDbGenerator.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/tools/db-generator/LmsDbGenerator.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -177,7 +177,7 @@ int main(int argc, char* argv[])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const GeneratorParameters defaultParams;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- program_options::options_description options{ "Options" };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- options.add_options()("conf,c", program_options::value<std::string>()->default_value("/etc/lms.conf"), "lms config file")("media-library-count", program_options::value<unsigned>()->default_value(defaultParams.mediaLibraryCount), "Number of media libraries to use")("release-count-per-batch", program_options::value<unsigned>()->default_value(defaultParams.releaseCountPerBatch), "Number of releases to generate before committing transaction")("release-count", program_options::value< [...]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ options.add_options()("conf,c", program_options::value<std::string>()->default_value("/opt/local/etc/lms.conf"), "lms config file")("media-library-count", program_options::value<unsigned>()->default_value(defaultParams.mediaLibraryCount), "Number of media libraries to use")("release-count-per-batch", program_options::value<unsigned>()->default_value(defaultParams.releaseCountPerBatch), "Number of releases to generate before committing transaction")("release-count", program_optio [...]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- program_options::variables_map vm;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- program_options::store(program_options::parse_command_line(argc, argv, options), vm);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/tools/recommendation/LmsRecommendation.cpp src/tools/recommendation/LmsRecommendation.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 578de0ba..4a1a4a73 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/tools/recommendation/LmsRecommendation.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/tools/recommendation/LmsRecommendation.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -132,7 +132,7 @@ int main(int argc, char* argv[])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- core::Service<core::logging::ILogger> logger{ std::make_unique<core::logging::StreamLogger>(std::cout) };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- po::options_description desc{ "Allowed options" };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- desc.add_options()("help,h", "print usage message")("conf,c", po::value<std::string>()->default_value("/etc/lms.conf"), "LMS config file")("artists,a", "Display recommendation for artists")("releases,r", "Display recommendation for releases")("tracks,t", "Display recommendation for tracks")("max,m", po::value<unsigned>()->default_value(3), "Max similarity result count");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ desc.add_options()("help,h", "print usage message")("conf,c", po::value<std::string>()->default_value("/opt/local/etc/lms.conf"), "LMS config file")("artists,a", "Display recommendation for artists")("releases,r", "Display recommendation for releases")("tracks,t", "Display recommendation for tracks")("max,m", po::value<unsigned>()->default_value(3), "Max similarity result count");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- po::variables_map vm;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- po::store(po::parse_command_line(argc, argv, desc), vm);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> From 4de02058a1a6db8600c476c2759925b76a52434d Mon Sep 17 00:00:00 2001
From: Sergey Fedorov <barracuda@macos-powerpc.org>
Date: Sat, 14 Sep 2024 15:24:22 +0800
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,11 +16,11 @@ index 4fcca840..14aa01ce 100644
</span> # Path to the working directory
# Must have write privileges in order to create and modify this directory
-working-dir = "/var/lms/";
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+working-dir = "/opt/local/var/lms/";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++working-dir = "@PREFIX@/var/lms/";
</span>
# ffmpeg location
-ffmpeg-file = "/usr/bin/ffmpeg";
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ffmpeg-file = "/opt/local/bin/ffmpeg";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ffmpeg-file = "@PREFIX@/bin/ffmpeg";
</span>
# Log files, empty means stdout
log-file = "";
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,17 +31,29 @@ index 4fcca840..14aa01ce 100644
</span> -tls-cert = "/var/lms/cert.pem";
-tls-key = "/var/lms/privkey.pem";
-tls-dh = "/var/lms/dh2048.pem";
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+tls-cert = "/opt/local/var/lms/cert.pem";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+tls-key = "/opt/local/var/lms/privkey.pem";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+tls-dh = "/opt/local/var/lms/dh2048.pem";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++tls-cert = "@PREFIX@/var/lms/cert.pem";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++tls-key = "@PREFIX@/var/lms/privkey.pem";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++tls-dh = "@PREFIX@/var/lms/dh2048.pem";
</span>
# Path to the resources used by the web interface.
-wt-resources = "/usr/share/Wt/resources";
-docroot = "/usr/share/lms/docroot/;/resources,/css,/images,/js,/favicon.ico";
-approot = "/usr/share/lms/approot";
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+wt-resources = "/opt/local/share/Wt/resources";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+docroot = "/opt/local/share/lms/docroot/;/resources,/css,/images,/js,/favicon.ico";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+approot = "/opt/local/share/lms/approot";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++wt-resources = "@PREFIX@/share/Wt/resources";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++docroot = "@PREFIX@/share/lms/docroot/;/resources,/css,/images,/js,/favicon.ico";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++approot = "@PREFIX@/share/lms/approot";
</span> # Location for deployment (See README if you want to deploy on a non root path)
deploy-path = "/";
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/libs/core/include/core/SystemPaths.hpp 2024-10-12 03:51:40.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/libs/core/include/core/SystemPaths.hpp 2024-10-31 10:00:19.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,5 +23,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace lms::core
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static inline const std::filesystem::path sysconfDirectory{ "/etc" };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\ No newline at end of file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static inline const std::filesystem::path sysconfDirectory{ "@PREFIX@/etc" };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span></pre><pre style='margin:0'>
</pre>