diff options
| -rw-r--r-- | v4l/ChangeLog | 19 | ||||
| -rw-r--r-- | v4l/Make.config | 2 | ||||
| -rw-r--r-- | v4l/Makefile | 17 | ||||
| -rw-r--r-- | v4l/scripts/merge-pvrusb2.sh | 37 |
4 files changed, 74 insertions, 1 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 4860253d2..569bc66c7 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,22 @@ +2006-01-15 00:43 mkrufky + + * v4l/Make.config: + * v4l/Makefile: + * v4l/scripts/merge-pvrusb2.sh: + - Add option to build pvrusb2 driver + along with the rest of v4l-dvb cvs. + - make pvrusb2 will symlink the code from the v4l_experimental dir. + - to build: + + make pvrusb2 + make + make install + + - Always do 'make clean' before cvs commit, to un-patch the Makefile, + returning the build environment to its original state. + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2006-01-14 23:50 hhackmann * linux/drivers/media/video/saa7134/saa7134-tvaudio.c: - enabled audio PLL. This is mandatory for NICAM sound diff --git a/v4l/Make.config b/v4l/Make.config index b80a5b25f..476e9019f 100644 --- a/v4l/Make.config +++ b/v4l/Make.config @@ -17,6 +17,8 @@ CONFIG_VIDEO_ALSA := y CONFIG_VIDEO_ADV_DEBUG := y +CONFIG_VIDEO_PVRUSB2 := n + # doesn't build on older kernels CONFIG_DVB_CORE := n diff --git a/v4l/Makefile b/v4l/Makefile index d4c00c31c..329fbc0a3 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -62,6 +62,13 @@ dvb-ttpci-objs := av7110_hw.o av7110_v4l.o av7110_av.o \ saa7146-objs := saa7146_i2c.o saa7146_core.o saa7146_vv-objs := saa7146_vv_ksyms.o saa7146_fops.o \ saa7146_video.o saa7146_hlp.o saa7146_vbi.o +pvrusb2-objs := pvrusb2-i2c-core.o pvrusb2-i2c-cmd-v4l2.o \ + pvrusb2-audio.o pvrusb2-i2c-chips-v4l2.o \ + pvrusb2-encoder.o pvrusb2-video-v4l.o \ + pvrusb2-eeprom.o pvrusb2-tuner.o pvrusb2-demod.o \ + pvrusb2-main.o pvrusb2-hdw.o pvrusb2-v4l2.o \ + pvrusb2-sysfs.o pvrusb2-context.o pvrusb2-io.o \ + pvrusb2-ioread.o pvrusb2-debugifc.o obj-m := video-buf.o v4l1-compat.o v4l2-common.o obj-m += compat_ioctl32.o @@ -131,6 +138,7 @@ obj-$(CONFIG_DVB_BUDGET_PATCH) += budget-core.o budget-patch.o ttpci-eeprom.o obj-$(CONFIG_DVB_AV7110) += dvb-ttpci.o ttpci-eeprom.o obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o +obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2.o # 2.6-only stuff ifeq ($(VERSION).$(PATCHLEVEL),2.6) @@ -298,7 +306,7 @@ inst_ttpci := budget-core.ko budget.ko ttpci-eeprom.ko budget-av.ko inst_ttpci += budget-ci.ko budget-patch.ko dvb-ttpci.ko inst_ttusb-budget := dvb-ttusb-budget.ko inst_ttusb-dec := ttusb_dec.ko ttusbdecfe.ko - +inst_pvrusb2 := pvrusb2.ko v4l_modules := $(shell /sbin/lsmod|cut -d' ' -f1 ) $(patsubst %.ko,%,$(inst-m)) @@ -309,6 +317,9 @@ export LC_ALL default:: links .version $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules +pvrusb2:: + @scripts/merge-pvrusb2.sh + links:: @echo creating symbolic links... @find ../linux/drivers/media -name '*.[c,h]' -type f -exec ln -sf '{}' . \; @@ -341,6 +352,9 @@ v4l-install:: v4l-rminstall -install -d $(KDIR26)/video/em28xx -install -m 644 -c $(inst_em28xx) $(KDIR26)/video/em28xx + -install -d $(KDIR26)/video/pvrusb2 + -install -m 644 -c $(inst_pvrusb2) $(KDIR26)/video/pvrusb2 + # -install -d $(KDIRUSB) # -install -m 644 -c $(inst_usb) $(KDIRUSB)/ @@ -412,6 +426,7 @@ v4l-rminstall:: $(addprefix $(KDIR26)/video/, $(addsuffix .gz,$(inst_video))) \ $(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/em28xx/, $(addsuffix .gz,$(inst_em28xx))) 2>/dev/null \ $(addprefix $(KDIRUSB)/, $(addsuffix .gz,$(inst_em28xx))) 2>/dev/null @echo diff --git a/v4l/scripts/merge-pvrusb2.sh b/v4l/scripts/merge-pvrusb2.sh new file mode 100644 index 000000000..2852feefd --- /dev/null +++ b/v4l/scripts/merge-pvrusb2.sh @@ -0,0 +1,37 @@ +#!/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 +@@ -464,6 +464,7 @@ + @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 ++ patch -R -p1 < scripts/merge-pvrusb2.sh + + distclean:: clean + -rm -f .version .*.o.flags .*.o.d |