View | Details | Raw Unified | Return to bug 255348 | Differences between
and this patch

Collapse All | Expand All

(-)b/multimedia/pipewire/Makefile (-4 / +10 lines)
Lines 1-5 Link Here
1
PORTNAME=	pipewire
1
PORTNAME=	pipewire
2
DISTVERSION=	0.3.25
2
DISTVERSION=	0.3.25
3
PORTREVISION=	1
3
CATEGORIES=	multimedia
4
CATEGORIES=	multimedia
4
5
5
MAINTAINER=	arrowd@FreeBSD.org
6
MAINTAINER=	arrowd@FreeBSD.org
Lines 18-29 LIB_DEPENDS= libasound.so:audio/alsa-lib \ Link Here
18
19
19
USES=		compiler:c11 gnome meson pkgconfig
20
USES=		compiler:c11 gnome meson pkgconfig
20
21
21
OPTIONS_DEFINE=	GSTREAMER VULKAN
22
OPTIONS_DEFINE=	GSTREAMER MEDIASESSION VULKAN
22
23
23
GSTREAMER_MESON_ENABLED=gstreamer
24
GSTREAMER_MESON_ENABLED=gstreamer
24
GSTREAMER_LIB_DEPENDS=	libgstreamer-1.0.so:multimedia/gstreamer1 \
25
GSTREAMER_LIB_DEPENDS=	libgstreamer-1.0.so:multimedia/gstreamer1 \
25
			libgstaudio-1.0.so:multimedia/gstreamer1-plugins
26
			libgstaudio-1.0.so:multimedia/gstreamer1-plugins
26
27
28
MEDIASESSION_DESC=	Session manager support
29
MEDIASESSION_MESON_ENABLED=	alsa pipewire-alsa media-session pw-cat
30
MEDIASESSION_LIB_DEPENDS=	libsndfile.so:audio/libsndfile
31
27
VULKAN_DESC=		Enable Vulkan integration
32
VULKAN_DESC=		Enable Vulkan integration
28
VULKAN_MESON_ENABLED=	vulkan
33
VULKAN_MESON_ENABLED=	vulkan
29
VULKAN_BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers
34
VULKAN_BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers
Lines 35-44 USE_LDCONFIG= yes Link Here
35
USE_GITHUB=	yes
40
USE_GITHUB=	yes
36
GH_ACCOUNT=	PipeWire
41
GH_ACCOUNT=	PipeWire
37
42
38
MESON_ARGS=	-Dalsa=disabled -Dpipewire-alsa=disabled \
43
MESON_ARGS=	-D bluez5=disabled \
39
		-D bluez5=disabled \
40
		-D jack=disabled -D pipewire-jack=disabled \
44
		-D jack=disabled -D pipewire-jack=disabled \
41
		-D systemd=disabled
45
		-D systemd=disabled \
46
		-D sdl2=disabled \
47
		-D udevrulesdir="${LOCALBASE}/lib/udev/rules.d"
42
48
43
OPTIONS_SUB=	yes
49
OPTIONS_SUB=	yes
44
50
(-)b/multimedia/pipewire/files/patch-spa_plugins_alsa_meson.build (+20 lines)
Added Link Here
1
--- spa/plugins/alsa/meson.build.orig	2021-04-06 13:51:02 UTC
2
+++ spa/plugins/alsa/meson.build
3
@@ -16,7 +16,7 @@ spa_alsa = shared_library(
4
   [ spa_alsa_sources ],
5
   c_args : acp_c_args,
6
   include_directories : [spa_inc, configinc],
7
-  dependencies : [ alsa_dep, libudev_dep, mathlib ],
8
+  dependencies : [ alsa_dep, libudev_dep, mathlib, epoll_shim_dep, libinotify_dep ],
9
   link_with : [ acp_lib ],
10
   install : true,
11
   install_dir : join_paths(spa_plugindir, 'alsa')
12
@@ -38,7 +38,7 @@ executable('spa-acp-tool',
13
 
14
 executable('test-timer',
15
   [ 'test-timer.c' ],
16
-  dependencies : [ alsa_dep, mathlib ],
17
+  dependencies : [ alsa_dep, mathlib, epoll_shim_dep ],
18
   install : false,
19
 )
20
 
(-)b/multimedia/pipewire/files/patch-src_examples_meson.build (+11 lines)
Added Link Here
1
--- src/examples/meson.build.orig	2021-04-06 13:51:02 UTC
2
+++ src/examples/meson.build
3
@@ -92,7 +92,7 @@ if not get_option('media-session').disabled() and alsa
4
     'media-session/suspend-node.c',
5
     c_args : [ '-D_GNU_SOURCE' ],
6
     install: true,
7
-    dependencies : [dbus_dep, pipewire_dep, alsa_dep, mathlib],
8
+    dependencies : [dbus_dep, pipewire_dep, alsa_dep, mathlib, libinotify_dep],
9
 )
10
 endif
11
 
(-)b/multimedia/pipewire/pkg-plist (-6 / +88 lines)
Lines 1-26 Link Here
1
bin/pipewire
1
bin/pipewire
2
%%MEDIASESSION%%bin/pipewire-media-session
2
bin/pipewire-pulse
3
bin/pipewire-pulse
4
%%MEDIASESSION%%bin/pw-cat
3
bin/pw-cli
5
bin/pw-cli
4
bin/pw-dot
6
bin/pw-dot
5
bin/pw-dump
7
bin/pw-dump
6
bin/pw-loopback
8
bin/pw-loopback
7
bin/pw-metadata
9
bin/pw-metadata
8
bin/pw-mididump
10
bin/pw-mididump
11
%%MEDIASESSION%%bin/pw-midiplay
12
%%MEDIASESSION%%bin/pw-midirecord
9
bin/pw-mon
13
bin/pw-mon
14
%%MEDIASESSION%%bin/pw-play
10
bin/pw-profiler
15
bin/pw-profiler
16
%%MEDIASESSION%%bin/pw-record
11
bin/pw-reserve
17
bin/pw-reserve
18
%%MEDIASESSION%%bin/spa-acp-tool
12
bin/spa-inspect
19
bin/spa-inspect
13
bin/spa-json-dump
20
bin/spa-json-dump
14
bin/spa-monitor
21
bin/spa-monitor
22
%%MEDIASESSION%%bin/spa-resample
15
%%ETCDIR%%/client-rt.conf
23
%%ETCDIR%%/client-rt.conf
16
%%ETCDIR%%/client.conf
24
%%ETCDIR%%/client.conf
17
%%ETCDIR%%/jack.conf
25
%%ETCDIR%%/jack.conf
18
%%ETCDIR%%/media-session.d/alsa-monitor.conf
26
%%MEDIASESSION%%%%ETCDIR%%/media-session.d/alsa-monitor.conf
19
%%ETCDIR%%/media-session.d/bluez-monitor.conf
27
%%MEDIASESSION%%%%ETCDIR%%/media-session.d/bluez-monitor.conf
20
%%ETCDIR%%/media-session.d/media-session.conf
28
%%MEDIASESSION%%%%ETCDIR%%/media-session.d/media-session.conf
21
%%ETCDIR%%/media-session.d/v4l2-monitor.conf
29
%%MEDIASESSION%%%%ETCDIR%%/media-session.d/v4l2-monitor.conf
22
%%ETCDIR%%/media-session.d/with-jack
30
%%MEDIASESSION%%%%ETCDIR%%/media-session.d/with-jack
23
%%ETCDIR%%/media-session.d/with-pulseaudio
31
%%MEDIASESSION%%%%ETCDIR%%/media-session.d/with-pulseaudio
24
%%ETCDIR%%/pipewire-pulse.conf
32
%%ETCDIR%%/pipewire-pulse.conf
25
@sample %%ETCDIR%%/pipewire.conf.sample
33
@sample %%ETCDIR%%/pipewire.conf.sample
26
include/pipewire-0.3/pipewire/array.h
34
include/pipewire-0.3/pipewire/array.h
Lines 149-154 include/spa-0.2/spa/utils/result.h Link Here
149
include/spa-0.2/spa/utils/ringbuffer.h
157
include/spa-0.2/spa/utils/ringbuffer.h
150
include/spa-0.2/spa/utils/type-info.h
158
include/spa-0.2/spa/utils/type-info.h
151
include/spa-0.2/spa/utils/type.h
159
include/spa-0.2/spa/utils/type.h
160
%%MEDIASESSION%%lib/alsa-lib/libasound_module_ctl_pipewire.so
161
%%MEDIASESSION%%lib/alsa-lib/libasound_module_pcm_pipewire.so
152
%%GSTREAMER%%lib/gstreamer-1.0/libgstpipewire.so
162
%%GSTREAMER%%lib/gstreamer-1.0/libgstpipewire.so
153
lib/libpipewire-0.3.so
163
lib/libpipewire-0.3.so
154
lib/libpipewire-0.3.so.0
164
lib/libpipewire-0.3.so.0
Lines 169-174 lib/pipewire-0.3/libpipewire-module-spa-device-factory.so Link Here
169
lib/pipewire-0.3/libpipewire-module-spa-device.so
179
lib/pipewire-0.3/libpipewire-module-spa-device.so
170
lib/pipewire-0.3/libpipewire-module-spa-node-factory.so
180
lib/pipewire-0.3/libpipewire-module-spa-node-factory.so
171
lib/pipewire-0.3/libpipewire-module-spa-node.so
181
lib/pipewire-0.3/libpipewire-module-spa-node.so
182
%%MEDIASESSION%%lib/spa-0.2/alsa/libspa-alsa.so
172
lib/spa-0.2/audioconvert/libspa-audioconvert.so
183
lib/spa-0.2/audioconvert/libspa-audioconvert.so
173
lib/spa-0.2/audiomixer/libspa-audiomixer.so
184
lib/spa-0.2/audiomixer/libspa-audiomixer.so
174
lib/spa-0.2/audiotestsrc/libspa-audiotestsrc.so
185
lib/spa-0.2/audiotestsrc/libspa-audiotestsrc.so
Lines 180-184 lib/spa-0.2/videoconvert/libspa-videoconvert.so Link Here
180
lib/spa-0.2/videotestsrc/libspa-videotestsrc.so
191
lib/spa-0.2/videotestsrc/libspa-videotestsrc.so
181
lib/spa-0.2/volume/libspa-volume.so
192
lib/spa-0.2/volume/libspa-volume.so
182
%%VULKAN%%lib/spa-0.2/vulkan/libspa-vulkan.so
193
%%VULKAN%%lib/spa-0.2/vulkan/libspa-vulkan.so
194
%%MEDIASESSION%%lib/udev/rules.d/90-pipewire-alsa.rules
183
libdata/pkgconfig/libpipewire-0.3.pc
195
libdata/pkgconfig/libpipewire-0.3.pc
184
libdata/pkgconfig/libspa-0.2.pc
196
libdata/pkgconfig/libspa-0.2.pc
197
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-input-aux.conf
198
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-input-dock-mic.conf
199
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-input-fm.conf
200
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-input-front-mic.conf
201
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-input-headphone-mic.conf
202
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-input-headset-mic.conf
203
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-input-internal-mic-always.conf
204
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-input-internal-mic.conf
205
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-input-linein.conf
206
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-input-mic-line.conf
207
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-input-mic.conf
208
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-input-mic.conf.common
209
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-input-rear-mic.conf
210
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-input-tvtuner.conf
211
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-input-video.conf
212
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-input.conf
213
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-input.conf.common
214
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-output-chat.conf
215
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-output-headphones-2.conf
216
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-output-headphones.conf
217
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-output-lineout.conf
218
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-output-mono.conf
219
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-output-speaker-always.conf
220
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-output-speaker.conf
221
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-output.conf
222
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-output.conf.common
223
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/hdmi-output-0.conf
224
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/hdmi-output-1.conf
225
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/hdmi-output-10.conf
226
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/hdmi-output-2.conf
227
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/hdmi-output-3.conf
228
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/hdmi-output-4.conf
229
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/hdmi-output-5.conf
230
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/hdmi-output-6.conf
231
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/hdmi-output-7.conf
232
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/hdmi-output-8.conf
233
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/hdmi-output-9.conf
234
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/iec958-stereo-input.conf
235
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/iec958-stereo-output.conf
236
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/steelseries-arctis-output-chat-common.conf
237
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/steelseries-arctis-output-game-common.conf
238
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/usb-gaming-headset-input.conf
239
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/usb-gaming-headset-output-mono.conf
240
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/usb-gaming-headset-output-stereo.conf
241
%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/virtual-surround-7.1.conf
242
%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/audigy.conf
243
%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/behringer-umc22.conf
244
%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/cmedia-high-speed-true-hdaudio.conf
245
%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/default.conf
246
%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/dell-dock-tb16-usb-audio.conf
247
%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/force-speaker-and-int-mic.conf
248
%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/force-speaker.conf
249
%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/hp-tbt-dock-120w-g2.conf
250
%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/hp-tbt-dock-audio-module.conf
251
%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/kinect-audio.conf
252
%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/maudio-fasttrack-pro.conf
253
%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/native-instruments-audio4dj.conf
254
%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/native-instruments-audio8dj.conf
255
%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/native-instruments-korecontroller.conf
256
%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/native-instruments-traktor-audio10.conf
257
%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/native-instruments-traktor-audio2.conf
258
%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/native-instruments-traktor-audio6.conf
259
%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/native-instruments-traktorkontrol-s4.conf
260
%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/sb-omni-surround-5.1.conf
261
%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/sennheiser-gsx.conf
262
%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/simple-headphones-mic.conf
263
%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/steelseries-arctis-common-usb-audio.conf
264
%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/usb-gaming-headset.conf
265
%%MEDIASESSION%%share/alsa/alsa.conf.d/50-pipewire.conf
266
%%MEDIASESSION%%share/alsa/alsa.conf.d/99-pipewire-default.conf

Return to bug 255348