Commit 1c0d1949 authored by Arnout Vandecappelle (Essensium/Mind)'s avatar Arnout Vandecappelle (Essensium/Mind) Committed by Peter Korsgaard
Browse files

pulseaudio: fix build with orc 



The configure script gets orcc from pkg-config, which sets it to /usr/bin/orcc
instead of $(HOST_DIR)/usr/bin/orcc. So set the path explicitly instead of
relying on pkg-config.

While we're at it, also add an explicit enable/disable to configure.

Signed-off-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 40ccd212

package/multimedia/pulseaudio/pulseaudio.mk

+8 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ PULSEAUDIO_DEPENDENCIES = \ 
	$(if $(BR2_PACKAGE_UDEV),udev) \

	$(if $(BR2_PACKAGE_OPENSSL),openssl) \

	$(if $(BR2_PACKAGE_FFTW),fftw) \

	$(if $(BR2_PACKAGE_ORC),orc) \

	$(if $(BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING),webrtc-audio-processing) \

	$(if $(BR2_PACKAGE_SYSTEMD),systemd)
@@ -38,6 +37,14 @@ PULSEAUDIO_DEPENDENCIES = \ 
PULSEAUDIO_AUTORECONF = YES

PULSEAUDIO_DEPENDENCIES += libglib2



ifeq ($(BR2_PACKAGE_ORC),y)

PULSEAUDIO_DEPENDENCIES += orc

PULSEAUDIO_CONF_ENV += ORCC=$(HOST_DIR)/usr/bin/orcc

PULSEAUDIO_CONF_OPT += --enable-orc

else

PULSEAUDIO_CONF_OPT += --disable-orc

endif



ifneq ($(BR2_INSTALL_LIBSTDCPP),y)

# The optional webrtc echo canceller is written in C++, causing auto* to want

# to link module-echo-cancel.so with CXX even if webrtc ISN'T used.