6a630094d0
Also add a patch by drochner:
pthread_key_create returns 0 on success; return values on failure are
not defined.
Remaining patches without comments:
patch-ab: adding an ifdef notyet in src/daemon/main.c
patch-a{c,e}: --start -> -D (no idea why)
patch-af: allow some Linux-only code also on NetBSD
19 lines
987 B
Text
19 lines
987 B
Text
$NetBSD: patch-dc,v 1.2 2011/05/21 15:33:00 wiz Exp $
|
|
|
|
If oss.originating_device hal properly isn't availble, try
|
|
sound.originating_device.
|
|
|
|
--- src/modules/module-hal-detect.c.orig 2009-09-10 00:04:58.000000000 +0000
|
|
+++ src/modules/module-hal-detect.c
|
|
@@ -337,6 +337,11 @@ static int hal_device_load_oss(struct us
|
|
|
|
/* We store only one entry per card, hence we look for the originating device */
|
|
originating_udi = libhal_device_get_property_string(u->context, udi, "oss.originating_device", &error);
|
|
+ if (dbus_error_is_set(&error) || !originating_udi) {
|
|
+ if (dbus_error_is_set(&error))
|
|
+ dbus_error_free(&error);
|
|
+ originating_udi = libhal_device_get_property_string(u->context, udi, "sound.originating_device", &error);
|
|
+ }
|
|
if (dbus_error_is_set(&error) || !originating_udi)
|
|
goto fail;
|
|
|