head 1.5; access; symbols pkgsrc-2023Q3:1.4.0.94 pkgsrc-2023Q3-base:1.4 pkgsrc-2023Q2:1.4.0.92 pkgsrc-2023Q2-base:1.4 pkgsrc-2023Q1:1.4.0.90 pkgsrc-2023Q1-base:1.4 pkgsrc-2022Q4:1.4.0.88 pkgsrc-2022Q4-base:1.4 pkgsrc-2022Q3:1.4.0.86 pkgsrc-2022Q3-base:1.4 pkgsrc-2022Q2:1.4.0.84 pkgsrc-2022Q2-base:1.4 pkgsrc-2022Q1:1.4.0.82 pkgsrc-2022Q1-base:1.4 pkgsrc-2021Q4:1.4.0.80 pkgsrc-2021Q4-base:1.4 pkgsrc-2021Q3:1.4.0.78 pkgsrc-2021Q3-base:1.4 pkgsrc-2021Q2:1.4.0.76 pkgsrc-2021Q2-base:1.4 pkgsrc-2021Q1:1.4.0.74 pkgsrc-2021Q1-base:1.4 pkgsrc-2020Q4:1.4.0.72 pkgsrc-2020Q4-base:1.4 pkgsrc-2020Q3:1.4.0.70 pkgsrc-2020Q3-base:1.4 pkgsrc-2020Q2:1.4.0.66 pkgsrc-2020Q2-base:1.4 pkgsrc-2020Q1:1.4.0.46 pkgsrc-2020Q1-base:1.4 pkgsrc-2019Q4:1.4.0.68 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.64 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.62 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.60 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.58 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.56 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.54 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.52 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.50 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.48 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.44 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.42 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.40 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.38 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.36 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.34 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.32 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.30 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.28 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.26 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.24 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.22 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.20 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.18 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.16 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.14 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.12 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.10 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.8 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.6 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.4 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.2 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.3.0.10 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.8 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.6 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.4 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.2 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.1.0.16 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.14 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.12 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.10 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.8 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.6 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.4 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.2 pkgsrc-2008Q4-base:1.1; locks; strict; comment @# @; 1.5 date 2023.11.04.12.33.27; author wiz; state dead; branches; next 1.4; commitid ViEcksXq2cz24iLE; 1.4 date 2012.03.31.16.06.56; author ryoon; state Exp; branches; next 1.3; 1.3 date 2011.01.08.13.00.13; author obache; state Exp; branches; next 1.2; 1.2 date 2010.12.26.20.59.31; author markd; state Exp; branches; next 1.1; 1.1 date 2008.11.24.21.13.19; author hasso; state Exp; branches; next ; desc @@ 1.5 log @hal{,-info}: remove Long obsolete. @ text @$NetBSD: patch-ao,v 1.4 2012/03/31 16:06:56 ryoon Exp $ On DragonFly /dev/usb will be taken by usbd(8), but that does not mean that one cannot check usbX devices. The same behaviour was present in older versions of hald(8). --- hald/freebsd/hf-usb.c.orig 2009-09-17 13:49:46.000000000 +0000 +++ hald/freebsd/hf-usb.c @@@@ -36,9 +36,13 @@@@ #if __FreeBSD_version >= 800064 #include #else +#ifdef __DragonFly__ +#include +#else #include #endif #endif +#endif #include "../logger.h" #include "../osspec.h" @@@@ -392,7 +396,11 @@@@ hf_usb_device_new (HalDevice *parent, hf_devtree_device_set_name(device, di->udi_devnames[0]); if ((devname = hf_usb_get_devname(di, "ukbd"))) /* USB keyboard */ +#if defined(__FreeBSD__) + hf_device_set_input(device, "keyboard", "keys", NULL); +#else hf_device_set_input(device, "keyboard", "keys", devname); +#endif else if ((devname = hf_usb_get_devname(di, "ums"))) /* USB mouse */ hf_device_set_input(device, "mouse", NULL, devname); else if ((devname = hf_usb_get_devname(di, "uhid"))) /* UHID device */ @@@@ -613,7 +621,6 @@@@ hf_usb_privileged_init (void) if (hf_usb_fd < 0) { HAL_INFO(("unable to open %s: %s", HF_USB_DEVICE, g_strerror(errno))); - return; } for (i = 0; i < 16; i++) @@@@ -908,6 +915,8 @@@@ hf_usb_add_webcam_properties (HalDevice hal_device_property_set_string(device, "info.category", "video4linux"); hal_device_add_capability(device, "video4linux"); + hal_device_add_capability(device, "video4linux.video_capture"); hf_device_property_set_string_printf(device, "video4linux.device", "/dev/video%i", unit); hal_device_property_set_string(device, "info.product", "Video Device"); + hal_device_property_set_string(device, "video4linux.version", "1"); } @ 1.4 log @Bump PKGREVISION * Fix build on FreeBSD 9.0 ** Patches are borrowed from FreeBSD ports ** Split FreeBSD support from DragonFly/FreeBSD support @ text @d1 1 a1 1 $NetBSD: patch-ao,v 1.3 2011/01/08 13:00:13 obache Exp $ @ 1.3 log @Bring back DragonFly BSD support. Based on PR#44338 from Rumko, also fixes PLIST.FreeBSD and self-tests by me. @ text @d1 1 a1 1 $NetBSD: patch-ao,v 1.2 2010/12/26 20:59:31 markd Exp $ d23 13 a35 1 @@@@ -613,7 +617,6 @@@@ hf_usb_privileged_init (void) d43 9 @ 1.2 log @Update to 0.5.14. Many bugfixes and support for new features. @ text @d1 5 a5 1 $NetBSD$ d23 8 @ 1.1 log @* Make it work on DragonFly with FreeBSD backend. It's largely untested, but certainly already usable. * Fix paths to [pci|usb].ids files. * Bump PKGREVISION. @ text @d3 6 a8 6 --- hald/freebsd/hf-usb.c.orig 2008-11-24 14:15:42 +0200 +++ hald/freebsd/hf-usb.c 2008-11-24 07:18:17 +0200 @@@@ -31,7 +31,11 @@@@ #include #include #include d13 2 @