Hello community, here is the log from the commit of package hal checked in at Thu Nov 9 12:59:12 CET 2006. -------- --- hal/hal.changes 2006-11-07 00:08:33.000000000 +0100 +++ /mounts/work_src_done/STABLE/hal/hal.changes 2006-11-07 18:13:17.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Nov 7 01:09:37 CET 2006 - dkukawka@suse.de + +- added pmtools to Requires (need dmidecode) +- added patches: + - hal-add-alsa_hw-specific_devices.diff: to show hardware + specific sound devices in HAL. (see b.n.c #208695) + +------------------------------------------------------------------- Old: ---- hal-fix-test.diff New: ---- hal-add-alsa_hw-specific_devices.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hal.spec ++++++ --- /var/tmp/diff_new_pack.vM7gsw/_old 2006-11-09 12:58:48.000000000 +0100 +++ /var/tmp/diff_new_pack.vM7gsw/_new 2006-11-09 12:58:48.000000000 +0100 @@ -19,7 +19,7 @@ License: Other uncritical OpenSource License, Other License(s), see package Group: System/Daemons Version: 0.5.8_git20061106 -Release: 1 +Release: 3 Autoreqprov: on Summary: Daemon for Collecting Hardware Information # SUSE specific patches @@ -42,9 +42,10 @@ Patch107: hal-fix-wireless_detection_rt2500pci.diff Patch108: hal-fix-cpufreq-add-capability.diff Patch109: hal-fix-dbus_error_is_set.diff +Patch110: hal-add-alsa_hw-specific_devices.diff # # patches for testing: -Patch300: hal-fix-test.diff +#Patch300: hal-fix-test.diff ## ## external patches from HAL List and backports patches we need to port or to check # unclear how to fix this atm @@ -57,7 +58,7 @@ Source1: rc.hal Source2: 90-hal.rules Prereq: /usr/sbin/groupadd /usr/sbin/useradd /etc/init.d/boot.localfs -Requires: dbus-1 >= %{dbus_version}-%{dbus_release}, dbus-1-glib >= %{dbus_version}-%{dbus_release}, aaa_base, PolicyKit, pm-utils +Requires: dbus-1 >= %{dbus_version}-%{dbus_release}, dbus-1-glib >= %{dbus_version}-%{dbus_release}, aaa_base, PolicyKit, pm-utils, pmtools Provides: hotplugctl Obsoletes: hotplugctl BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -151,6 +152,7 @@ %patch107 -p1 %patch108 -p0 %patch109 -p1 +%patch110 -p1 #%patch300 -p1 %build @@ -265,6 +267,11 @@ %{_bindir}/hal-device-manager %changelog -n hal +* Tue Nov 07 2006 - dkukawka@suse.de +- added pmtools to Requires (need dmidecode) +- added patches: + - hal-add-alsa_hw-specific_devices.diff: to show hardware + specific sound devices in HAL. (see b.n.c #208695) * Mon Nov 06 2006 - dkukawka@suse.de - added patch: - hal-fix-dbus_error_is_set.diff: since dbus_error_is_set(NULL) ++++++ hal-add-alsa_hw-specific_devices.diff ++++++ diff --git a/hald/linux/device.c b/hald/linux/device.c index 9f1a86a..84aa78e 100644 --- a/hald/linux/device.c +++ b/hald/linux/device.c @@ -673,6 +673,24 @@ sound_add (const gchar *sysfs_path, cons } else hal_device_property_set_string (d, "info.product", "ALSA Device"); } + } else if (sscanf (device, "hwC%dD%d", &cardnum, &devicenum) == 2) { + + hal_device_property_set_string (d, "info.category", "alsa"); + hal_device_add_capability (d, "alsa"); + hal_device_property_set_string (d, "alsa.device_file", device_file); + hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev)); + hal_device_property_set_string (d, "alsa.physical_device", hal_device_get_udi (parent_dev)); + hal_device_property_set_int (d, "alsa.card", cardnum); + hal_device_property_set_int (d, "alsa.device", devicenum); + + snprintf (aprocdir, sizeof (aprocdir), "%s/asound/card%d", get_hal_proc_path (), cardnum); + hal_util_set_string_from_file (d, "alsa.card_id", aprocdir, "id"); + + hal_device_property_set_string (d, "alsa.type", "hw_specific"); + + snprintf (buf, sizeof (buf), "%s ALSA hardware specific Device", hal_device_property_get_string (d, "alsa.card_id")); + hal_device_property_set_string (d, "info.product", buf); + } else if (!strncmp (device, "dsp", 3) || !strncmp (device, "adsp", 4) || !strncmp (device, "midi", 4) || !strncmp (device, "amidi", 5) || !strncmp (device, "audio", 5) || !strncmp (device, "mixer", 5)) { diff --git a/doc/spec/hal-spec-properties.xml b/doc/spec/hal-spec-properties.xml index 97d2580..23d7273 100644 --- a/doc/spec/hal-spec-properties.xml +++ b/doc/spec/hal-spec-properties.xml @@ -4105,7 +4105,7 @@ <literal>alsa.device_pcm_class</literal> (string) </entry> <entry></entry> - <entry>Yes</entry> + <entry>No</entry> <entry> The PCM class of the device. </entry> @@ -4210,6 +4210,27 @@ Stream is playback device. </entry> </row> + <row> + <entry></entry> + <entry> + <literal>unknown</literal> + </entry> + <entry></entry> + <entry> + The type of the device is unknown. + </entry> + </row> + <row> + <entry></entry> + <entry> + <literal>hw_specific</literal> + </entry> + <entry></entry> + <entry> + This is a hardware specific device. The driver can use it freely for + purposes that are not covered by standard ALSA API. + </entry> + </row> <row> <entry></entry> <entry> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@suse.de