<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/22d1d084c50aa1c1d166c8761de8a8500efc7aa9">https://github.com/macports/macports-ports/commit/22d1d084c50aa1c1d166c8761de8a8500efc7aa9</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 22d1d084c50aa1c1d166c8761de8a8500efc7aa9
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Fri Sep 20 06:21:15 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> lms: update to 3.58.0
</span>---
audio/lms/Portfile | 16 ++--
...akeLists-do-not-use-Linux-ldflag-on-macOS.patch | 22 ------
...onf-path.patch => 0001-Fix-lms.conf-path.patch} | 0
.../777c36005bdcdc09e1813a84f3f2c0acc0b47fac.patch | 87 ----------------------
4 files changed, 5 insertions(+), 120 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 4288cbf9628..139c51ea347 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;'>@@ -12,7 +12,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.57.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup epoupon lms 3.58.0 v
</span> revision 0
categories audio multimedia www
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,9 +23,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 2bb1cc927be668bf219002c52d0786a1c0f9b7cb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7e5d447715915d8d980d3a82a429358951e831ff43d955084109b5898545416c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 444691
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a7fee9835ad911aa2fd25796d28586ecf25fe077 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 557476f01f6e6527c656ff6b26383adc785d95c4017df2450d80eb67834ae3e0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 449627
</span> github.tarball_from archive
depends_build-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,14 +38,8 @@ depends_lib-append port:ffmpeg \
</span> port:taglib \
port:wt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/epoupon/lms/issues/514
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append 777c36005bdcdc09e1813a84f3f2c0acc0b47fac.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/epoupon/lms/pull/524
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append 0001-CMakeLists-do-not-use-Linux-ldflag-on-macOS.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # https://github.com/epoupon/lms/issues/525
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append 0002-Fix-lms.conf-path.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append 0001-Fix-lms.conf-path.patch
</span>
post-patch {
reinplace "s|@PREFIX@|${prefix}|g" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/lms/files/0001-CMakeLists-do-not-use-Linux-ldflag-on-macOS.patch b/audio/lms/files/0001-CMakeLists-do-not-use-Linux-ldflag-on-macOS.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index cd1d205d7d0..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/lms/files/0001-CMakeLists-do-not-use-Linux-ldflag-on-macOS.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From c4653f6237a87c22ff04b8e45d9568ebc6125ad3 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 11:30:24 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] CMakeLists: do not use Linux ldflag on macOS
</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;'>- CMakeLists.txt | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git CMakeLists.txt CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0d0b311f..6cb75ea9 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6,7 +6,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/modules/)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_CXX_STANDARD 20)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if (UNIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if (UNIX AND NOT APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/lms/files/0002-Fix-lms.conf-path.patch b/audio/lms/files/0001-Fix-lms.conf-path.patch
</span>similarity index 100%
rename from audio/lms/files/0002-Fix-lms.conf-path.patch
rename to audio/lms/files/0001-Fix-lms.conf-path.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/lms/files/777c36005bdcdc09e1813a84f3f2c0acc0b47fac.patch b/audio/lms/files/777c36005bdcdc09e1813a84f3f2c0acc0b47fac.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f379fe5e7c8..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/lms/files/777c36005bdcdc09e1813a84f3f2c0acc0b47fac.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,87 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 777c36005bdcdc09e1813a84f3f2c0acc0b47fac Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: emeric <emeric.poupon@laposte.net>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Fri, 13 Sep 2024 23:27:53 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Do not use pipe2 to make code more portable, ref #514
</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/libs/core/impl/ChildProcess.cpp | 39 +++++++++++++++++++----------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 26 insertions(+), 13 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/libs/core/impl/ChildProcess.cpp b/src/libs/core/impl/ChildProcess.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d2956a3d..599bd16b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/libs/core/impl/ChildProcess.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/libs/core/impl/ChildProcess.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -66,36 +66,49 @@ namespace lms::core
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static std::mutex mutex;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::unique_lock<std::mutex> lock{ mutex };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int pipe[2];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int pipefd[2];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int res{ pipe2(pipe, O_NONBLOCK | O_CLOEXEC) };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (res < 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- throw SystemException{ errno, "pipe2 failed!" };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Use 'pipe' instead of 'pipe2', more portable
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (pipe(pipefd) < 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw SystemException{ errno, "pipe failed!" };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Manually set the O_NONBLOCK and O_CLOEXEC flags for both ends of the pipe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (fcntl(pipefd[0], F_SETFL, O_NONBLOCK) == -1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw SystemException{ errno, "fcntl failed to set O_NONBLOCK!" };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (fcntl(pipefd[1], F_SETFL, O_NONBLOCK) == -1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw SystemException{ errno, "fcntl failed to set O_NONBLOCK!" };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (fcntl(pipefd[0], F_SETFD, FD_CLOEXEC) == -1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw SystemException{ errno, "fcntl failed to set FD_CLOEXEC!" };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (fcntl(pipefd[1], F_SETFD, FD_CLOEXEC) == -1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw SystemException{ errno, "fcntl failed to set FD_CLOEXEC!" };
</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;'>- #if defined(__linux__) && defined(F_SETPIPE_SZ)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Just a hint here to prevent the writer from writing too many bytes ahead of the reader
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- constexpr std::size_t pipeSize{ 65536 * 4 };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (fcntl(pipe[0], F_SETPIPE_SZ, pipeSize) == -1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (fcntl(pipefd[0], F_SETPIPE_SZ, pipeSize) == -1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- throw SystemException{ errno, "fcntl failed!" };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (fcntl(pipe[1], F_SETPIPE_SZ, pipeSize) == -1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (fcntl(pipefd[1], F_SETPIPE_SZ, pipeSize) == -1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- throw SystemException{ errno, "fcntl failed!" };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- res = fork();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int res{ fork() };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (res == -1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- throw SystemException{ errno, "fork failed!" };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (res == 0) // CHILD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- close(pipe[0]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ close(pipefd[0]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- close(STDIN_FILENO);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- close(STDERR_FILENO);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Replace stdout with pipe write
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (dup2(pipe[1], STDOUT_FILENO) == -1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (dup2(pipefd[1], STDOUT_FILENO) == -1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit(-1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::vector<const char*> execArgs;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -108,10 +121,10 @@ namespace lms::core
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else // PARENT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- close(pipe[1]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ close(pipefd[1]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- boost::system::error_code assignError;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _childStdout.assign(pipe[0], assignError);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _childStdout.assign(pipefd[0], assignError);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (assignError)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- throw SystemException{ assignError, "fork failed!" };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span></pre><pre style='margin:0'>
</pre>