diff options
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/detect_devices.pm | 2 | ||||
| -rw-r--r-- | perl-install/modules.pm | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/drakxtv | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index cc13ab7fb..43b75cded 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -371,7 +371,7 @@ sub getSoundDevices() { (arch() =~ /ppc/ ? \&modules::load_category : \&modules::probe_category)->('multimedia/sound'); } -sub isTVcard { $_[0]{driver} =~ /bttv|saa7134/ } +sub isTVcard { member($_[0]{driver} qw(bttv cx8800 saa7134 usbvision) } sub getTVcards() { grep { isTVcard($_) } detect_devices::probeall(); diff --git a/perl-install/modules.pm b/perl-install/modules.pm index 7bddda631..785e53edf 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -312,7 +312,7 @@ sub write_conf() { } my @l; push @l, 'scsi_hostadapter' if !is_empty_array_ref($conf{scsi_hostadapter}{probeall}); - push @l, 'bttv' if detect_devices::matching_driver('^bttv$'); + push @l, $_ if detect_devices::matching_driver('^$_$') foreach qw(bttv cx8800 saa7134); my @l_26 = @l; if (my ($agp) = probe_category('various/agpgart')) { push @l_26, $agp->{driver}; diff --git a/perl-install/standalone/drakxtv b/perl-install/standalone/drakxtv index b44c3868c..40168a5f0 100755 --- a/perl-install/standalone/drakxtv +++ b/perl-install/standalone/drakxtv @@ -111,7 +111,7 @@ sub scan4channels() { } } -my @devices = grep { $_->{media_type} eq 'MULTIMEDIA_VIDEO' || member($_->{driver}, qw(bttv saa7134 usbvision)) } detect_devices::probeall(); +my @devices = detect_devices::isTVcard(); push @devices, { driver => 'bttv', description => 'dummy' } if $::testing && !@devices; if (@devices) { my $not_canceled = 1; |