From 0ab66801de59b6e39d0418a14bd9afd405cadef4 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Thu, 5 Mar 2009 16:55:18 +0000
Subject: all "gpsca*" driven devices are webcam

---
 perl-install/NEWS              | 2 ++
 perl-install/harddrake/data.pm | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'perl-install')

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 164542221..ef4f74a88 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -13,6 +13,8 @@
   o give console rights for current session when renaming user
 - drakdvb:
   o install w_scan if needed (#48242)
+- harddrake:
+  o all "gpsca*" driven devices are webcam
 - localdrake/finish-install:
   o fix reading default input method setting
 - remove extents options on ext4 when updating fstab
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index dd8686752..8a429558d 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -326,7 +326,8 @@ 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' || member($_->{driver}, @modules) } @devices);
+          f(grep { $_->{media_type} =~ /MULTIMEDIA_VIDEO|Video\|Video Control/ && $_->{bus} ne 'PCI'
+                     || member($_->{driver}, @modules) || $_->{driver} =~ /^gpsca/ } @devices);
       },
       # managed by hotplug:
       checked_on_boot => 0,
-- 
cgit v1.2.1