From nobody Wed Jan 26 07:58:10 2022 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 B463D19696D9; Wed, 26 Jan 2022 07:58:10 +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 4JkGLB4QFSz3JQ3; Wed, 26 Jan 2022 07:58:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643183890; 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=TEpzLTP+hWqa5zOHQ57OxjkDgJR01EOUdD0JQa/dMUc=; b=xUfDJxYKPqfQcvFcFmwm+BrmsPYD//kONuHoB6Naarr338Ji+eXUcVCfowmrXV4+X+xEPk xL1l2xp9G3e6I49CyUFtMkGfVKF76dTS2SVxcoH74/DZMXL+LfKBIRVOxcMw9BIwDfFspT +ITUFrEMyAECJekOvM40SdTDqJDutQd12e46uHEBJn/jODb1zyvi1KwinfAztPCP7f7+9i itE62+C70RlVRvxmWsFRuCyo4uVLkt2127IbcO6ixbUnJHJTn0ROF976UV0POZYWUs0U/b 6xOjLt9UIDJ+VsGaq60fmRlL+KjVXLUgjcZoNIWVtXYMGhufaFSNQdX/IU+onw== 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 7728819A2E; Wed, 26 Jan 2022 07:58:10 +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 20Q7wAQv087660; Wed, 26 Jan 2022 07:58:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20Q7wAA1087659; Wed, 26 Jan 2022 07:58:10 GMT (envelope-from git) Date: Wed, 26 Jan 2022 07:58:10 GMT Message-Id: <202201260758.20Q7wAA1087659@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 37077982c4c2 - main - multimedia/pipewire: Add PIPEWIRE_JACK option. 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: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 37077982c4c244cddcb8afa5a3919bc32ff4e422 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643183890; 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=TEpzLTP+hWqa5zOHQ57OxjkDgJR01EOUdD0JQa/dMUc=; b=gvIC4He8IK7/1GtxYWQ1qXVcG0lYgLI8KSjhqcZvnOojVh9qIcXo/6M6EFhtKd5zblVFgt PtXBh/GEG3VCiFnpnMUQBhlR3Pm0tb2zCR7tky8D7or3ekAV2vU0EgZlO8qVk4jbmaIWa0 aY8Iv2MPhOC/TUz2VOQrxLgyeuJuJq29T/y8LhpI0ulqxKEstUEGWnqqjBK/CqMg2aSfm8 cq0n55rVQ39UOwg8k9cLyvebIyqeSyL/9q9PtLMhoVAaVFKVFPwkaf+QR/6Fq/ucLBpeif r2iJMttWIODUtN29v1bm9gC90vEUzPILfzb1vnmoWRbPAF7nt/7J+PngXFlqVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643183890; a=rsa-sha256; cv=none; b=k0m2Dhrl5lCx8fAKJjbC2qwRiFwjyN4TXNHzxvRTmAUxkb+Y2t/letyQ/MWqgBPAkKL3BV LCxa5B8BnxuRUKM7dO/LJ2jmcVtWmCr/A7IMaVlokfwebnAtlXCG/zj/WEZZ+78YdwcQLu Rs/EXtI9wj1K1sQzJ0kakMqSLAVINEtPC+s7Py6Xvaibw6MZpyCX0eOMXVSfQyHKtOdLoF qrUBZFxysfOwFLb9UCluLs8HKLqdvmk/NixkMU5nnIam3wTKmHobRRmxDrzMrQv2P8a4yp oSPXL9Y3WwNqtxhVLAS2GQL0BxipZxuG2XV6hWGP6jR4DApq9IHx/EEW/WfMPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=37077982c4c244cddcb8afa5a3919bc32ff4e422 commit 37077982c4c244cddcb8afa5a3919bc32ff4e422 Author: Yuri Victorovich AuthorDate: 2022-01-26 07:50:43 +0000 Commit: Gleb Popov CommitDate: 2022-01-26 07:58:04 +0000 multimedia/pipewire: Add PIPEWIRE_JACK option. PR: 261416 --- multimedia/pipewire/Makefile | 18 ++++++++++++++---- multimedia/pipewire/pkg-plist | 10 ++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/multimedia/pipewire/Makefile b/multimedia/pipewire/Makefile index a732dc9f501d..83fea5e77222 100644 --- a/multimedia/pipewire/Makefile +++ b/multimedia/pipewire/Makefile @@ -1,5 +1,6 @@ PORTNAME= pipewire DISTVERSION= 0.3.43 +PORTREVISION= 1 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 @@ -27,18 +28,21 @@ USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= PipeWire -OPTIONS_DEFINE= GSTREAMER MANPAGES MEDIASESSION PULSEAUDIO SDL VULKAN -OPTIONS_DEFAULT= GSTREAMER MANPAGES MEDIASESSION +OPTIONS_DEFINE= GSTREAMER PIPEWIRE_JACK MANPAGES MEDIASESSION PULSEAUDIO SDL VULKAN +OPTIONS_DEFAULT= GSTREAMER PIPEWIRE_JACK MANPAGES MEDIASESSION OPTIONS_SUB= yes GSTREAMER_MESON_ENABLED=gstreamer GSTREAMER_LIB_DEPENDS= libgstreamer-1.0.so:multimedia/gstreamer1 \ libgstaudio-1.0.so:multimedia/gstreamer1-plugins +PIPEWIRE_JACK_DESC= Build pipewire-jack +PIPEWIRE_JACK_MESON_ENABLED= pipewire-jack + MANPAGES_BUILD_DEPENDS= rst2man:textproc/py-docutils MANPAGES_MESON_ENABLED= man -MEDIASESSION_DESC= Session manager support +MEDIASESSION_DESC= Session manager support MEDIASESSION_MESON_ENABLED= alsa pipewire-alsa MEDIASESSION_MESON_ON= -Dsession-managers=media-session MEDIASESSION_MESON_OFF= -Dsession-managers='' @@ -63,7 +67,7 @@ MESON_ARGS= -D pw-cat=enabled \ -D v4l2=enabled \ -D raop=enabled \ -D bluez5=disabled \ - -D jack=disabled -D pipewire-jack=disabled \ + -D jack=disabled \ -D systemd=disabled \ -D pipewire-v4l2=disabled \ -D udevrulesdir="${LOCALBASE}/lib/udev/rules.d" @@ -74,6 +78,12 @@ MESON_ARGS= -D pw-cat=enabled \ CONFIGURE_ENV+= ${ncurses_ARGS:Mbase:C/.+/PKG_CONFIG_PATH="${FILESDIR}"/} .endif +.include + +.if ${PORT_OPTIONS:MMANPAGES} && ${PORT_OPTIONS:MPIPEWIRE_JACK} +PLIST_FILES= man/man1/pw-jack.1.gz +.endif + post-extract: ${LN} -s ${WRKDIR}/media-session-${MEDIA_SESSION_VERSION} ${WRKSRC}/subprojects/media-session diff --git a/multimedia/pipewire/pkg-plist b/multimedia/pipewire/pkg-plist index a7b2558b9d30..7ed32ecf2a82 100644 --- a/multimedia/pipewire/pkg-plist +++ b/multimedia/pipewire/pkg-plist @@ -6,6 +6,7 @@ bin/pw-cli bin/pw-dot bin/pw-dsdplay bin/pw-dump +%%PIPEWIRE_JACK%%bin/pw-jack bin/pw-link bin/pw-loopback bin/pw-metadata @@ -166,6 +167,15 @@ include/spa-0.2/spa/utils/type.h lib/libpipewire-0.3.so lib/libpipewire-0.3.so.0 lib/libpipewire-0.3.so.0.343.0 +%%PIPEWIRE_JACK%%lib/pipewire-0.3/jack/libjack.so +%%PIPEWIRE_JACK%%lib/pipewire-0.3/jack/libjack.so.0 +%%PIPEWIRE_JACK%%lib/pipewire-0.3/jack/libjack.so.0.343.0 +%%PIPEWIRE_JACK%%lib/pipewire-0.3/jack/libjacknet.so +%%PIPEWIRE_JACK%%lib/pipewire-0.3/jack/libjacknet.so.0 +%%PIPEWIRE_JACK%%lib/pipewire-0.3/jack/libjacknet.so.0.343.0 +%%PIPEWIRE_JACK%%lib/pipewire-0.3/jack/libjackserver.so +%%PIPEWIRE_JACK%%lib/pipewire-0.3/jack/libjackserver.so.0 +%%PIPEWIRE_JACK%%lib/pipewire-0.3/jack/libjackserver.so.0.343.0 lib/pipewire-0.3/libpipewire-module-access.so lib/pipewire-0.3/libpipewire-module-adapter.so lib/pipewire-0.3/libpipewire-module-client-device.so