From nobody Thu Dec 23 10:06:43 2021 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 A7BFA18F0E56; Thu, 23 Dec 2021 10:06:43 +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 4JKQpC29VVz3jsq; Thu, 23 Dec 2021 10:06:43 +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 2A77E66D6; Thu, 23 Dec 2021 10:06:43 +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 1BNA6hhE017798; Thu, 23 Dec 2021 10:06:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BNA6hLG017797; Thu, 23 Dec 2021 10:06:43 GMT (envelope-from git) Date: Thu, 23 Dec 2021 10:06:43 GMT Message-Id: <202112231006.1BNA6hLG017797@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 4f6e6d2b9a7f - main - multimedia/pipewire: drop dependency on devel/ncurses 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f6e6d2b9a7ff48699785d10be10a67732a20622 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640254003; 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=bNLZWk2gpi9/YzwQoYQuk+MYYZyuAfjNdO5YzBiXI7w=; b=NsPLmD4uU6+n9ryLqwPaBAQ0NTAWbaYYVaep5BbicTQIUKTlb7PPLlk1v9XSJ3cQrRFaWc NvUkRva4dOlOJ+1L61rz/b9CZrPmZjmFgc5W3mTrLfq8+CG1uIlURXFGOQzqUfCmFr4Rvg fXbbZweWNomfMSTR+2EalfWekjII/F5cJIEKqIr937eyXFSbLafVWrXWkqAPXhLnG8e2kN +n5OiQTuWRgRkc+1K6okuiyYeZ+zaT7YkMq2dsdFpuoTsMdG8bolDDEGdnesCclYw8kvOZ pqyDUi7qMWMIHtX3YBxLxlO00CyJDiLE65SBq7cPuyQfvmVufPFPEYYfD0IoRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640254003; a=rsa-sha256; cv=none; b=Lao0ZRqjLPmTdQa056PWqN9m/JvhqsZZXl+1v7sIRJOCMYOb48o3yPTgbYBeLDhcWNyaDP LfLTUFPTBFy87ZXtGGNI/2DGNeXwhcOgag5A3BDunFhB8kfDNizGUM2jjwn5AT0cYIoWXV jNKDTJw9Zfrr2NqMp8PiHD6Y5zz+pavbV84sXxmxwDAx5o24XJvN4EZuUvFxDJr/x39pHX Zl3IJZiEUkknKdpL1YH1AixCpFQIg8xIrH7uGr/niY86Wd/zQm5Jna9vJHz/lut5jbw687 bfDiBlwQgWwllCGM/IYVUXOYlddTykfXBnNXQZa7oo8EBkLiykYPjJoQuhTyBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=4f6e6d2b9a7ff48699785d10be10a67732a20622 commit 4f6e6d2b9a7ff48699785d10be10a67732a20622 Author: Jan Beich AuthorDate: 2021-12-17 19:09:33 +0000 Commit: Jan Beich CommitDate: 2021-12-23 10:04:53 +0000 multimedia/pipewire: drop dependency on devel/ncurses Keep USES=ncurses to ensure consistency but don't require ncurses package as it overrides in-base version for all ports built after. PR: 260501 Approved by: arrowd (maintainer, previous version) --- multimedia/pipewire/Makefile | 14 ++++++-------- multimedia/pipewire/files/ncursesw.pc | 10 ++++++++++ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/multimedia/pipewire/Makefile b/multimedia/pipewire/Makefile index 8e97b3f3cb0d..8e133a3ca49e 100644 --- a/multimedia/pipewire/Makefile +++ b/multimedia/pipewire/Makefile @@ -1,6 +1,6 @@ PORTNAME= pipewire -PORTREVISION= 1 DISTVERSION= 0.3.42 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${MEDIA_SESSION_VERSION}/:media_session DISTFILES= media-session-${MEDIA_SESSION_VERSION}${EXTRACT_SUFX}:media_session @@ -20,7 +20,7 @@ LIB_DEPENDS= libasound.so:audio/alsa-lib \ libwebrtc_audio_processing.so:audio/webrtc-audio-processing0 USES= compiler:c11 gettext-tools gnome localbase:ldflags meson \ - pkgconfig python:3.6+,build readline + ncurses pkgconfig python:3.6+,build readline USE_GNOME= glib20 USE_LDCONFIG= yes @@ -66,12 +66,10 @@ MESON_ARGS= -D pw-cat=enabled \ -D pipewire-v4l2=disabled \ -D udevrulesdir="${LOCALBASE}/lib/udev/rules.d" -.include - -.if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1400035 -USES+= ncurses -.else -USES+= ncurses:port +# Fake pkg-config support before https://cgit.freebsd.org/src/commit/?id=396851c20aeb +# but only if devel/ncurses isn't installed +.if !exists(/usr/libdata/pkgconfig/ncursesw.pc) +CONFIGURE_ENV+= ${ncurses_ARGS:Mbase:C/.+/PKG_CONFIG_PATH="${FILESDIR}"/} .endif post-extract: diff --git a/multimedia/pipewire/files/ncursesw.pc b/multimedia/pipewire/files/ncursesw.pc new file mode 100644 index 000000000000..f36e98b73009 --- /dev/null +++ b/multimedia/pipewire/files/ncursesw.pc @@ -0,0 +1,10 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=/usr/lib +includedir=/usr/include + +Name: ncursesw +Description: ncurses 5.9 library (wide-char/UTF-8 flavor) +Version: 5.9.20140222 +URL: https://invisible-island.net/ncurses +Libs: -lncursesw