summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
Diffstat (limited to 'v4l')
-rw-r--r--v4l/Make.config7
-rw-r--r--v4l/Makefile44
-rwxr-xr-xv4l/scripts/merge-pvrusb2.sh51
3 files changed, 44 insertions, 58 deletions
diff --git a/v4l/Make.config b/v4l/Make.config
index f8978c53b..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,7 +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
ifneq ($(KERNELRELEASE),)
CONFIG_DVB_CORE := $(shell test $(SUBLEVEL) -ge 10 -a $(PATCHLEVEL) -ge 6 && echo m)
@@ -106,3 +109,5 @@ ifeq ($(CONFIG_DVB_CORE),m)
CONFIG_VIDEO_SAA7146_VV := 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 e637d2617..1cbe00cbb 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))
@@ -336,15 +344,33 @@ default:: links .version
$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules
pvrusb2::
- @scripts/merge-pvrusb2.sh
+ @echo creating pvrusb2 symbolic links...
+ @find ../v4l_experimental/pvrusb2 -name '*.[ch]' -type f -exec ln -sf '{}' . \;
+ @echo 'm' > .pvrusb2-merge
-pvrusb2-unmerge::
-# patch -R -p1 < scripts/merge-pvrusb2.sh
+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 '*.[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
+ @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 '{}' . \;
- @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 '{}' . \;
@@ -376,6 +402,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 +473,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 +482,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 +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
+ -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 e12d79a3f..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
-
- links::
- @echo creating symbolic links...
-@@ -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
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-09 18:58:16 +0000