Merge lp:~diwic/udev/lp826662 into lp:~ubuntu-core-dev/ubuntu/oneiric/udev/ubuntu

[David Henningsson]

The PulseAudio jack detection is currently blocking on the current user not being able to access the input devices.

[Martin Pitt (pitti)]

This was rejected upstream, but let's keep this at least for oneiric as a quick fix.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-07-28 14:38:54 +0000
+++ debian/changelog	2011-08-15 10:15:31 +0000
@@ -1,3 +1,10 @@
+udev (172-0ubuntu6) oneiric; urgency=low
+
+  * To enable jack detection in PulseAudio, make jack detection input
+    devices world-readable, just as being done for joysticks (LP: #826662).
+
+ -- David Henningsson <[e-mail]>  Mon, 15 Aug 2011 12:03:16 +0200
+
 udev (172-0ubuntu5) oneiric; urgency=low
 
   * The kernel won't mount devtmpfs automatically when /init exists, which

=== added file 'debian/patches/jack-detection.patch'
--- debian/patches/jack-detection.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/jack-detection.patch	2011-08-15 10:15:31 +0000
@@ -0,0 +1,81 @@
+From a45276437c8c3fe62fc001f43d715bfe931dd438 Mon Sep 17 00:00:00 2001
+From: David Henningsson <[e-mail]>
+Date: Wed, 15 Jun 2011 20:36:16 +0200
+Subject: [PATCH] udev: Allow ALSA input jacks to be accessed by the current user
+
+One missing piece for userspace (PulseAudio etc) to actually be able
+to use the jack input devices that ALSA create, is that these devices
+are accessible by root only. This patch makes the input device nodes
+world readable, just as for joysticks.
+
+Signed-off-by: David Henningsson <[e-mail]>
+---
+ extras/input_id/input_id.c              |   23 +++++++++++++++++++++++
+ extras/udev-acl/70-acl.rules            |    1 +
+ rules/rules.d/60-persistent-input.rules |    1 +
+ 3 files changed, 25 insertions(+), 0 deletions(-)
+
+Index: udev-172/extras/input_id/input_id.c
+===================================================================
+--- udev-172.orig/extras/input_id/input_id.c	2011-06-06 18:31:56.632539135 +0200
++++ udev-172/extras/input_id/input_id.c	2011-08-08 07:34:32.621109570 +0200
+@@ -189,6 +189,25 @@
+ 		puts("ID_INPUT_KEYBOARD=1");
+ }
+ 
++static void test_sound (struct udev_device *dev,
++		        const unsigned long* bitmask_sw)
++{
++
++	struct udev_device *snd_dev;
++
++	/* Ensure parent is sound card */
++	snd_dev = udev_device_get_parent_with_subsystem_devtype(dev, "sound", NULL);
++	if (!snd_dev)
++		return;
++
++	/* Check that there is at least one relevant switch type */
++	if (test_bit(SW_HEADPHONE_INSERT, bitmask_sw) || 
++	    test_bit(SW_MICROPHONE_INSERT, bitmask_sw) || 
++	    test_bit(SW_LINEOUT_INSERT, bitmask_sw) || 
++	    test_bit(SW_VIDEOOUT_INSERT, bitmask_sw))
++		puts("ID_INPUT_SNDJACK=1");	    
++}
++
+ static void help(void)
+ {
+ 	printf("Usage: input_id [options] <device path>\n"
+@@ -212,6 +231,7 @@
+ 	unsigned long bitmask_abs[NBITS(ABS_MAX)];
+ 	unsigned long bitmask_key[NBITS(KEY_MAX)];
+ 	unsigned long bitmask_rel[NBITS(REL_MAX)];
++	unsigned long bitmask_sw[NBITS(SW_MAX)];
+ 
+ 	udev = udev_new();
+ 	if (udev == NULL)
+@@ -272,10 +292,13 @@
+ 	get_cap_mask (dev, "capabilities/abs", bitmask_abs, sizeof (bitmask_abs));
+ 	get_cap_mask (dev, "capabilities/rel", bitmask_rel, sizeof (bitmask_rel));
+ 	get_cap_mask (dev, "capabilities/key", bitmask_key, sizeof (bitmask_key));
++	get_cap_mask (dev, "capabilities/sw", bitmask_sw, sizeof (bitmask_sw));
+ 
+ 	test_pointers(bitmask_ev, bitmask_abs, bitmask_key, bitmask_rel);
+ 
+ 	test_key(udev, bitmask_ev, bitmask_key);
+ 
++	test_sound(dev, bitmask_sw);
++
+ 	return 0;
+ }
+Index: udev-172/rules/rules.d/60-persistent-input.rules
+===================================================================
+--- udev-172.orig/rules/rules.d/60-persistent-input.rules	2011-07-10 16:41:50.524235883 +0200
++++ udev-172/rules/rules.d/60-persistent-input.rules	2011-08-08 07:38:21.001106179 +0200
+@@ -12,6 +12,7 @@
+ ENV{ID_INPUT_TOUCHPAD}=="?*", ENV{.INPUT_CLASS}="mouse"
+ ENV{ID_INPUT_TABLET}=="?*", ENV{.INPUT_CLASS}="mouse"
+ ENV{ID_INPUT_JOYSTICK}=="?*", ENV{.INPUT_CLASS}="joystick"
++ENV{ID_INPUT_SNDJACK}=="?*", ENV{.INPUT_CLASS}="sndjack", MODE="0644"
+ DRIVERS=="pcspkr", ENV{.INPUT_CLASS}="spkr"
+ ATTRS{name}=="*dvb*|*DVB*|* IR *", ENV{.INPUT_CLASS}="ir"
+ 

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-07-12 05:56:39 +0000
+++ debian/patches/series	2011-08-15 10:15:31 +0000
@@ -2,3 +2,4 @@
 load-fbcon.patch
 ignore-eucalyptus-virtual-ifaces.patch
 use_run_tmpfs
+jack-detection.patch