summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
Diffstat (limited to 'v4l')
-rw-r--r--v4l/ChangeLog17
-rw-r--r--v4l/scripts/merge-trees.sh78
-rw-r--r--v4l/scripts/unmerge-trees.sh78
3 files changed, 173 insertions, 0 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index f43085148..2abfbd181 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,20 @@
+2005-07-22 03:51 mkrufky
+ * scripts/merge-trees.sh:
+ - New script to symlink DVB frontend code from dvb-kernel cvs tree
+ into patched video4linux cvs tree for testing and development
+ across both trees.
+
+ * scripts/unmerge-trees.sh:
+ - New script to be run after development, and before generating
+ patches or making cvs commits. This removes the symlinks to the
+ frontend code, and reverts the patch to the video4linux tree
+ created by merge-trees.sh .
+
+ * saa7134-i2c.c:
+ - Removed trailing whitespace.
+
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2005-07-22 00:50 mkrufky
* Makefile:
- Restore EXTRA_CFLAGS for DVB frontends previously removed in error.
diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh
new file mode 100644
index 000000000..56ba87c36
--- /dev/null
+++ b/v4l/scripts/merge-trees.sh
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/dvb-pll.c dvb-pll.c
+ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/dvb-pll.h dvb-pll.h
+ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/mt352.c mt352.c
+ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/mt352.h mt352.h
+ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/mt352_priv.h mt352_priv.h
+ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/cx22702.c cx22702.c
+ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/cx22702.h cx22702.h
+ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/lgdt3302.c lgdt3302.c
+ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/lgdt3302.h lgdt3302.h
+ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/lgdt3302_priv.h lgdt3302_priv.h
+ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/or51132.c or51132.c
+ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/or51132.h or51132.h
+ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/tda1004x.c tda1004x.c
+ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/tda1004x.h tda1004x.h
+patch -p1 <<'DIFF'
+--- video4linux.orig/Makefile 2005-07-21 21:13:31.000000000 +0000
++++ video4linux/Makefile 2005-07-21 21:21:08.000000000 +0000
+@@ -39,8 +39,8 @@ obj-$(CONFIG_VIDEO_IR) += ir-common.o
+ obj-$(CONFIG_VIDEO_TUNER) += tuner.o tda9887.o
+ obj-$(CONFIG_VIDEO_TVAUDIO) += msp3400.o tvaudio.o tvmixer.o
+
+-obj-$(CONFIG_VIDEO_CX88_DVB) += video-buf-dvb.o cx88-dvb.o
+-obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o
++obj-$(CONFIG_VIDEO_CX88_DVB) += video-buf-dvb.o cx88-dvb.o cx22702.o dvb-pll.o or51132.o lgdt3302.o mt352.o
++obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o mt352.o tda1004x.o
+
+ # 2.6-only stuff
+ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
+@@ -123,6 +123,7 @@ ifeq ($(inst-m),)
+ endif
+
+ inst_common := ir-common.ko
++inst_frontends := cx22702.ko dvb-pll.ko mt352.ko lgdt3302.ko or51132.ko tda1004x.ko
+ inst_video := btcx-risc.ko bttv.ko tda9887.ko tuner.ko tvaudio.ko tveeprom.ko
+ inst_video += tvmixer.ko v4l1-compat.ko v4l2-common.ko
+ inst_video += video-buf.ko video-buf-dvb.ko
+@@ -149,6 +150,9 @@ install:: rminstall
+ -install -d $(KDIR26)/common
+ -install -m 644 -c $(inst_common) $(KDIR26)/common
+
++ -install -d $(KDIR26)/dvb/frontends
++ -install -m 644 -c $(inst_frontends) $(KDIR26)/dvb/frontends
++
+ -install -d $(KDIR26)/video
+ -install -m 644 -c $(inst_video) $(KDIR26)/video
+
+diff -upr video4linux.orig/cx88-dvb.c video4linux/cx88-dvb.c
+--- video4linux.orig/cx88-dvb.c 2005-07-21 23:35:26.000000000 +0000
++++ video4linux/cx88-dvb.c 2005-07-21 23:35:52.000000000 +0000
+@@ -34,11 +34,7 @@
+ #define CONFIG_DVB_MT352 1
+ #define CONFIG_DVB_CX22702 1
+ #define CONFIG_DVB_OR51132 1
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
+-#define CONFIG_DVB_LGDT3302 0
+-#else
+ #define CONFIG_DVB_LGDT3302 1
+-#endif
+
+ #include "cx88.h"
+ #include "dvb-pll.h"
+diff -upr video4linux.orig/saa7134-dvb.c video4linux/saa7134-dvb.c
+--- video4linux.orig/saa7134-dvb.c 2005-07-21 23:35:26.000000000 +0000
++++ video4linux/saa7134-dvb.c 2005-07-21 23:36:19.000000000 +0000
+@@ -32,11 +32,7 @@
+ #include "compat.h"
+
+ #define CONFIG_DVB_MT352 1
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13)
+ #define CONFIG_DVB_TDA1004X 1
+-#else
+-#define CONFIG_DVB_TDA1004X 0
+-#endif
+ #include "saa7134-reg.h"
+ #include "saa7134.h"
+
diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh
new file mode 100644
index 000000000..a46b255bf
--- /dev/null
+++ b/v4l/scripts/unmerge-trees.sh
@@ -0,0 +1,78 @@
+rm dvb-pll.c
+rm dvb-pll.h
+rm mt352.c
+rm mt352.h
+rm mt352_priv.h
+rm cx22702.c
+rm cx22702.h
+rm lgdt3302.c
+rm lgdt3302.h
+rm lgdt3302_priv.h
+rm or51132.c
+rm or51132.h
+rm tda1004x.c
+rm tda1004x.h
+patch -p1 <<'DIFF'
+diff -upr video4linux/Makefile
+video4linux.orig/Makefile
+--- video4linux/Makefile 2005-07-21 23:41:13.000000000 +0000
++++ video4linux.orig/Makefile 2005-07-21 23:39:50.000000000 +0000
+@@ -39,8 +39,8 @@ obj-$(CONFIG_VIDEO_IR) += ir-common.o
+ obj-$(CONFIG_VIDEO_TUNER) += tuner.o tda9887.o
+ obj-$(CONFIG_VIDEO_TVAUDIO) += msp3400.o tvaudio.o tvmixer.o
+
+-obj-$(CONFIG_VIDEO_CX88_DVB) += video-buf-dvb.o cx88-dvb.o cx22702.o dvb-pll.o or51132.o lgdt3302.o mt352.o
+-obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o mt352.o tda1004x.o
++obj-$(CONFIG_VIDEO_CX88_DVB) += video-buf-dvb.o cx88-dvb.o
++obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o
+
+ # 2.6-only stuff
+ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
+@@ -123,7 +123,6 @@ ifeq ($(inst-m),)
+ endif
+
+ inst_common := ir-common.ko
+-inst_frontends := cx22702.ko dvb-pll.ko mt352.ko lgdt3302.ko or51132.ko tda1004x.ko
+ inst_video := btcx-risc.ko bttv.ko tda9887.ko tuner.ko tvaudio.ko tveeprom.ko
+ inst_video += tvmixer.ko v4l1-compat.ko v4l2-common.ko
+ inst_video += video-buf.ko video-buf-dvb.ko
+@@ -150,9 +149,6 @@ install:: rminstall
+ -install -d $(KDIR26)/common
+ -install -m 644 -c $(inst_common) $(KDIR26)/common
+
+- -install -d $(KDIR26)/dvb/frontends
+- -install -m 644 -c $(inst_frontends) $(KDIR26)/dvb/frontends
+-
+ -install -d $(KDIR26)/video
+ -install -m 644 -c $(inst_video) $(KDIR26)/video
+
+diff -upr video4linux/cx88-dvb.c video4linux.orig/cx88-dvb.c
+--- video4linux/cx88-dvb.c 2005-07-21 23:41:13.000000000 +0000
++++ video4linux.orig/cx88-dvb.c 2005-07-21 23:39:50.000000000 +0000
+@@ -34,7 +34,11 @@
+ #define CONFIG_DVB_MT352 1
+ #define CONFIG_DVB_CX22702 1
+ #define CONFIG_DVB_OR51132 1
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
++#define CONFIG_DVB_LGDT3302 0
++#else
+ #define CONFIG_DVB_LGDT3302 1
++#endif
+
+ #include "cx88.h"
+ #include "dvb-pll.h"
+diff -upr video4linux/saa7134-dvb.c video4linux.orig/saa7134-dvb.c
+--- video4linux/saa7134-dvb.c 2005-07-21 23:41:13.000000000 +0000
++++ video4linux.orig/saa7134-dvb.c 2005-07-21 23:39:50.000000000 +0000
+@@ -32,7 +32,11 @@
+ #include "compat.h"
+
+ #define CONFIG_DVB_MT352 1
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13)
+ #define CONFIG_DVB_TDA1004X 1
++#else
++#define CONFIG_DVB_TDA1004X 0
++#endif
+ #include "saa7134-reg.h"
+ #include "saa7134.h"
+
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-25 16:28:40 +0000