Attachment 231252 Details for Bug 261416 – patch

[patch] patch

pipewire.patch (text/plain), 4.20 KB, created by Yuri Victorovich on 2022-01-23 18:44:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2022-01-23 18:44:36 UTC

Size: 4.20 KB

patch

obsolete

>diff --git a/multimedia/pipewire/Makefile b/multimedia/pipewire/Makefile
>index 50bc2946a432..5f4ba4a3a7be 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
>diff --git a/multimedia/pipewire/pkg-plist b/multimedia/pipewire/pkg-plist
>index 2dba788eee60..7ed32ecf2a82 100644
>--- a/multimedia/pipewire/pkg-plist
>+++ b/multimedia/pipewire/pkg-plist
>@@ -169,13 +169,13 @@ 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.342.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.342.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.342.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
>diff --git a/multimedia/pipewire/Makefile b/multimedia/pipewire/Makefile
>index a732dc9f501d..50bc2946a432 100644
>--- a/multimedia/pipewire/Makefile
>+++ b/multimedia/pipewire/Makefile
>@@ -27,14 +27,17 @@ 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
> 
>@@ -63,7 +66,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 +77,12 @@ MESON_ARGS=	-D pw-cat=enabled \
> CONFIGURE_ENV+=	${ncurses_ARGS:Mbase:C/.+/PKG_CONFIG_PATH="${FILESDIR}"/}
> .endif
> 
>+.include <bsd.port.options.mk>
>+
>+.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..2dba788eee60 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.342.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.342.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.342.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

Actions: View | Diff

Attachments on bug 261416: 231251 | 231252