lms: update to 3.60.0

This commit is contained in:
Sergey Fedorov
2024-10-31 11:40:00 +08:00
committed by Renee Otten
parent 508ac8d232
commit 5e610aa621
2 changed files with 26 additions and 83 deletions
+6 -9
View File
@@ -13,7 +13,7 @@ legacysupport.redirect_bins lms lms-metadata lms-recommendation
boost.version 1.81
github.setup epoupon lms 3.58.0 v
github.setup epoupon lms 3.60.0 v
revision 0
categories audio multimedia www
@@ -24,9 +24,9 @@ description Lightweight Music Server
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
checksums rmd160 a7fee9835ad911aa2fd25796d28586ecf25fe077 \
sha256 557476f01f6e6527c656ff6b26383adc785d95c4017df2450d80eb67834ae3e0 \
size 449627
checksums rmd160 b9677c05cf8c9fa558b925eb59ee1b557b8aa2e3 \
sha256 ae071c2841b056291fe05f28845be37cb839b0b813c5e52a663e6c9fced4f765 \
size 458598
github.tarball_from archive
depends_build-append \
@@ -43,11 +43,8 @@ depends_lib-append port:ffmpeg \
patchfiles-append 0001-Fix-lms.conf-path.patch
post-patch {
reinplace "s|@PREFIX@|${prefix}|g" \
${worksrcpath}/src/lms/main.cpp \
${worksrcpath}/src/tools/cover/LmsCover.cpp \
${worksrcpath}/src/tools/db-generator/LmsDbGenerator.cpp \
${worksrcpath}/src/tools/recommendation/LmsRecommendation.cpp
reinplace "s|@PREFIX@|${prefix}|" \
${worksrcpath}/src/libs/core/include/core/SystemPaths.hpp
}
configure.args-append \
+20 -74
View File
@@ -1,69 +1,3 @@
From ecf3b2ac7ff058d5a33a498b194fa65af427f2bf Mon Sep 17 00:00:00 2001
From: Sergey Fedorov <barracuda@macos-powerpc.org>
Date: Sat, 14 Sep 2024 14:02:57 +0800
Subject: [PATCH] Fix lms.conf path
---
src/lms/main.cpp | 2 +-
src/tools/cover/LmsCover.cpp | 2 +-
src/tools/db-generator/LmsDbGenerator.cpp | 2 +-
src/tools/recommendation/LmsRecommendation.cpp | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git src/lms/main.cpp src/lms/main.cpp
index 63cb1309..7e231261 100644
--- src/lms/main.cpp
+++ src/lms/main.cpp
@@ -211,7 +211,7 @@ namespace lms
int main(int argc, char* argv[])
{
- std::filesystem::path configFilePath{ "/etc/lms.conf" };
+ std::filesystem::path configFilePath{ "/opt/local/etc/lms.conf" };
int res{ EXIT_FAILURE };
assert(argc > 0);
diff --git src/tools/cover/LmsCover.cpp src/tools/cover/LmsCover.cpp
index ce5f5320..fb44d219 100644
--- src/tools/cover/LmsCover.cpp
+++ src/tools/cover/LmsCover.cpp
@@ -66,7 +66,7 @@ int main(int argc, char* argv[])
core::Service<core::logging::ILogger> logger{ std::make_unique<core::logging::StreamLogger>(std::cout) };
po::options_description desc{ "Allowed options" };
- 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)");
+ 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)");
po::variables_map vm;
po::store(po::parse_command_line(argc, argv, desc), vm);
diff --git src/tools/db-generator/LmsDbGenerator.cpp src/tools/db-generator/LmsDbGenerator.cpp
index e41882ed..fe1a06a9 100644
--- src/tools/db-generator/LmsDbGenerator.cpp
+++ src/tools/db-generator/LmsDbGenerator.cpp
@@ -177,7 +177,7 @@ int main(int argc, char* argv[])
const GeneratorParameters defaultParams;
program_options::options_description options{ "Options" };
- 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<unsigned>()->default_value(defaultParams.releaseCount), "Number of releases to generate")("track-count-per-release", program_options::value<unsigned>()->default_value(defaultParams.trackCountPerRelease), "Number of tracks per release")("compilation-ratio", program_options::value<float>()->default_value(defaultParams.compilationRatio), "Compilation ratio (compilation means all tracks have a different artist)")("track-path", program_options::value<std::string>()->required(), "Path of a valid track file, that will be used for all generated tracks")("genre-count", program_options::value<unsigned>()->default_value(defaultParams.genreCount), "Number of genres to generate")("genre-count-per-track", program_options::value<unsigned>()->default_value(defaultParams.genreCountPerTrack), "Number of genres to assign to each track")("mood-count", program_options::value<unsigned>()->default_value(defaultParams.moodCount), "Number of moods to generate")("mood-count-per-track", program_options::value<unsigned>()->default_value(defaultParams.moodCountPerTrack), "Number of moods to assign to each track")("help,h", "produce help message");
+ 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_options::value<unsigned>()->default_value(defaultParams.releaseCount), "Number of releases to generate")("track-count-per-release", program_options::value<unsigned>()->default_value(defaultParams.trackCountPerRelease), "Number of tracks per release")("compilation-ratio", program_options::value<float>()->default_value(defaultParams.compilationRatio), "Compilation ratio (compilation means all tracks have a different artist)")("track-path", program_options::value<std::string>()->required(), "Path of a valid track file, that will be used for all generated tracks")("genre-count", program_options::value<unsigned>()->default_value(defaultParams.genreCount), "Number of genres to generate")("genre-count-per-track", program_options::value<unsigned>()->default_value(defaultParams.genreCountPerTrack), "Number of genres to assign to each track")("mood-count", program_options::value<unsigned>()->default_value(defaultParams.moodCount), "Number of moods to generate")("mood-count-per-track", program_options::value<unsigned>()->default_value(defaultParams.moodCountPerTrack), "Number of moods to assign to each track")("help,h", "produce help message");
program_options::variables_map vm;
program_options::store(program_options::parse_command_line(argc, argv, options), vm);
diff --git src/tools/recommendation/LmsRecommendation.cpp src/tools/recommendation/LmsRecommendation.cpp
index 578de0ba..4a1a4a73 100644
--- src/tools/recommendation/LmsRecommendation.cpp
+++ src/tools/recommendation/LmsRecommendation.cpp
@@ -132,7 +132,7 @@ int main(int argc, char* argv[])
core::Service<core::logging::ILogger> logger{ std::make_unique<core::logging::StreamLogger>(std::cout) };
po::options_description desc{ "Allowed options" };
- 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");
+ 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");
po::variables_map vm;
po::store(po::parse_command_line(argc, argv, desc), vm);
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
@@ -82,11 +16,11 @@ index 4fcca840..14aa01ce 100644
# Path to the working directory
# Must have write privileges in order to create and modify this directory
-working-dir = "/var/lms/";
+working-dir = "/opt/local/var/lms/";
+working-dir = "@PREFIX@/var/lms/";
# ffmpeg location
-ffmpeg-file = "/usr/bin/ffmpeg";
+ffmpeg-file = "/opt/local/bin/ffmpeg";
+ffmpeg-file = "@PREFIX@/bin/ffmpeg";
# Log files, empty means stdout
log-file = "";
@@ -97,17 +31,29 @@ index 4fcca840..14aa01ce 100644
-tls-cert = "/var/lms/cert.pem";
-tls-key = "/var/lms/privkey.pem";
-tls-dh = "/var/lms/dh2048.pem";
+tls-cert = "/opt/local/var/lms/cert.pem";
+tls-key = "/opt/local/var/lms/privkey.pem";
+tls-dh = "/opt/local/var/lms/dh2048.pem";
+tls-cert = "@PREFIX@/var/lms/cert.pem";
+tls-key = "@PREFIX@/var/lms/privkey.pem";
+tls-dh = "@PREFIX@/var/lms/dh2048.pem";
# 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";
+wt-resources = "/opt/local/share/Wt/resources";
+docroot = "/opt/local/share/lms/docroot/;/resources,/css,/images,/js,/favicon.ico";
+approot = "/opt/local/share/lms/approot";
+wt-resources = "@PREFIX@/share/Wt/resources";
+docroot = "@PREFIX@/share/lms/docroot/;/resources,/css,/images,/js,/favicon.ico";
+approot = "@PREFIX@/share/lms/approot";
# Location for deployment (See README if you want to deploy on a non root path)
deploy-path = "/";
--- src/libs/core/include/core/SystemPaths.hpp 2024-10-12 03:51:40.000000000 +0800
+++ src/libs/core/include/core/SystemPaths.hpp 2024-10-31 10:00:19.000000000 +0800
@@ -23,5 +23,5 @@
namespace lms::core
{
- static inline const std::filesystem::path sysconfDirectory{ "/etc" };
-}
\ No newline at end of file
+ static inline const std::filesystem::path sysconfDirectory{ "@PREFIX@/etc" };
+}