From fecc337d21f337a30ef7f9f448683d99c01fc245 Mon Sep 17 00:00:00 2001 From: Florian Larysch Date: Tue, 15 Jul 2025 15:27:15 +0200 Subject: [PATCH] Revert "package/ffmpeg: add support for pulseaudio" This reverts commit e44aff6b1b1a5237b3f5cae019982370671dbd42 which added support for linking ffmpeg against libpulse if it is present to provide libavdevice support for the PulseAudio protocol. However, it turns out that this creates a dependency cycle when BR2_PACKAGE_LIBSOXR is enabled, since the pulseaudio daemon can use libsoxr for resampling and libsoxr can use the FFT implementation from ffmpeg. Resolving this would probably mean breaking up the pulseaudio package into the client libraries and the daemon proper (a standalone libpulse without the daemon is still useful since it can talk to a remote daemon via the network or more likely today talk to a local instance of PipeWire, which also implements the PulseAudio protocol). For now, break the dependency cycle by reverting to the original state (no pulseaudio client support in ffmpeg). Reported-by: Titouan Christophe Signed-off-by: Florian Larysch Signed-off-by: Julien Olivain --- package/ffmpeg/ffmpeg.mk | 7 ------- 1 file changed, 7 deletions(-) diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 9ba7ac0f61..2d65623926 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -94,13 +94,6 @@ else FFMPEG_CONF_OPTS += --disable-libjack endif -ifeq ($(BR2_PACKAGE_PULSEAUDIO),y) -FFMPEG_DEPENDENCIES += pulseaudio -FFMPEG_CONF_OPTS += --enable-libpulse -else -FFMPEG_CONF_OPTS += --disable-libpulse -endif - ifeq ($(BR2_PACKAGE_LIBV4L),y) FFMPEG_DEPENDENCIES += libv4l FFMPEG_CONF_OPTS += --enable-libv4l2