make ivtv: virtual tree merge

From: Michael Krufky <mkrufky@linuxtv.org>

- '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 <mkrufky@linuxtv.org>

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)