From 1c0d1949c69f24518de63921b00130e9ae1082c0 Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Sun, 12 May 2013 10:05:22 +0000 Subject: 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: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- package/multimedia/pulseaudio/pulseaudio.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'package/multimedia') diff --git a/package/multimedia/pulseaudio/pulseaudio.mk b/package/multimedia/pulseaudio/pulseaudio.mk index aa67592d2..b39d99e18 100644 --- a/package/multimedia/pulseaudio/pulseaudio.mk +++ b/package/multimedia/pulseaudio/pulseaudio.mk @@ -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. -- cgit v1.2.3