merge: http://linuxtv.org/hg/~mkrufky/cx88

From: Mauro Carvalho Chehab <mchehab@infradead.org>

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

4 files changed, 97 insertions, 44 deletions

diff --git a/v4l/Makefile b/v4l/Makefile
index 881329d7d..0e90e13d8 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -158,22 +158,13 @@ ifneq ($(VER),)
 	@echo $(VER)|perl -ne 'if (/^([0-9]*)\.([0-9])*\.([0-9]*)(.*)$$/) { printf ("VERSION=%s\nPATCHLEVEL:=%s\nSUBLEVEL:=%s\nKERNELRELEASE:=%s.%s.%s%s\n",$$1,$$2,$$3,$$1,$$2,$$3,$$4); };' > $(obj)/.version
 else
 ifneq ($(DIR),)
-	@perl -e 'open IN,"<$(DIR)/Makefile"; \
-		while (<IN>) { \
-			if (/^VERSION\s*=\s*([0-9]+)/){ $$version=$$1; next; }\
-			if (/^PATCHLEVEL\s*=\s*([0-9]+)/){ $$level=$$1; next; }\
-			if (/^SUBLEVEL\s*=\s*([0-9]+)/){ $$sublevel=$$1; next; }\
-			if (/^EXTRAVERSION\s*=\s*([^\s]+)\n/){ $$extra=$$1; next; }\
-		}; \
-		printf ("VERSION=%s\nPATCHLEVEL:=%s\nSUBLEVEL:=%s\nKERNELRELEASE:=%s.%s.%s%s\n", \
-		$$version,$$level,$$sublevel,$$version,$$level,$$sublevel,$$extra); \
-		printf ("SRCDIR:=$(DIR)\n");' > $(obj)/.version
+	@echo "Seeking for a version at $(DIR)/Makefile."
+	@perl -e 'open IN,"$(DIR)/Makefile"; while (<IN>) { if (/^VERSION\s*=\s*([0-9]+)/){ $$version=$$1; } elsif (/^PATCHLEVEL\s*=\s*([0-9]+)/){ $$level=$$1; } elsif (/^SUBLEVEL\s*=\s*([0-9]+)/){ $$sublevel=$$1; } elsif (/^EXTRAVERSION\s*=\s*([^\s]+)\n/){ $$extra=$$1; } }; printf ("VERSION=%s\nPATCHLEVEL:=%s\nSUBLEVEL:=%s\nKERNELRELEASE:=%s.%s.%s%s\n", $$version,$$level,$$sublevel,$$version,$$level,$$sublevel,$$extra); printf ("SRCDIR:=$(DIR)\n");' > $(obj)/.version
 	@cat .version|grep KERNELRELEASE:|sed s,'KERNELRELEASE:=','Forcing compiling to version ',
 
 	@if [ ! -f $(DIR)/scripts/kallsyms ]; then \
 		echo "*** Warning: You should configure and build kernel before compiling V4L"; \
 	fi
-
 else
 	@echo "No version specified. Using `uname -r`."
 	@uname -r|perl -ne 'if (/^([0-9]*)\.([0-9])*\.([0-9]*)(.*)$$/) { printf ("VERSION=%s\nPATCHLEVEL:=%s\nSUBLEVEL:=%s\nKERNELRELEASE:=%s.%s.%s%s\n",$$1,$$2,$$3,$$1,$$2,$$3,$$4); };' > $(obj)/.version
diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl
index 33a53d772..c58f5b028 100755
--- a/v4l/scripts/make_kconfig.pl
+++ b/v4l/scripts/make_kconfig.pl
@@ -400,6 +400,50 @@ close OUT;
 disable_config('DVB_AV7110_FIRMWARE');
 disable_config('DVB_CINERGYT2_TUNING');
 
+# Hack for check sound/oss/aci.h header
+
+my $mirodep="$kernel/sound/oss/aci.h";
+if (!open IN, $mirodep) {
+	my $key="RADIO_MIROPCM20";
+print <<"EOF2";
+$key: $mirodep is missing.
+
+***WARNING:*** You do not have the full kernel sources installed.
+This does not prevent you from building the v4l-dvb tree if you have the 
+kernel headers, but the full kernel source is required in order to use 
+make menuconfig / xconfig / qconfig.
+
+If you are experiencing problems building the v4l-dvb tree, please try 
+building against a vanilla kernel before reporting a bug.
+
+Vanilla kernels are available at http://kernel.org.
+On most distros, this will compile a newly downloaded kernel:
+
+cp /boot/config-`uname -r` <your kernel dir>/.config
+cd <your kernel dir>
+make all modules_install install
+
+Please see your distro's web site for instructions to build a new kernel.
+
+EOF2
+	$kernopts{$key}='n';
+}
+close IN;
+
+# Recursively check for broken dependencies
+my $i;
+do {
+	$i=0;
+	while ( my ($key,$value) = each(%kernopts) ) {
+		if ($value ne 'n') {
+			if (!deps_ok($key)) {
+				$kernopts{$key}='n';
+			}
+			$i=$i+1;
+		}
+	}
+} until (!$disable);
+
 # Produce a .config file if it's forced or one doesn't already exist
 if (($force_kconfig eq 1) || !open IN,".config") {
 	open OUT,">.config" or die;
@@ -407,14 +451,6 @@ if (($force_kconfig eq 1) || !open IN,".config") {
 		if (!$config{$key}) {
 			print OUT "# CONFIG_$key is not set\n";
 		} elsif ($kernopts{$key}) {
-			my $ok=deps_ok($key);
-
-			# If deps are not ok, mark default as n
-			if (!$ok) {
-#				print "$key disabled due to missing kernel required prereq\n";
-				$kernopts{$key}='n';
-			}
-
 			if ($kernopts{$key} eq 'n') {
 				print OUT "# CONFIG_$key is not set\n";
 			} else {
diff --git a/v4l/scripts/prep_commit_msg.pl b/v4l/scripts/prep_commit_msg.pl
index ac958667b..a4594c7f9 100755
--- a/v4l/scripts/prep_commit_msg.pl
+++ b/v4l/scripts/prep_commit_msg.pl
@@ -1,34 +1,59 @@
 #!/usr/bin/perl
 
-$f=shift; 
-open IN,"hg diff|diffstat -p1 |"; 
-my $n=2;
-my $from="";
-my $first="";
-my $changed="";
-$out="";
-while (<IN>) {
-	$changed="$changed#$_";
-}
+my $autopatch = shift;
 
+# Get Hg username from environment
 my $user = $ENV{HGUSER};
 
-if ( $user eq "" ) {
+# Didn't work? Try the .hgrc file
+if ($user eq "") {
+	open IN, "<$ENV{HOME}/.hgrc";
+	while (<IN>) {
+		if(/^\s*username\s*=\s*(\S.*)$/) {
+			$user = $1;
+			last;
+		}
+	}
+	close IN;
+}
+
+# Still no luck? Try some other environment variables
+if ($user eq "") {
 	my $name = $ENV{CHANGE_LOG_NAME};
 	my $email = $ENV{CHANGE_LOG_EMAIL_ADDRESS};
+	$user = "$name <$email>" if ($name ne "" || $email ne "");
+}
+
+# Last try to come up with something
+if ($user eq "") {
+	$user = "$ENV{USER} <>";
+}
 
-	$user="$name <$email>";
+print "# Added/removed/changed files:\n";
+system "hg diff | diffstat -p1 -c";
+if (-s $autopatch) {
+	print "#\n# Note, a problem with your patch was detected!  These changes were made\n";
+	print "# automatically: $autopatch\n";
+	system "diffstat -p0 -c $autopatch";
+	print "#\n# Please review these changes and see if they belong in your patch or not.\n";
 }
+print <<"EOF";
+#
+# For better log display, please keep a blank line after subject, after from,
+# and before signed-off-by.
+# First line should be the subject, without Subject:
+#
+
+
+# Now, patch author (just the main one), on a From: field
+# Please change below if the committer is not the patch author.
+#
+From: $user
+
+# Then a detailed description:
+
 
-$first= "# Please change below if you are not patch author\n#\nFrom: $user";
-$out= "# At the end Signed-off-by: fields by patch author and committer, at least\n#\nSigned-off-by: $user";
-$from= "From: $user";
-
-printf  "#Added/removed/changed files:\n%s#\n" .
-	"# For better log display, please keep a blank line after subject, after from\n" .
-	"# and before signed-off-by\n" .
-	"# First line should be the subject, without Subject:\n#\n\n\n" .
-	"# Now, patch author (just the main one), on a From: field\n" .
-	"# Please change below if the committer is not the patch author\n#\n%s\n\n" .
-	"# Then a detailed description:\n\n\n%s",
-	$changed,$from,$out;
+# At the end Signed-off-by: fields by patch author and committer, at least.
+#
+Signed-off-by: $user
+EOF
diff --git a/v4l/scripts/strip-trailing-whitespaces.sh b/v4l/scripts/strip-trailing-whitespaces.sh
index 5bd7784e4..a546a0b9f 100755
--- a/v4l/scripts/strip-trailing-whitespaces.sh
+++ b/v4l/scripts/strip-trailing-whitespaces.sh
@@ -23,5 +23,6 @@ for file in `eval $files`; do
 	s<^ {8}> <\t>;
 	s<^ {1,7}\t> <\t>;
 	while( s<\t {8}> <\t\t>g || s<\t {1,7}\t> <\t\t>g ) {};
-	print' < "${file}" | diff -u "${file}" -
+	print' < "${file}" | \
+		diff -u --label="$file" "$file" --label="$file" -
 done