Skip to contentSkip to conversation

package/rdesktop: use --with-sound option

PATCH New Fabrice Fontaine 3 participants 5 messages Mar 14, 2020 – Mar 15, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/rdesktop: use --with-sound option

Use --with-sound option as requested by Thomas Petazzoni in review of
https://patchwork.ozlabs.org/patch/1254693

alsa, libao and pulseaudio are not exclusive, the order of registrations in rdpsnd_register_drivers define the probe-order when opening the device for the first time

---
 package/rdesktop/rdesktop.mk | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)
package/rdesktop/rdesktop.mk +15 -3
index 672d85b5c5..1922c08edc 100644
@@ -15,20 +15,32 @@ RDESKTOP_DEPENDENCIES = \
 	xlib_libX11 \
 	xlib_libXcursor \
 	xlib_libXt \
-	$(if $(BR2_PACKAGE_ALSA_LIB_PCM),alsa-lib) \
-	$(if $(BR2_PACKAGE_LIBAO),libao) \
 	$(if $(BR2_PACKAGE_LIBICONV),libiconv) \
 	$(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate) \
-	$(if $(BR2_PACKAGE_PULSEAUDIO),pulseaudio) \
 	$(if $(BR2_PACKAGE_XLIB_LIBXRANDR),xlib_libXrandr)
 RDESKTOP_CONF_OPTS = --disable-credssp
 RDESKTOP_LICENSE = GPL-3.0+
 RDESKTOP_LICENSE_FILES = COPYING
 
+ifeq ($(BR2_PACKAGE_ALSA_LIB_PCM),y)
+RDESKTOP_DEPENDENCIES += alsa-lib
+RDESKTOP_CONF_OPTS += --with-sound=alsa
+endif
+
+ifeq ($(BR2_PACKAGE_LIBAO),y)
+RDESKTOP_DEPENDENCIES += libao
+RDESKTOP_CONF_OPTS += --with-sound=libao
+endif
+
 ifeq ($(BR2_PACKAGE_PCSC_LITE),y)
 RDESKTOP_DEPENDENCIES += pcsc-lite
 else
 RDESKTOP_CONF_OPTS += --disable-smartcard
 endif
 
+ifeq ($(BR2_PACKAGE_PULSEAUDIO),y)
+RDESKTOP_DEPENDENCIES += pulseaudio
+RDESKTOP_CONF_OPTS += --with-sound=pulse
+endif
+
 $(eval $(autotools-package))
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 package/rdesktop: use --with-sound option

Hello Fabrice,

Quoted 6 lines · On Sat, 14 Mar 2020 23:36:41 +0100 Fabrice Fontaine…

Use --with-sound option as requested by Thomas Petazzoni in review of
https://patchwork.ozlabs.org/patch/1254693

alsa, libao and pulseaudio are not exclusive, the order of registrations in rdpsnd_register_drivers define the probe-order when opening the device for the first time

But if you pass a single --with-sound=foo, don't they become mutually exclusive ? Does the configure script properly handles --with-sound=foo --with-sound=bar, and understands it should enable both support for "foo" and "bar" ? I think a normal configure script would only keep "bar" in such a circumstance.

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 package/rdesktop: use --with-sound option

Fabrice, Thomas, All,

On 2020-03-15 22:07 +0100, Thomas Petazzoni spake thusly:

Quoted 10 lines
Quoted 6 lines · On Sat, 14 Mar 2020 23:36:41 +0100 Fabrice Fontaine…

Use --with-sound option as requested by Thomas Petazzoni in review of
https://patchwork.ozlabs.org/patch/1254693

alsa, libao and pulseaudio are not exclusive, the order of registrations in rdpsnd_register_drivers define the probe-order when opening the device for the first time

Quoted 5 lines

But if you pass a single --with-sound=foo, don't they become mutually exclusive ? Does the configure script properly handles --with-sound=foo --with-sound=bar, and understands it should enable both support for "foo" and "bar" ? I think a normal configure script would only keep "bar" in such a circumstance.

Which is indeed what happens here;

https://github.com/rdesktop/rdesktop/blob/master/configure.ac#L286

Regards,
Yann E. MORIN.

Quoted 11 lines

Best regards,

Thomas

Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#3 lore raw

PATCH 1/1 package/rdesktop: use --with-sound option

Quoted 3 lines · On Sun, 15 Mar 2020 22:10:18 +0100 "Yann E. MORIN" <[email protected]>…

Which is indeed what happens here;

https://github.com/rdesktop/rdesktop/blob/master/configure.ac#L286

If I read
https://github.com/rdesktop/rdesktop/blob/master/configure.ac#L323
correctly, it means that --with-sound (or --with-sound=yes) will allow multiple audio backends to be supported at the same time.

While passing any other --with-sound=foo will only support the foo audio backend.

So in fact, passing --with-sound=foo is annoying, because you cannot support multiple audio backends.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#4 lore raw

PATCH 1/1 package/rdesktop: use --with-sound option

Dear all,

Le dim. 15 mars 2020 ? 22:50, Thomas Petazzoni
<[email protected]> a ?crit :

Quoted 13 lines
Quoted 3 lines · On Sun, 15 Mar 2020 22:10:18 +0100 "Yann E. MORIN" <[email protected]>…

Which is indeed what happens here;

https://github.com/rdesktop/rdesktop/blob/master/configure.ac#L286

If I read
https://github.com/rdesktop/rdesktop/blob/master/configure.ac#L323
correctly, it means that --with-sound (or --with-sound=yes) will allow multiple audio backends to be supported at the same time.

Quoted 5 lines

While passing any other --with-sound=foo will only support the foo audio backend.

So in fact, passing --with-sound=foo is annoying, because you cannot support multiple audio backends.

Indeed, I was too quick on this one, I'll set it as rejected.

Quoted 6 lines

Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Best Regards,

Fabrice