diff options
Diffstat (limited to 'v4l')
| -rwxr-xr-x | v4l/scripts/cardlist | 2 | ||||
| -rwxr-xr-x | v4l/scripts/hghead.pl | 14 | ||||
| -rwxr-xr-x | v4l/scripts/usbvision.pl | 10 |
3 files changed, 20 insertions, 6 deletions
diff --git a/v4l/scripts/cardlist b/v4l/scripts/cardlist index 0f25a4b81..3e5213975 100755 --- a/v4l/scripts/cardlist +++ b/v4l/scripts/cardlist @@ -6,7 +6,7 @@ scripts/bttv.pl ../linux/drivers/media/video/bt8xx/bttv.h ../linux/drivers/medi scripts/cx88.pl ../linux/drivers/media/video/cx88/cx88.h ../linux/drivers/media/video/cx88/cx88-cards.c \ | perl -ne 's/[ \t]+$//; print' > ../linux/Documentation/video4linux/CARDLIST.cx88 -scripts/em28xx.pl ../linux/drivers/media/video/em28xx/em28xx.h ../linux/drivers/media/video/em28xx/em28xx-cards.c \ +scripts/em28xx.pl ../linux/drivers/media/video/em28xx/em28xx-cards.c \ | perl -ne 's/[ \t]+$//; print' > ../linux/Documentation/video4linux/CARDLIST.em28xx scripts/tuner.pl ../linux/include/media/tuner.h ../linux/drivers/media/video/tuner-types.c \ diff --git a/v4l/scripts/hghead.pl b/v4l/scripts/hghead.pl index 7b3f3106d..9a6389311 100755 --- a/v4l/scripts/hghead.pl +++ b/v4l/scripts/hghead.pl @@ -45,15 +45,23 @@ while ($line = <IN>) { last; } + if ($line =~ m/^# Date\s*(.*)/) { + print "#Date: $1\n"; + } + if ($line =~ m/^Date:\s*(.*)/) { my $time = str2time($1); if ($time) { + print "#Date: $time 0\n"; + } else { print "#Date: $1\n"; } next; } + $line =~ s/^#\sUser/From:/; + my $tag=$line; my $arg=$line; $tag =~ s/\s*([^\s]+:)(.*)\n/\1/; @@ -139,6 +147,9 @@ while ($line = <IN>) { next; } if ($sub_ok == 0) { + if ($line =~ m/^\s*\n/) { + next; + } $sub_ok=1; substr( $subject, 0, 1 ) = uc (substr ($subject, 0, 1)); if ($subject =~ m|V4L\/DVB\s*(.+)|) { @@ -180,10 +191,11 @@ if (!$signed =~ m/$from/) { die; } +$body="$from\n$body"; $body=~s/[\n\s]+$//; $body=~s/^[\n\s]+//; # First from is used by hg to recognize commiter name print "#Committer: $maintainer_name <$maintainer_email>\n"; -print "$subject\n$from\n$body\n\n$signed"; +print "$subject\n$body\n\n$signed"; diff --git a/v4l/scripts/usbvision.pl b/v4l/scripts/usbvision.pl index 3976e8bd1..b31df4f78 100755 --- a/v4l/scripts/usbvision.pl +++ b/v4l/scripts/usbvision.pl @@ -20,13 +20,15 @@ while (<>) { next unless defined($id); - if (/USB_DEVICE.*0x([0-9a-fA-F]*).*0x([0-9a-fA-F]*).*driver_info\s*=\s*([\w\d_]+)/) -{ + if (/USB_DEVICE.*0x([0-9a-fA-F]*).*0x([0-9a-fA-F]*).*/) + { $subvendor=$1; $subdevice=$2; - push @{$data{$3}->{subid}}, "$subvendor:$subdevice"; } - + if(/driver_info\s*=\s*([\w\d_]+)/) + { + push @{$data{$1}->{subid}}, "$subvendor:$subdevice"; + } if (!defined($data{$id}) || !defined($data{$id}->{name})) { $data{$id}->{name} = $1 if (/\.ModelString\s*=\s*\"([^\"]+)\"/); } |