From 5544436dfdaf40b96906241f31f3fb97880440a2 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Thu, 16 Feb 2006 17:39:19 -0500 Subject: make ivtv: virtual tree merge From: Michael Krufky - 'make ivtv' will retreive the latest sources from ivtv svn trunk - 'make' will build the entire v4l-dvb tree including ivtv - 'make' (without previously running 'make ivtv') will build using previous behavior. Signed-off-by: Michael Krufky --- v4l/Make.config | 2 ++ v4l/Makefile | 30 +++++++++++++++++++++++++++++- v4l/scripts/merge-pvrusb2.sh | 4 ++-- 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/v4l/Make.config b/v4l/Make.config index f8978c53b..83c695ed0 100644 --- a/v4l/Make.config +++ b/v4l/Make.config @@ -59,6 +59,7 @@ CONFIG_DVB_TTUSB_DEC := n CONFIG_VIDEO_SAA7146 := n CONFIG_VIDEO_SAA7146_VV := n CONFIG_DVB_FIRESAT := n +CONFIG_VIDEO_IVTV := n ifneq ($(KERNELRELEASE),) CONFIG_DVB_CORE := $(shell test $(SUBLEVEL) -ge 10 -a $(PATCHLEVEL) -ge 6 && echo m) @@ -106,3 +107,4 @@ ifeq ($(CONFIG_DVB_CORE),m) CONFIG_VIDEO_SAA7146_VV := m endif +CONFIG_VIDEO_IVTV := $(if $(wildcard $(src)/ivtv-svnversion.h),m) diff --git a/v4l/Makefile b/v4l/Makefile index e637d2617..f3e7d3526 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -74,6 +74,12 @@ pvrusb2-objs := pvrusb2-i2c-core.o pvrusb2-i2c-cmd-v4l2.o \ pvrusb2-sysfs.o pvrusb2-context.o pvrusb2-io.o \ pvrusb2-ioread.o pvrusb2-debugifc.o dvb-firesat-objs := firesat.o avc_api.o cmp.o firesat-rc.o +ivtv-objs := ivtv-driver.o ivtv-fileops.o ivtv-i2c.o ivtv-streams.o \ + ivtv-firmware.o ivtv-reset.o ivtv-gpio.o ivtv-queue.o \ + ivtv-irq.o ivtv-mailbox.o ivtv-vbi.o ivtv-kthreads.o \ + ivtv-audio.o ivtv-ioctl.o ivtv-controls.o ivtv-video.o \ + ivtv-cards.o ivtv-yuv.o +ivtv-fb-objs := ivtv-osd.o ivtv-queue.o obj-m := video-buf.o v4l1-compat.o v4l2-common.o obj-m += compat_ioctl32.o @@ -145,6 +151,7 @@ obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2.o obj-$(CONFIG_DVB_FIRESAT) += dvb-firesat.o +obj-$(CONFIG_VIDEO_IVTV) += ivtv.o ivtv-fb.o # 2.6-only stuff ifeq ($(VERSION).$(PATCHLEVEL),2.6) @@ -323,6 +330,7 @@ inst_ttusb-budget := dvb-ttusb-budget.ko inst_ttusb-dec := ttusb_dec.ko ttusbdecfe.ko inst_pvrusb2 := pvrusb2.ko inst_firesat := dvb-firesat.ko +inst_ivtv := ivtv.ko ivtv-fb.ko v4l_modules := $(shell /sbin/lsmod|cut -d' ' -f1 ) $(patsubst %.ko,%,$(inst-m)) @@ -341,6 +349,20 @@ pvrusb2:: pvrusb2-unmerge:: # patch -R -p1 < scripts/merge-pvrusb2.sh +ivtv-checkout:: + @if [ ! -d ivtv ]; then \ + svn co http://ivtvdriver.org/svn/ivtv/trunk ivtv; \ + fi + +ivtv-links:: ivtv-checkout + @echo creating ivtv symbolic links... + @find ivtv/driver -name '*.[c,h]' -type f -exec ln -sf '{}' . \; + @find ivtv/i2c-drivers -name '*.[c,h]' -type f -exec ln -sf '{}' . \; + +ivtv:: ivtv-links + @echo '#define IVTV_DRIVER_VERSION_COMMENT "(v4l-dvb + ivtv experimental build)"' > ivtv-svnversion.h + @echo ivtv trunk merged. Run make to build the entire tree. + links:: @echo creating symbolic links... @find ../linux/drivers/media -name '*.[c,h]' -type f -exec ln -sf '{}' . \; @@ -376,6 +398,9 @@ v4l-install:: v4l-rminstall -install -d $(KDIR26)/video/pvrusb2 -install -m 644 -c $(inst_pvrusb2) $(KDIR26)/video/pvrusb2 + -install -d $(KDIR26)/video/ivtv + -install -m 644 -c $(inst_ivtv) $(KDIR26)/video/ivtv + # -install -d $(KDIRUSB) # -install -m 644 -c $(inst_usb) $(KDIRUSB)/ @@ -444,6 +469,8 @@ v4l-rminstall:: $(addprefix $(KDIR26)/video/, $(inst_video)) \ $(addprefix $(KDIR26)/video/cx88/, $(inst_cx88)) \ $(addprefix $(KDIR26)/video/saa7134/, $(inst_saa7134)) \ + $(addprefix $(KDIR26)/video/pvrusb2/, $(inst_pvrusb2)) \ + $(addprefix $(KDIR26)/video/ivtv/, $(inst_ivtv)) \ $(addprefix $(KDIR26)/video/em28xx/, $(inst_em28xx)) \ $(addprefix $(KDIRUSB)/, $(inst_em28xx)) \ $(addprefix $(KDIR26)/common/, $(addsuffix .gz,$(inst_common))) \ @@ -451,6 +478,7 @@ v4l-rminstall:: $(addprefix $(KDIR26)/video/cx88/, $(addsuffix .gz,$(inst_cx88))) \ $(addprefix $(KDIR26)/video/saa7134/, $(addsuffix .gz,$(inst_saa7134))) 2>/dev/null \ $(addprefix $(KDIR26)/video/pvrusb2/, $(addsuffix .gz,$(inst_pvrusb2))) 2>/dev/null \ + $(addprefix $(KDIR26)/video/ivtv/, $(addsuffix .gz,$(inst_ivtv))) 2>/dev/null \ $(addprefix $(KDIR26)/video/em28xx/, $(addsuffix .gz,$(inst_em28xx))) 2>/dev/null \ $(addprefix $(KDIRUSB)/, $(addsuffix .gz,$(inst_em28xx))) 2>/dev/null @echo @@ -489,7 +517,7 @@ rmmodules:: clean:: @find . -name '*.c' -type l -exec rm '{}' \; @find . -name '*.h' -type l -exec rm '{}' \; - -rm -f *~ *.o *.ko .*.o.cmd .*.ko.cmd *.mod.c av7110_firm.h fdump + -rm -f *~ *.o *.ko .*.o.cmd .*.ko.cmd *.mod.c av7110_firm.h fdump ivtv-svnversion.h distclean:: clean -rm -f .version .*.o.flags .*.o.d diff --git a/v4l/scripts/merge-pvrusb2.sh b/v4l/scripts/merge-pvrusb2.sh index e12d79a3f..a43ba32a4 100755 --- a/v4l/scripts/merge-pvrusb2.sh +++ b/v4l/scripts/merge-pvrusb2.sh @@ -38,8 +38,8 @@ patch -p1 <<'DIFF' -# patch -R -p1 < scripts/merge-pvrusb2.sh + patch -R -p1 < scripts/merge-pvrusb2.sh - links:: - @echo creating symbolic links... + ivtv-checkout:: + @if [ ! -d ivtv ]; then \ @@ -464,7 +467,7 @@ dvb-rminstall:: rmmodules:: rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d) -- cgit v1.2.3 From a0eb71211402c55b74a503d2924a6f07db7d5319 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Thu, 16 Feb 2006 21:10:25 -0500 Subject: 'make ivtv' requires subversion From: Michael Krufky - inform the user that subversion is required to retreive the ivtv sources. - added 'make ivtv-update' Signed-off-by: Michael Krufky --- v4l/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/v4l/Makefile b/v4l/Makefile index f3e7d3526..d0c0515ad 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -351,9 +351,14 @@ pvrusb2-unmerge:: ivtv-checkout:: @if [ ! -d ivtv ]; then \ + echo retrieving the latest ivtv sources from ivtvdriver.org; \ + echo this step requires subversion to be installed; \ svn co http://ivtvdriver.org/svn/ivtv/trunk ivtv; \ fi +ivtv-update ivtv-up:: ivtv-checkout + @svn up ivtv + ivtv-links:: ivtv-checkout @echo creating ivtv symbolic links... @find ivtv/driver -name '*.[c,h]' -type f -exec ln -sf '{}' . \; -- cgit v1.2.3 From 661d60c7bfbc5c9f4fc76d85c33ef4ae2aaadddf Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Thu, 16 Feb 2006 21:58:58 -0500 Subject: ivtv: report v4l-dvb + ivtv virtual merge in dmesg version string From: Michael Krufky report "v4l-dvb + ivtv virtual merge" in ivtv's dmesg version string Signed-off-by: Michael Krufky --- v4l/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v4l/Makefile b/v4l/Makefile index d0c0515ad..d89639307 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -365,7 +365,7 @@ ivtv-links:: ivtv-checkout @find ivtv/i2c-drivers -name '*.[c,h]' -type f -exec ln -sf '{}' . \; ivtv:: ivtv-links - @echo '#define IVTV_DRIVER_VERSION_COMMENT "(v4l-dvb + ivtv experimental build)"' > ivtv-svnversion.h + @echo '#define IVTV_DRIVER_VERSION_COMMENT "(v4l-dvb + ivtv virtual merge)"' > ivtv-svnversion.h @echo ivtv trunk merged. Run make to build the entire tree. links:: -- cgit v1.2.3 From c5afcf940212386e9ddb07960b1922b1b110571f Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Thu, 16 Feb 2006 23:11:16 -0500 Subject: update 'make pvrusb2' merged build command From: Michael Krufky - use file .pvrusb2-merged to determine tree state rather than the previous method, which used a self-altering Makefile through an embedded patch in merge-pvrusb2.sh (removed) Signed-off-by: Michael Krufky --- v4l/Make.config | 7 ++++-- v4l/Makefile | 9 ++++---- v4l/scripts/merge-pvrusb2.sh | 51 -------------------------------------------- 3 files changed, 9 insertions(+), 58 deletions(-) delete mode 100755 v4l/scripts/merge-pvrusb2.sh diff --git a/v4l/Make.config b/v4l/Make.config index 83c695ed0..216674ce2 100644 --- a/v4l/Make.config +++ b/v4l/Make.config @@ -22,6 +22,10 @@ CONFIG_VIDEO_ADV_DEBUG := y CONFIG_VIDEO_PVRUSB2 := n +CONFIG_VIDEO_IVTV := n + +CONFIG_DVB_FIRESAT := n + # doesn't build on older kernels CONFIG_DVB_CORE := n @@ -58,8 +62,6 @@ CONFIG_DVB_TTUSB_BUDGET := n CONFIG_DVB_TTUSB_DEC := n CONFIG_VIDEO_SAA7146 := n CONFIG_VIDEO_SAA7146_VV := n -CONFIG_DVB_FIRESAT := n -CONFIG_VIDEO_IVTV := n ifneq ($(KERNELRELEASE),) CONFIG_DVB_CORE := $(shell test $(SUBLEVEL) -ge 10 -a $(PATCHLEVEL) -ge 6 && echo m) @@ -108,3 +110,4 @@ ifeq ($(CONFIG_DVB_CORE),m) endif CONFIG_VIDEO_IVTV := $(if $(wildcard $(src)/ivtv-svnversion.h),m) +CONFIG_VIDEO_PVRUSB2 := $(if $(wildcard $(src)/.pvrusb2-merge),m) diff --git a/v4l/Makefile b/v4l/Makefile index d89639307..c3bfdfaf5 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -344,10 +344,9 @@ default:: links .version $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules pvrusb2:: - @scripts/merge-pvrusb2.sh - -pvrusb2-unmerge:: -# patch -R -p1 < scripts/merge-pvrusb2.sh + @echo creating pvrusb2 symbolic links... + @find ../v4l_experimental/pvrusb2 -name '*.[c,h]' -type f -exec ln -sf '{}' . \; + @echo 'm' > .pvrusb2-merge ivtv-checkout:: @if [ ! -d ivtv ]; then \ @@ -522,7 +521,7 @@ rmmodules:: clean:: @find . -name '*.c' -type l -exec rm '{}' \; @find . -name '*.h' -type l -exec rm '{}' \; - -rm -f *~ *.o *.ko .*.o.cmd .*.ko.cmd *.mod.c av7110_firm.h fdump ivtv-svnversion.h + -rm -f *~ *.o *.ko .*.o.cmd .*.ko.cmd *.mod.c av7110_firm.h fdump ivtv-svnversion.h .pvrusb2-merge distclean:: clean -rm -f .version .*.o.flags .*.o.d diff --git a/v4l/scripts/merge-pvrusb2.sh b/v4l/scripts/merge-pvrusb2.sh deleted file mode 100755 index a43ba32a4..000000000 --- a/v4l/scripts/merge-pvrusb2.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh - -PWD=`pwd` -CWD=$PWD - -cd ../v4l_experimental/pvrusb2 -PVRUSB2=$PWD - -echo creating pvrusb2 symbolic links... - -for x in `find . -type f -name '*.[c,h]'` ; do - ln -f -s $PVRUSB2/$x $CWD/$x -done - -cd $CWD -patch -p1 <<'DIFF' ---- v4l.orig/Make.config -+++ v4l/Make.config -@@ -17,7 +17,7 @@ - - CONFIG_VIDEO_ADV_DEBUG := y - --CONFIG_VIDEO_PVRUSB2 := n -+CONFIG_VIDEO_PVRUSB2 := m - - # doesn't build on older kernels - ---- v4l.orig/Makefile -+++ v4l/Makefile -@@ -319,10 +319,10 @@ - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules - - pvrusb2:: -- @scripts/merge-pvrusb2.sh -+# @scripts/merge-pvrusb2.sh - - pvrusb2-unmerge:: --# patch -R -p1 < scripts/merge-pvrusb2.sh -+ patch -R -p1 < scripts/merge-pvrusb2.sh - - ivtv-checkout:: - @if [ ! -d ivtv ]; then \ -@@ -464,7 +467,7 @@ dvb-rminstall:: - rmmodules:: - rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d) - --clean:: -+clean:: pvrusb2-unmerge - @find . -name '*.c' -type l -exec rm '{}' \; - @find . -name '*.h' -type l -exec rm '{}' \; - -rm -f *~ *.o *.ko .*.o.cmd .*.ko.cmd *.mod.c av7110_firm.h fdump -- cgit v1.2.3 From 5ea064de62f132e1a75140226ec2b1e5cba1e45e Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Fri, 17 Feb 2006 00:55:52 -0500 Subject: sed -i 's/c,h/ch/1' Makefile From: Michael Krufky The symlink commands in the Makefile used to look like: @find ../linux/drivers/media -name '*.[c,h]' -type f -exec ln -sf '{}' . \; the ',' should not be there. The correct command is: @find ../linux/drivers/media -name '*.[ch]' -type f -exec ln -sf '{}' . \; Signed-off-by: Michael Krufky --- v4l/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/v4l/Makefile b/v4l/Makefile index c3bfdfaf5..1cbe00cbb 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -345,7 +345,7 @@ default:: links .version pvrusb2:: @echo creating pvrusb2 symbolic links... - @find ../v4l_experimental/pvrusb2 -name '*.[c,h]' -type f -exec ln -sf '{}' . \; + @find ../v4l_experimental/pvrusb2 -name '*.[ch]' -type f -exec ln -sf '{}' . \; @echo 'm' > .pvrusb2-merge ivtv-checkout:: @@ -360,8 +360,8 @@ ivtv-update ivtv-up:: ivtv-checkout ivtv-links:: ivtv-checkout @echo creating ivtv symbolic links... - @find ivtv/driver -name '*.[c,h]' -type f -exec ln -sf '{}' . \; - @find ivtv/i2c-drivers -name '*.[c,h]' -type f -exec ln -sf '{}' . \; + @find ivtv/driver -name '*.[ch]' -type f -exec ln -sf '{}' . \; + @find ivtv/i2c-drivers -name '*.[ch]' -type f -exec ln -sf '{}' . \; ivtv:: ivtv-links @echo '#define IVTV_DRIVER_VERSION_COMMENT "(v4l-dvb + ivtv virtual merge)"' > ivtv-svnversion.h @@ -369,8 +369,8 @@ ivtv:: ivtv-links links:: @echo creating symbolic links... - @find ../linux/drivers/media -name '*.[c,h]' -type f -exec ln -sf '{}' . \; - @find ../linux/sound -name '*.[c,h]' -type f -exec ln -sf '{}' . \; + @find ../linux/drivers/media -name '*.[ch]' -type f -exec ln -sf '{}' . \; + @find ../linux/sound -name '*.[ch]' -type f -exec ln -sf '{}' . \; # @find ../linux/include -name '*.[h]' -type f -exec ln -sf '{}' . \; -- cgit v1.2.3