pulseaudio: fix build with orc
PATCH 1/1 pulseaudio: fix build with orc
From: "Arnout Vandecappelle (Essensium/Mind)" <[email protected]>
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.
---
Ideally, this should be fixed in orc-0.4.pc, but I'm not sure what would be the best way.
--- package/multimedia/pulseaudio/pulseaudio.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
package/multimedia/pulseaudio/pulseaudio.mk +8 -1
@@ -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.
Signature · 1 line
1.8.2.1
PATCH 1/1 pulseaudio: fix build with orc
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Arnout" == Arnout Vandecappelle (Essensium/Mind) <[email protected]> writes:
Arnout> From: "Arnout Vandecappelle (Essensium/Mind)" <[email protected]>
Arnout> The configure script gets orcc from pkg-config, which sets it Arnout> to /usr/bin/orcc instead of $(HOST_DIR)/usr/bin/orcc. So set Arnout> the path explicitly instead of relying on pkg-config.
Arnout> While we're at it, also add an explicit enable/disable to Arnout> configure.
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard