diff --git a/multimedia/lms/Makefile b/multimedia/lms/Makefile index 1e3c1994bce0..c096bc691661 100644 --- a/multimedia/lms/Makefile +++ b/multimedia/lms/Makefile @@ -1,42 +1,43 @@ 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 MAINTAINER= yuri@FreeBSD.org 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 \ libGraphicsMagick.so:graphics/GraphicsMagick \ libtag.so:audio/taglib \ libwthttp.so:www/wt RUN_DEPENDS= ffmpeg:multimedia/ffmpeg USES= cmake compiler:c++17-lang cpe pkgconfig USER= nobody GROUP= nobody SUB_LIST= USER=${USER} USE_RC_SUBR= ${PORTNAME} PLIST_SUB= USER="${USER}" GROUP="${GROUP}" post-patch: @${REINPLACE_CMD} -e 's|"/etc/lms.conf"|"${PREFIX}/etc/lms.conf"|' \ ${WRKSRC}/src/lms/main.cpp \ ${WRKSRC}/src/tools/cover/LmsCover.cpp \ ${WRKSRC}/src/tools/recommendation/LmsRecommendation.cpp @${REINPLACE_CMD} -e 's|"/usr/|"${PREFIX}/|; s|"/var/lms/"|"/var/db/lms/"|' \ ${WRKSRC}/conf/lms.conf post-install: ${RLN} ${STAGEDIR}${DATADIR}/lms.conf ${STAGEDIR}${PREFIX}/etc/lms.conf.sample ${MKDIR} ${STAGEDIR}/var/db/lms .include 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,18 +1,18 @@ ---- 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) throw SystemException {errno, "pipe2 failed!"}; +#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 res = fork(); if (res == -1) 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 @@ -1,60 +1,62 @@ bin/lms 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 %%DATADIR%%/approot/admin-database.xml %%DATADIR%%/approot/admin-initwizard.xml %%DATADIR%%/approot/admin-scannercontroller.xml %%DATADIR%%/approot/admin-user.xml %%DATADIR%%/approot/admin-users.xml %%DATADIR%%/approot/artist.xml %%DATADIR%%/approot/artists.xml %%DATADIR%%/approot/error.xml %%DATADIR%%/approot/explore.xml %%DATADIR%%/approot/images/unknown-artist.jpg %%DATADIR%%/approot/images/unknown-cover.jpg %%DATADIR%%/approot/login.xml %%DATADIR%%/approot/mediaplayer.xml %%DATADIR%%/approot/messages.xml %%DATADIR%%/approot/messages_fr.xml %%DATADIR%%/approot/messages_it.xml %%DATADIR%%/approot/messages_zh.xml %%DATADIR%%/approot/playqueue.xml %%DATADIR%%/approot/%%CMAKE_BUILD_TYPE%%.xml %%DATADIR%%/approot/%%CMAKE_BUILD_TYPE%%s.xml %%DATADIR%%/approot/search.xml %%DATADIR%%/approot/settings.xml %%DATADIR%%/approot/templates.xml %%DATADIR%%/approot/tracks.xml %%DATADIR%%/default.service %%DATADIR%%/docroot/css/S6u8w4BMUTPHjxsAUi-qJCY.woff2 %%DATADIR%%/docroot/css/S6u8w4BMUTPHjxsAXC-q.woff2 %%DATADIR%%/docroot/css/S6u9w4BMUTPHh6UVSwaPGR_p.woff2 %%DATADIR%%/docroot/css/S6u9w4BMUTPHh6UVSwiPGQ.woff2 %%DATADIR%%/docroot/css/S6uyw4BMUTPHjx4wXg.woff2 %%DATADIR%%/docroot/css/S6uyw4BMUTPHjxAwXjeu.woff2 %%DATADIR%%/docroot/css/bootstrap-darkly.min.css %%DATADIR%%/docroot/css/bootstrap-flatly.min.css %%DATADIR%%/docroot/css/fonts.css %%DATADIR%%/docroot/css/lms-darkly.css %%DATADIR%%/docroot/css/lms-flatly.css %%DATADIR%%/docroot/css/lms.css %%DATADIR%%/docroot/js/bootstrap-notify.js %%DATADIR%%/docroot/js/bootstrap.min.js %%DATADIR%%/docroot/js/jquery-1.10.2.min.js %%DATADIR%%/docroot/js/mediaplayer.js %%DATADIR%%/lms %%DATADIR%%/lms.conf @owner %%USER%% @group %%GROUP%% @dir /var/db/lms