From nobody Thu Mar 10 17:24:31 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id BCFEE19F328E; Thu, 10 Mar 2022 17:24:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KDwsq2B9kz4Vwr; Thu, 10 Mar 2022 17:24:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646933071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cCVetIjtK67mWYemIxMX1ejW7pF13y7fQed46nOjvSw=; b=SzFbk+RxOwdjCfF4JSiHgnLDXjRN1zzfVxhWe3ZUu+fhRP1lA2QAyXyzvmis06EEixaajy doz3pYzUF7n2DKAGYfBV3GMMydOZKmDhFkeHImi4Pmdr0xwGglG6lY2pl0ZO+D20mTocS6 qYZ2ZySDzx/ifmi8zj3Gvo2Ro/38DSTIKGhSqATctIonj/oinp7Ug2Ll8R11EoL0TC5JsX 4Y/M4FshL7td9puQPzuYDpoaHG+owuMRJhqJZsA43e0PWBo3I2onXDhG5CPBx1dKiqDd9e iaohbzfdSqSNAu0x4I4S2T4Apn1Zg+HmFm/26Aafe620N7Ymodz3diOVKPmK9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1BB69132D; Thu, 10 Mar 2022 17:24:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22AHOVUN016097; Thu, 10 Mar 2022 17:24:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22AHOVEt016096; Thu, 10 Mar 2022 17:24:31 GMT (envelope-from git) Date: Thu, 10 Mar 2022 17:24:31 GMT Message-Id: <202203101724.22AHOVEt016096@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: ab964ed967ad - main - multimedia/lms: Update 3.25.2 -> 3.28.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ab964ed967add91ae11cc584b11b3e0d3e8407c1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646933071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cCVetIjtK67mWYemIxMX1ejW7pF13y7fQed46nOjvSw=; b=EM9CcJH8bBf65P0gRRi7KjDoHVvggJdcGo8hiPS3OnMmRFxjTV20v9cVC71+aGSMzx2Hx4 3bIOwpmwquLgW6rjv0WTJY8o64JfkjIHqljqxjxs0/Yv2+NbxnOc5WM8pStc7X4bS63L6r iSwMJuYlqC3u63ybA+HDvZGFTlsvXBdCqXWXbyqSLdAXECyFhE+BYPJBOg8ubioUd7kkcH q/u/ZtBkVbFV3ldbeBHNw07Ltb8aU7kE7KIj9p/pfGi8sYcf+FM75BJgU9D37OydPYW7TY cWxrK7LYpps/QkFqMOvowgAasUvvqMDF/M4X+s6TvzH4ZnUo27tQGmJmIMIjFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646933071; a=rsa-sha256; cv=none; b=KXxpRY60ZPa+KERItvM992IqE2T1safyKqQgv6eCdr5z8suinlhDam7L4UTHhcq3SEzO0N PptwvVVHoLd6FndzEKVfpsdaVUE5uoDWMe4ivvxXnitfrMdboNTT0dw6fEasaiiPdZLYmU vuTyYEuWYql7GsNvCxBWmUfnxxc+B8eEY5Z6VJMRMszfKHnKGuTBBKwg9G0zmmBzfE2VeY SA/zLnrWD8ql9hQVjDLkD1kn4zN7RwdSeBfNlZM5qkghX/845wGe6e4acekLPaSIrHpwpq CuaBxk4Xe8x5QSPmKTff1ApzZCORcsRAl0fEVeNEvRpW2CmsDiq+bHzMwY+KHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=ab964ed967add91ae11cc584b11b3e0d3e8407c1 commit ab964ed967add91ae11cc584b11b3e0d3e8407c1 Author: Yuri Victorovich AuthorDate: 2022-03-10 17:22:05 +0000 Commit: Yuri Victorovich CommitDate: 2022-03-10 17:24:26 +0000 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(-) 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