浏览代码

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 <titouan.christophe@mind.be>
Signed-off-by: Florian Larysch <fl@n621.de>
Signed-off-by: Julien Olivain <ju.o@free.fr>
Florian Larysch 2 周之前
父节点
当前提交
fecc337d21
共有 1 个文件被更改,包括 0 次插入7 次删除
  1. 0 7
      package/ffmpeg/ffmpeg.mk

+ 0 - 7
package/ffmpeg/ffmpeg.mk

@@ -94,13 +94,6 @@ else
 FFMPEG_CONF_OPTS += --disable-libjack
 FFMPEG_CONF_OPTS += --disable-libjack
 endif
 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)
 ifeq ($(BR2_PACKAGE_LIBV4L),y)
 FFMPEG_DEPENDENCIES += libv4l
 FFMPEG_DEPENDENCIES += libv4l
 FFMPEG_CONF_OPTS += --enable-libv4l2
 FFMPEG_CONF_OPTS += --enable-libv4l2