Date: Thu, 23 Dec 2021 10:06:43 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 4f6e6d2b9a7f - main - multimedia/pipewire: drop dependency on devel/ncurses Message-ID: <202112231006.1BNA6hLG017797@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=4f6e6d2b9a7ff48699785d10be10a67732a20622 commit 4f6e6d2b9a7ff48699785d10be10a67732a20622 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2021-12-17 19:09:33 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> 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 <bsd.port.options.mk> - -.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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112231006.1BNA6hLG017797>