From f6c0e2788954d8240a7be4a5b7295b87ff4ba225 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 23 Dec 2009 18:18:06 +0000 Subject: fix detecting some cameras --- perl-install/NEWS | 2 ++ perl-install/harddrake/data.pm | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index 6fde70404..118377064 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,6 +1,8 @@ - installation mount points: reset unknown partitions types to default fs (ext4) instead of hardcoded ext3 - diskdrake: show Ext4 instead of Ext3 in the gtk filesystems button box +- harddrake: + o fix detecting some cameras Version 13.2 - 14 December 2009 diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm index 66c747179..f80ed5da1 100644 --- a/perl-install/harddrake/data.pm +++ b/perl-install/harddrake/data.pm @@ -315,7 +315,7 @@ our @tree = detector => sub { require list_modules; my @modules = (list_modules::category2modules('multimedia/webcam'), 'Removable:camera'); - f(grep { $_->{media_type} =~ /MULTIMEDIA_VIDEO|Video\|Video Control/ && $_->{bus} ne 'PCI' + f(grep { $_->{media_type} =~ /MULTIMEDIA_VIDEO|Video\|Video Control|Imaging/ && $_->{bus} ne 'PCI' || member($_->{driver}, @modules) || $_->{driver} =~ /^gpsca/ } @devices); }, # managed by hotplug: -- cgit v1.2.1