From ab964ed967add91ae11cc584b11b3e0d3e8407c1 Mon Sep 17 00:00:00 2001 From: Yuri Victorovich Date: Thu, 10 Mar 2022 09:22:05 -0800 Subject: multimedia/lms: Update 3.25.2 -> 3.28.0 PR: 262462 Reported by: kaltheat --- multimedia/lms/Makefile | 5 +++-- multimedia/lms/distinfo | 8 +++----- multimedia/lms/files/patch-cmake_modules_FindSTB.cmake | 10 ++++++++++ .../lms/files/patch-src_libs_utils_impl_ChildProcess.cpp | 10 +++++----- multimedia/lms/pkg-plist | 4 +++- 5 files changed, 24 insertions(+), 13 deletions(-) create mode 100644 multimedia/lms/files/patch-cmake_modules_FindSTB.cmake (limited to 'multimedia') diff --git a/multimedia/lms/Makefile b/multimedia/lms/Makefile index 1e3c1994bce0..c096bc691661 100644 --- a/multimedia/lms/Makefile +++ b/multimedia/lms/Makefile @@ -1,6 +1,5 @@ PORTNAME= lms -DISTVERSION= 3.25.2 -PORTREVISION= 1 +DISTVERSION= 3.28.0 MASTER_SITES= https://github.com/epoupon/lms/archive/refs/tags/v${DISTVERSION}${EXTRACT_SUFX}?dummy=/ CATEGORIES= multimedia @@ -10,6 +9,8 @@ COMMENT= Lightweight Music Server LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING +BUILD_DEPENDS= googletest>0:devel/googletest \ + ${LOCALBASE}/include/stb/stb_image.h:devel/stb LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \ libboost_system.so:devel/boost-libs \ libconfig++.so:devel/libconfig \ diff --git a/multimedia/lms/distinfo b/multimedia/lms/distinfo index fddc50d41c84..1491c58da997 100644 --- a/multimedia/lms/distinfo +++ b/multimedia/lms/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1619717962 -SHA256 (lms-3.25.2.tar.gz) = 30959f3c8e70c7b7a53f7a40d1e4b3c2d21c4c4f1864c449595a629dbbc471e3 -SIZE (lms-3.25.2.tar.gz) = 431691 -SHA256 (b45b30ded44bb49865bbce7b43612f36043126ea.patch) = a792b3cbd7ccb366ffeed8e85c616cd6f96dc55781bb00867aeda61018737f98 -SIZE (b45b30ded44bb49865bbce7b43612f36043126ea.patch) = 1751 +TIMESTAMP = 1646928270 +SHA256 (lms-3.28.0.tar.gz) = 7128bbf83be14e1037ed1d6ad678679bcac52cf987be112b9b223c3b672f952c +SIZE (lms-3.28.0.tar.gz) = 462781 diff --git a/multimedia/lms/files/patch-cmake_modules_FindSTB.cmake b/multimedia/lms/files/patch-cmake_modules_FindSTB.cmake new file mode 100644 index 000000000000..5d3a894f91eb --- /dev/null +++ b/multimedia/lms/files/patch-cmake_modules_FindSTB.cmake @@ -0,0 +1,10 @@ +- workaround for https://github.com/epoupon/lms/issues/207 + +--- cmake/modules/FindSTB.cmake.orig 2022-03-10 16:21:18 UTC ++++ cmake/modules/FindSTB.cmake +@@ -1,4 +1,4 @@ +-find_path(STB_INCLUDE_DIR stb/stb.h) ++find_path(STB_INCLUDE_DIR stb/stb_image.h) + + include(FindPackageHandleStandardArgs) + diff --git a/multimedia/lms/files/patch-src_libs_utils_impl_ChildProcess.cpp b/multimedia/lms/files/patch-src_libs_utils_impl_ChildProcess.cpp index 52046a1b918a..f273aee461d0 100644 --- a/multimedia/lms/files/patch-src_libs_utils_impl_ChildProcess.cpp +++ b/multimedia/lms/files/patch-src_libs_utils_impl_ChildProcess.cpp @@ -1,4 +1,4 @@ ---- src/libs/utils/impl/ChildProcess.cpp.orig 2021-04-25 18:33:13 UTC +--- src/libs/utils/impl/ChildProcess.cpp.orig 2022-02-02 17:25:04 UTC +++ src/libs/utils/impl/ChildProcess.cpp @@ -68,6 +68,7 @@ ChildProcess::ChildProcess(boost::asio::io_context& io if (res < 0) @@ -6,11 +6,11 @@ +#if !defined(__FreeBSD__) // see https://github.com/epoupon/lms/issues/144 { - const std::size_t pipeSize {65536*8}; - -@@ -77,6 +78,7 @@ ChildProcess::ChildProcess(boost::asio::io_context& io - if (fcntl(pipe[1], F_SETPIPE_SZ, pipeSize) == -1) + #if defined(__linux__) && defined(F_SETPIPE_SZ) + // Just a hint here to prevent the writer from writing too many bytes ahead of the reader +@@ -79,6 +80,7 @@ ChildProcess::ChildProcess(boost::asio::io_context& io throw SystemException {errno, "fcntl failed!"}; + #endif } +#endif diff --git a/multimedia/lms/pkg-plist b/multimedia/lms/pkg-plist index c2affbb66c49..ecb4706c23f5 100644 --- a/multimedia/lms/pkg-plist +++ b/multimedia/lms/pkg-plist @@ -3,12 +3,14 @@ bin/lms-metadata bin/lms-recommendation lib/liblmsauth.so lib/liblmsav.so -lib/liblmscover.so lib/liblmsdatabase.so +lib/liblmsimage.so lib/liblmsmetadata.so lib/liblmsrecommendation.so lib/liblmsscanner.so lib/liblmsscrobbling.so +lib/liblmsservice-cover.so +lib/liblmssom.so lib/liblmssubsonic.so lib/liblmsutils.so @sample etc/lms.conf.sample -- cgit v1.2.3