From 7fcf69dab28d0e73c9c2bb5744b884001faddb09 Mon Sep 17 00:00:00 2001 From: Oliver Endriss Date: Sat, 15 Apr 2006 16:26:44 +0200 Subject: make_noconfig.pl fixed for CONFIG_DVB_AV7110_OSD and CONFIG_DVB_AV7110_FIRMWARE From: Oliver Endriss Without this fix, CONFIG_DVB_AV7110_OSD=y and CONFIG_DVB_AV7110_FIRMWARE=y were ignored in v4l/Makefile because make_noconfig.pl set them to "CONFIG_DVB_AV7110_... = m". Signed-off-by: Oliver Endriss --- v4l/scripts/make_noconfig.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'v4l') diff --git a/v4l/scripts/make_noconfig.pl b/v4l/scripts/make_noconfig.pl index a47ca4acf..94f80a954 100755 --- a/v4l/scripts/make_noconfig.pl +++ b/v4l/scripts/make_noconfig.pl @@ -55,7 +55,9 @@ close IN; open OUT,">.myconfig"; while ( my ($key, $value) = each(%config) ) { - if ($value eq "y") { + if ($key ne CONFIG_DVB_AV7110_OSD && + $key ne CONFIG_DVB_AV7110_FIRMWARE && + $value eq "y") { $value="m"; } printf OUT "%-44s := %s\n",$key,$value; -- cgit v1.2.3 From c9eef42f5449ab1894a458988661f433624ccb81 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sat, 22 Apr 2006 09:42:38 -0300 Subject: Adds capability to build conf/mconf/qconf/lxdialog at kernel tree From: Mauro Carvalho Chehab This patch adds v4l makefile capabilities to build kernel config required files to allow make menuconfig/xconfig/gconfig to work. After this patch, menu support is more smooth. Of course, root privileges are required to build those stuff. Signed-off-by: Mauro Carvalho Chehab --- v4l/Makefile | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'v4l') diff --git a/v4l/Makefile b/v4l/Makefile index e932eeb65..c74019f45 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -217,17 +217,27 @@ reload:: ################################################# # Configuration rules +# SHELL used by kbuild +CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ + else if [ -x /bin/bash ]; then echo /bin/bash; \ + else echo sh; fi ; fi) + +build := srctree=$(KDIR) HOSTCXX=$(CXX) HOSTCC=$(CC) CONFIG_SHELL=$(CONFIG_SHELL) -f $(KDIR)/scripts/Makefile.build obj + xconfig:: links .version + $(MAKE) -C $(KDIR) $(build)=scripts/kconfig qconf-target=1 scripts/kconfig/qconf ./scripts/make_kconfig.pl $(KDIR)/scripts/kconfig/qconf Kconfig ./scripts/make_noconfig.pl gconfig:: links .version + $(MAKE) -C $(KDIR) $(build)=scripts/kconfig scripts/kconfig/gconf ./scripts/make_kconfig.pl $(KDIR)/scripts/kconfig/gconf Kconfig ./scripts/make_noconfig.pl config:: links .version + $(MAKE) -C $(KDIR) $(build)=scripts/kconfig scripts/kconfig/conf ./scripts/make_kconfig.pl $(KDIR)/scripts/kconfig/conf Kconfig ./scripts/make_noconfig.pl @@ -236,17 +246,24 @@ menuconfig:: links .version ./scripts/make_kconfig.pl -rm scripts/lxdialog scripts/kconfig -if [ -d $(KDIR)/scripts/lxdialog ]; then \ + $(MAKE) -C $(KDIR) $(build)=scripts/lxdialog; \ ln -s $(KDIR)/scripts/lxdialog scripts/lxdialog; \ fi -if [ -d $(KDIR)/scripts/kconfig ]; then \ + if [ -d $(KDIR)/scripts/kconfig/lxdialog ]; then \ + $(MAKE) -C $(KDIR) $(build)=scripts/kconfig/lxdialog; \ + else \ + $(MAKE) -C $(KDIR) $(build)=scripts/kconfig scripts/kconfig/mconf; \ + fi; \ ln -s $(KDIR)/scripts/kconfig scripts/kconfig; \ fi $(KDIR)/scripts/kconfig/mconf Kconfig ./scripts/make_noconfig.pl -allmodconfig:: links .version +allyesconfig allmodconfig:: links .version + $(MAKE) -C $(KDIR) $(build)=scripts/kconfig scripts/kconfig/conf ./scripts/make_kconfig.pl $(KDIR)/scripts/kconfig/conf -m Kconfig cat .config|grep -v CONFIG_DVB_AV7110_FIRMWARE >.config.new -- cgit v1.2.3 From 6f290f63b3a7cd010a4bedcd36932b18617b34bb Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 24 Apr 2006 10:29:46 -0300 Subject: [PATCH] update pwc driver From: Luc Saillard Add v4l2 compatibility Include the decompressor (legal problem has been resolv by Alan Cox) Faster decoder and easier to maintain, optimize, ... Can export to userland compressed stream Support more cameras, lot of bugs are fixed. Signed-off-by: Luc Saillard Signed-off-by: Mauro Carvalho Chehab --- v4l/versions.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'v4l') diff --git a/v4l/versions.txt b/v4l/versions.txt index 255a31b17..07b983037 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -17,6 +17,7 @@ USB_IBMCAM USB_KONICAWC USB_ET61X251 USB_PWC +USB_PWC_DEBUG USB_SN9C102 USB_ZC0301 -- cgit v1.2.3 From 00ae040d86fe4250f09667bacd62bad2bd970090 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 24 Apr 2006 11:09:17 -0300 Subject: Fix compilation for sn9c102 on older kernels From: reinhard schwab Signed-off-by: Reinhard Schwab Signed-off-by: Mauro Carvalho Chehab --- v4l/versions.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'v4l') diff --git a/v4l/versions.txt b/v4l/versions.txt index 07b983037..1d4209680 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -18,7 +18,6 @@ USB_KONICAWC USB_ET61X251 USB_PWC USB_PWC_DEBUG -USB_SN9C102 USB_ZC0301 [2.6.14] @@ -76,6 +75,9 @@ RADIO_TYPHOON_MUTEFREQ RADIO_ZOLTRIX RADIO_ZOLTRIX_PORT +[2.6.13] +USB_SN9C102 + [2.6.12] VIDEO_VIVI VIDEO_DEV -- cgit v1.2.3