From nobody Fri Dec 17 13:25:06 2021 X-Original-To: dev-commits-ports-main@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 AAD8E19028AF; Fri, 17 Dec 2021 13:25:06 +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 4JFqTt2X6rz3KXD; Fri, 17 Dec 2021 13:25:06 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 3719D1C85E; Fri, 17 Dec 2021 13:25:06 +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 1BHDP61Z020753; Fri, 17 Dec 2021 13:25:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BHDP6mJ020752; Fri, 17 Dec 2021 13:25:06 GMT (envelope-from git) Date: Fri, 17 Dec 2021 13:25:06 GMT Message-Id: <202112171325.1BHDP6mJ020752@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 3af7fd92d368 - main - multimedia/pipewire: correct OSVERSION check to use proper ncurses (+) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3af7fd92d3686822bfe4f077c7655934c685828e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639747506; 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=gb/RP8FrTjii4t9m+bBY64sMDFh6tnO/wKyWHrAskXg=; b=S0VkWcX6D6l/OHPCj2jUpu85ARZCP/7aCSQAoSY3dzo38WK8QF+owrdbxejrA24/1kJm4P ZE7CuHhFw5Q5JxY4s2/aqUgfyIW5OSOXV3upomZgsc0dggQZZNfxYPzkEzpueiz9Ol1YtA kBmgTwLTTvSpw+QaFXaz66EQP4rrFKiElmqjOr3xRepbJPDUNBwz4oGDJdnH7DHqvrNE33 BlJ6SLt97L1TLiD7UAPKnWEUQ2Qvhxpsp7vATpEyupIs3kIJctdE8zYHpcP/St/18HJ6bF S0QAlj3mpQHLV332m3WVkOqngkJLcFDGqPeJpQB0TeL2ImhFBhs7F5hxSitd5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639747506; a=rsa-sha256; cv=none; b=G0Lv/y1VuU4N05zwng/hbMngiENw7YAeSLsEG3/3pPhLgriJPGQiYy6RzhDhedX7MSjfiJ 8AJmSZHJgc1mbX+E2Pz0Nve2aReHdZJ4Sx3dY1kvJAaarKtc5oV1KqNt1xaO3F/8CsiFn5 hUlS+i2ZOitJv40jDHu4m4RIMvbwK5RBVzikTlktwU00V+E7zgi27Oohr6P3eb2Y2Eojmd l51rXesIvX5r+rVpmnmBBTyvcECJ9Ivo50mqP0wrKvv/aIxm3ueeGzBbEne+YnwQ7Tn6f0 o3vw2+Wv1ANaxD/Kn5cdbg0rRHKan7dxMuh3xE9O+FlO6Vtdg231xdl4fXooLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=3af7fd92d3686822bfe4f077c7655934c685828e commit 3af7fd92d3686822bfe4f077c7655934c685828e Author: Dima Panov AuthorDate: 2021-12-17 13:15:58 +0000 Commit: Dima Panov CommitDate: 2021-12-17 13:15:58 +0000 multimedia/pipewire: correct OSVERSION check to use proper ncurses (+) Since 1400035 FreeBSD have imported into base libtinfo split from ncurses which required to build pw-top utility. Force ncurses:port to proper build on systems < 1400035 Bump PORTREVISION to force rebuild Approved by: arrowd via IRC Largest pointy hat available: arrowd :) Sponsored by: Netzkommune GmbH --- multimedia/pipewire/Makefile | 11 ++++++----- multimedia/pipewire/pkg-plist | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/multimedia/pipewire/Makefile b/multimedia/pipewire/Makefile index 25399def9389..78d07182923e 100644 --- a/multimedia/pipewire/Makefile +++ b/multimedia/pipewire/Makefile @@ -1,4 +1,5 @@ PORTNAME= pipewire +PORTREVISION= 1 DISTVERSION= 0.3.42 CATEGORIES= multimedia MASTER_SITES= https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${MEDIA_SESSION_VERSION}/:media_session @@ -65,12 +66,12 @@ MESON_ARGS= -D pw-cat=enabled \ -D pipewire-v4l2=disabled \ -D udevrulesdir="${LOCALBASE}/lib/udev/rules.d" -.include +.include -.if ${OSVERSION} < 1400000 -PLIST_SUB+= FREEBSD14="@comment " +.if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1400035 +USES+= ncurses:base .else -PLIST_SUB+= FREEBSD14="" +USES+= ncurses:port .endif post-extract: @@ -84,4 +85,4 @@ post-patch-MEDIASESSION-on: @${REINPLACE_CMD} '/manager_args/ s/@sm_comment@//g' \ ${WRKSRC}/src/daemon/pipewire.conf.in -.include +.include diff --git a/multimedia/pipewire/pkg-plist b/multimedia/pipewire/pkg-plist index b8540c66bf5a..99fc41673348 100644 --- a/multimedia/pipewire/pkg-plist +++ b/multimedia/pipewire/pkg-plist @@ -17,7 +17,7 @@ bin/pw-play bin/pw-profiler bin/pw-record bin/pw-reserve -%%FREEBSD14%%bin/pw-top +bin/pw-top %%MEDIASESSION%%bin/spa-acp-tool bin/spa-inspect bin/spa-json-dump