From: Doug Goldstein Date: Wed, 11 Apr 2007 23:39:56 +0000 (+0000) Subject: Fix FreeBSD backend some more X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e7c8f6e3f710e6237285c915db0b53edb78604aa;p=gentoo.git Fix FreeBSD backend some more Package-Manager: portage-2.1.2.3 --- diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog index d73617b4f545..4cf374c5a4fc 100644 --- a/sys-apps/hal/ChangeLog +++ b/sys-apps/hal/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/hal # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.160 2007/04/11 21:40:25 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.161 2007/04/11 23:39:56 cardoe Exp $ + + 11 Apr 2007; Doug Goldstein + files/0.5.9/06_freebsd_backend_fix.patch: + Fix FreeBSD backend some more 11 Apr 2007; Doug Goldstein files/0.5.9/07_malloc_h_for_stdlib_h.patch, diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest index d7da5bb45f70..167efbd62e0b 100644 --- a/sys-apps/hal/Manifest +++ b/sys-apps/hal/Manifest @@ -33,10 +33,10 @@ AUX 0.5.9/05_freebsd_partutil_make_fix.patch 579 RMD160 96035d38334a9ac18e16014d MD5 74d899e87a335a963a6aa5240ebc771a files/0.5.9/05_freebsd_partutil_make_fix.patch 579 RMD160 96035d38334a9ac18e16014d11820c56823425e9 files/0.5.9/05_freebsd_partutil_make_fix.patch 579 SHA256 4f8d912bc84084d85a626003f93835fb6d92e0bf1aa9d09d282b47182c57966e files/0.5.9/05_freebsd_partutil_make_fix.patch 579 -AUX 0.5.9/06_freebsd_backend_fix.patch 1855 RMD160 b72d65291d04cc5ebadc24ef697f2e1ae2ab28a8 SHA1 db5ab4030732fa5641641c01fb80c3b46aaec99c SHA256 c8f5149e581cbcd328b70f04532b45f488940ce3b9d779a355600e96f885bed2 -MD5 65a0a52b23807f81ee2d61d2602256b2 files/0.5.9/06_freebsd_backend_fix.patch 1855 -RMD160 b72d65291d04cc5ebadc24ef697f2e1ae2ab28a8 files/0.5.9/06_freebsd_backend_fix.patch 1855 -SHA256 c8f5149e581cbcd328b70f04532b45f488940ce3b9d779a355600e96f885bed2 files/0.5.9/06_freebsd_backend_fix.patch 1855 +AUX 0.5.9/06_freebsd_backend_fix.patch 2654 RMD160 7da55bc415914bf1b5235ce687592f70ab72a415 SHA1 5438de20ed2d5041087f600dd089f2843ad7fc98 SHA256 925aec0dfa60af59c33f0b49b6ca2e559b40fadf51003eb8e31efbe6b59402b3 +MD5 d6e07b0b7fc434fdc1624ec88d1cd68e files/0.5.9/06_freebsd_backend_fix.patch 2654 +RMD160 7da55bc415914bf1b5235ce687592f70ab72a415 files/0.5.9/06_freebsd_backend_fix.patch 2654 +SHA256 925aec0dfa60af59c33f0b49b6ca2e559b40fadf51003eb8e31efbe6b59402b3 files/0.5.9/06_freebsd_backend_fix.patch 2654 AUX 0.5.9/07_malloc_h_for_stdlib_h.patch 1401 RMD160 2e1140954fd8818d412fc07750f12b25d04f7ada SHA1 8fc34e0f1a81e89465ffbce7881aba597276121f SHA256 04749b15f3349e146523d9ed2571e5362804de5f0320f68cbcc85395debc6554 MD5 61d44f37a51f2e92054bda4df0b67688 files/0.5.9/07_malloc_h_for_stdlib_h.patch 1401 RMD160 2e1140954fd8818d412fc07750f12b25d04f7ada files/0.5.9/07_malloc_h_for_stdlib_h.patch 1401 @@ -171,10 +171,10 @@ EBUILD hal-0.5.9.ebuild 6383 RMD160 3777975a916ff2e04f2ffc4c97ad2e1f2e1b6de1 SHA MD5 84c3c9a869e9c860b756e033458509da hal-0.5.9.ebuild 6383 RMD160 3777975a916ff2e04f2ffc4c97ad2e1f2e1b6de1 hal-0.5.9.ebuild 6383 SHA256 1734a1121bb33064e8bedadee3682947e654244b381d0032c3a28beed87c2a60 hal-0.5.9.ebuild 6383 -MISC ChangeLog 25690 RMD160 f004533a2cb09cfa81980d2e42fb77fb4046a8fd SHA1 65bd7d7338e87aa2d342f3a536e5473520a23c15 SHA256 46cd5fd07bfa2d748b99536913dae05566f436da3e4b765385024ec09a3ac8dd -MD5 76f6821f90b321734bc36b275964f887 ChangeLog 25690 -RMD160 f004533a2cb09cfa81980d2e42fb77fb4046a8fd ChangeLog 25690 -SHA256 46cd5fd07bfa2d748b99536913dae05566f436da3e4b765385024ec09a3ac8dd ChangeLog 25690 +MISC ChangeLog 25817 RMD160 28a6e401b1eb2bed891601dbda4d61a49d63c0f7 SHA1 31c658d267123618ae0caece9e7af48aca3d0070 SHA256 47b854e4b6a31ae98acfaa100b0683ec3b05acb5d8151b48009bdcc6623c9989 +MD5 176f9b5f92f2ec1a7300fe89f2791485 ChangeLog 25817 +RMD160 28a6e401b1eb2bed891601dbda4d61a49d63c0f7 ChangeLog 25817 +SHA256 47b854e4b6a31ae98acfaa100b0683ec3b05acb5d8151b48009bdcc6623c9989 ChangeLog 25817 MISC metadata.xml 345 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 SHA1 fef829210e8555807f9b69ba5afedffb8af8d02c SHA256 0c9aeabf473a6836c25a5db2ca86b880dec1efa9e52310725e08d1e0df93447d MD5 3317c4000387b670183d305ef9937b75 metadata.xml 345 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 metadata.xml 345 @@ -191,7 +191,7 @@ SHA256 d862b002c9a5547954874b2a0cbadd614381d085e850539e6aef2dd9e9d52dfe files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFGHVW6oeSe8B0zEfwRAjzAAJ9imbQLvvWocrobFKS/GSlGE1ST0gCbBK37 -pEykH02nvm725QfOQsuncUs= -=Ivg7 +iD8DBQFGHXG/oeSe8B0zEfwRAv6cAJ4pohadEAhemGQJSgLQDDxP/VrXJACeIJrg +XtnvhAifjNbXDqYhORdRgJA= +=ziGz -----END PGP SIGNATURE----- diff --git a/sys-apps/hal/files/0.5.9/06_freebsd_backend_fix.patch b/sys-apps/hal/files/0.5.9/06_freebsd_backend_fix.patch index 4539092e1a94..95125ac9081a 100644 --- a/sys-apps/hal/files/0.5.9/06_freebsd_backend_fix.patch +++ b/sys-apps/hal/files/0.5.9/06_freebsd_backend_fix.patch @@ -1,7 +1,7 @@ Index: b/hald/freebsd/hf-usb.c =================================================================== ---- a/hald/freebsd/hf-usb.c 2007-03-24 18:32:57.000000000 -0400 -+++ b/hald/freebsd/hf-usb.c 2007-04-11 12:56:02.000000000 -0400 +--- a/hald/freebsd/hf-usb.c 2007-04-11 15:50:44.000000000 -0400 ++++ b/hald/freebsd/hf-usb.c 2007-04-11 19:19:07.000000000 -0400 @@ -372,11 +372,11 @@ can_wake_up = (config_desc.bmAttributes & UC_REMOTE_WAKEUP) != 0; num_interfaces = config_desc.bNumInterface; @@ -25,24 +25,7 @@ Index: b/hald/freebsd/hf-usb.c const usb_interface_descriptor_t *desc) { HalDevice *device; -@@ -447,6 +449,7 @@ - hal_device_property_set_int(device, "usb.interface.protocol", desc->bInterfaceProtocol); - hal_device_property_set_int(device, "usb.interface.number", desc->bInterfaceNumber); - -+ /** FIX ME.. controller and di are not variables in this scope.. - if (desc->iInterface != 0) - { - char *interface; -@@ -458,7 +461,7 @@ - g_free(interface); - } - } -- -+*/ - - hf_usb_device_compute_udi(device); - -@@ -576,7 +579,7 @@ +@@ -576,7 +578,7 @@ break; } @@ -51,3 +34,33 @@ Index: b/hald/freebsd/hf-usb.c hf_device_preprobe_and_add(if_device); p += USB_INTERFACE_DESCRIPTOR_SIZE + if_desc->bNumEndpoints * USB_ENDPOINT_DESCRIPTOR_SIZE; +Index: b/hald/freebsd/hf-pci.c +=================================================================== +--- a/hald/freebsd/hf-pci.c 2007-04-11 14:55:43.000000000 -0400 ++++ b/hald/freebsd/hf-pci.c 2007-04-11 19:32:33.000000000 -0400 +@@ -207,12 +207,22 @@ + for (p = conf; p < &conf[pc.num_matches]; p++) + { + DeviceInfo *info; ++ HalProperty *pcibus, *pcidevice, *pcifunc; ++ ++ pcibus = hal_property_new(HAL_PROPERTY_TYPE_INT32); ++ hal_property_set_int(pcibus, p->pc_sel.pc_bus); ++ ++ pcidevice = hal_property_new(HAL_PROPERTY_TYPE_INT32); ++ hal_property_set_int(pcidevice, p->pc_sel.pc_dev); ++ ++ pcifunc = hal_property_new(HAL_PROPERTY_TYPE_INT32); ++ hal_property_set_int(pcifunc, p->pc_sel.pc_func); + + info = g_new(DeviceInfo, 1); + info->device = hf_device_store_match(hald_get_gdl(), +- hal_property_new_int("pci.freebsd.bus", p->pc_sel.pc_bus), +- hal_property_new_int("pci.freebsd.device", p->pc_sel.pc_dev), +- hal_property_new_int("pci.freebsd.function", p->pc_sel.pc_func), ++ pcibus, ++ pcidevice, ++ pcifunc, + NULL); + info->p = *p; + info->secondary_bus = hf_pci_get_register(p, PCIR_SECBUS_1);