Permalink
Browse files

removed outdated ebuilds of sys-apps/hal via auto-sync

  • Loading branch information...
1 parent 287abeb commit 45fb96ce91b659932d5c95e45a217f98617ed0ea @ahuemer ahuemer committed Mar 26, 2011
Showing with 0 additions and 122 deletions.
  1. +0 −1 sys-apps/hal/Manifest
  2. +0 −121 sys-apps/hal/files/hal-0.5.14-r2-fbsd.patch
View
1 sys-apps/hal/Manifest
@@ -1,6 +1,5 @@
AUX 0.5.14-hald.conf 119 RMD160 06e205ba7fa8acfb6f68e84a247845a3ad028351 SHA1 c8a62a808c7f632154dda1686fe344a4a136e28f SHA256 b19e6df9c78b6f813405a7cbff20e049714db1a000e6b71ab2eca02d372d58af
AUX 0.5.14-hald.rc.1 1114 RMD160 24c508a1a8df09252a21b178addba8a18a17ba1e SHA1 6bcca0ce11b50529b71cb2ff3af4ad877c3f144c SHA256 ab68ed700d2c3044da6ec2cc88f315c33518d4df503c52eda1ded3354b751cca
-AUX hal-0.5.14-r2-fbsd.patch 4380 RMD160 9a3483cf3a7eee5f43b582b9ca531da7487221f9 SHA1 67d41b9b74d89ab7645ac3750780895a70856e50 SHA256 8299068a7d0276e2e08785a56e3285d4232435a427c3059cc9f88ebe87e97ee2
AUX hal-unmount.dev 397 RMD160 78286dd9527bbb421082e73b0d08e06cd514d275 SHA1 31169a28448fb1eb1dfee5d1699de9a02449a6b7 SHA256 747a4c483f8a558f2c75666e9547e539475f112363f1dbfc6ea19ca393c8e89b
DIST hal-0.5.14-gentoo-patches-5.tar.bz2 6494 RMD160 810e68c430b9207ddc6d7531a728cc3f49eea7b4 SHA1 0b5159d6cbd91c9357f1c5b59074fd48870d6156 SHA256 5919bf1e3e5ff8b3682b8163e8b9cd86269263f9d023783d0c13dc759b36849c
DIST hal-0.5.14.tar.bz2 942954 RMD160 0314dace9512bf49a62bd1556963fc60a6c9caf9 SHA1 a6ec098d78112e18e2773afa5f9ed642b00c4c59 SHA256 c4c5ecc5d50d5d9c061dc06c405461b1f71c12f2c60ed062350b2e6db2f1c51e
View
121 sys-apps/hal/files/hal-0.5.14-r2-fbsd.patch
@@ -1,121 +0,0 @@
-commit a3ea9ecc75a414e35ae763a92a2c3fa05a7ca0b3
-Author: Joe Marcus Clarke <marcus@FreeBSD.org>
-Date: Fri Dec 25 11:21:23 2009 -0500
-
- Fix (or workaround) quite a few bugs with newusb interaction
-
- * Allow the newusb module to compile with the recent input changes from
- kFreeBSD.
- * Make sure usb2 devices attach properly to the device tree with the correct
- parent.
- * Properly detect when newusb devices are added and removed.
-
-diff --git a/hald/freebsd/hf-usb2.c b/hald/freebsd/hf-usb2.c
-index fff49e0..f1a02e2 100644
---- a/hald/freebsd/hf-usb2.c
-+++ b/hald/freebsd/hf-usb2.c
-@@ -98,10 +98,10 @@ hf_usb2_probe_interfaces(HalDevice *parent)
- if (driver)
- {
- if (! strcmp(driver, "ukbd"))
-- hf_device_set_input(device, "keyboard", NULL);
-- else if (! strcmp(driver, "ums"))
-+ hf_device_set_input(device, "keyboard", "keys", devname);
-+ else if (! strcmp(driver, "ums") || ! strcmp(driver, "atp"))
- {
-- hf_device_set_input(device, "mouse", devname);
-+ hf_device_set_input(device, "mouse", NULL, devname);
- hf_runner_run_sync(device, 0, "hald-probe-mouse", NULL);
- }
- else if (! strcmp(driver, "uhid"))
-@@ -192,11 +192,12 @@ hf_usb2_probe (void)
- addr = libusb20_dev_get_address(pdev);
-
- if (addr == 1)
-- parent = hf_devtree_find_parent_from_info(hald_get_gdl(), "usbus", bus);
-+ parent = hf_devtree_find_from_info(hald_get_gdl(), "usbus", bus);
- else
- parent = hf_device_store_match(hald_get_gdl(), "usb_device.bus_number",
- HAL_PROPERTY_TYPE_INT32, bus, "usb_device.port_number",
-- HAL_PROPERTY_TYPE_INT32, addr - 1, NULL);
-+ HAL_PROPERTY_TYPE_INT32, addr - 1, "info.bus",
-+ HAL_PROPERTY_TYPE_STRING, "usb_device", NULL);
- if (! parent || hal_device_property_get_bool(parent, "info.ignore"))
- continue;
-
-@@ -216,7 +217,13 @@ hf_usb2_devd_add (const char *name,
- HalDevice *parent_device;
- int bus, addr, pbus, paddr;
-
-- if (strncmp(name, "ugen", strlen("ugen")))
-+ if (! parent)
-+ return FALSE;
-+
-+ if (strncmp(name, "ugen", strlen("ugen")) &&
-+ ! strncmp(parent, "uhub", strlen("uhub")))
-+ return TRUE;
-+ else if (strncmp(name, "ugen", strlen("ugen")))
- return FALSE;
- else if (strncmp(parent, "ugen", strlen("ugen")))
- return TRUE;
-@@ -232,7 +239,8 @@ hf_usb2_devd_add (const char *name,
-
- parent_device = hf_device_store_match(hald_get_gdl(),
- "usb_device.bus_number", HAL_PROPERTY_TYPE_INT32, pbus,
-- "usb_device.port_number", HAL_PROPERTY_TYPE_INT32, paddr, NULL);
-+ "usb_device.port_number", HAL_PROPERTY_TYPE_INT32, paddr, "info.bus",
-+ HAL_PROPERTY_TYPE_STRING, "usb_device", NULL);
-
- if (parent_device && ! hal_device_property_get_bool(parent_device,
- "info.ignore"))
-@@ -255,8 +263,6 @@ hf_usb2_devd_remove (const char *name,
-
- if (strncmp(name, "ugen", strlen("ugen")))
- return FALSE;
-- else if (strncmp(parent, "ugen", strlen("ugen")))
-- return TRUE;
-
- if (sscanf(name, "ugen%i.%i", &bus, &addr) != 2)
- return FALSE;
-@@ -265,7 +271,8 @@ hf_usb2_devd_remove (const char *name,
-
- device = hf_device_store_match(hald_get_gdl(), "usb_device.bus_number",
- HAL_PROPERTY_TYPE_INT32, bus, "usb_device.port_number",
-- HAL_PROPERTY_TYPE_INT32, addr, NULL);
-+ HAL_PROPERTY_TYPE_INT32, addr, "info.bus",
-+ HAL_PROPERTY_TYPE_STRING, "usb_device", NULL);
-
- if (device)
- {
-@@ -276,6 +283,23 @@ hf_usb2_devd_remove (const char *name,
- return FALSE;
- }
-
-+static gboolean
-+hf_usb2_devd_notify (const char *system,
-+ const char *subsystem,
-+ const char *type,
-+ const char *data)
-+{
-+ if (! data || strcmp(system, "DEVFS") || strcmp(subsystem, "CDEV") ||
-+ (strcmp(type, "CREATE") && strcmp(type, "DESTROY")))
-+ return FALSE;
-+
-+ if (! strncmp(data, "cdev=ugen", strlen("cdev=ugen")) ||
-+ ! strncmp(data, "cdev=usb", strlen("cdev=usb")))
-+ return TRUE;
-+
-+ return FALSE;
-+}
-+
- HFHandler hf_usb2_handler = {
- .privileged_init = hf_usb2_privileged_init,
- .probe = hf_usb2_probe
-@@ -283,5 +307,6 @@ HFHandler hf_usb2_handler = {
-
- HFDevdHandler hf_usb2_devd_handler = {
- .add = hf_usb2_devd_add,
-- .remove = hf_usb2_devd_remove
-+ .remove = hf_usb2_devd_remove,
-+ .notify = hf_usb2_devd_notify
- };

0 comments on commit 45fb96c

Please sign in to comment.