diff options
| author | Michael Krufky <devnull@localhost> | 2005-07-29 05:17:44 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-07-29 05:17:44 +0000 |
| commit | 96027e5e951d23ca39a6ed15b882f77a477cb80d (patch) | |
| tree | d1585548ac37e5b581395ffc5f35e58f489fae6c /v4l/scripts | |
| parent | 319d808ed30372050868e4e6797e913cd92064e8 (diff) | |
| download | mediapointer-dvb-s2-96027e5e951d23ca39a6ed15b882f77a477cb80d.tar.gz mediapointer-dvb-s2-96027e5e951d23ca39a6ed15b882f77a477cb80d.tar.bz2 | |
- Include logic to detect merged dvb/v4l cvs trees using
tree merging scripts, adding DVB_CVS to EXTRA_CFLAGS.
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Diffstat (limited to 'v4l/scripts')
| -rw-r--r-- | v4l/scripts/merge-trees.sh | 9 | ||||
| -rw-r--r-- | v4l/scripts/unmerge-trees.sh | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh index b538c26b1..631d3bdf0 100644 --- a/v4l/scripts/merge-trees.sh +++ b/v4l/scripts/merge-trees.sh @@ -28,7 +28,7 @@ patch -p1 <<'DIFF' # 2.6-only stuff ifeq ($(VERSION).$(PATCHLEVEL),2.6) -@@ -131,6 +131,7 @@ ifeq ($(inst-m),) +@@ -139,6 +139,7 @@ ifeq ($(inst-m),) endif inst_common := ir-common.ko @@ -36,7 +36,7 @@ patch -p1 <<'DIFF' 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 -@@ -157,6 +158,9 @@ install:: rminstall +@@ -165,6 +166,9 @@ install:: rminstall -install -d $(KDIR26)/common -install -m 644 -c $(inst_common) $(KDIR26)/common @@ -74,3 +74,8 @@ diff -upr video4linux.orig/saa7134-dvb.c video4linux/saa7134-dvb.c #include "saa7134-reg.h" #include "saa7134.h" +diff -puN /dev/null .dvb +--- /dev/null 2003-09-15 06:40:47.000000000 -0700 ++++ video4linux/.dvb 2005-07-26 18:19:02.000000000 -0700 +@@ -0,0 +1 @@ ++1 diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh index 84061fae7..e82662115 100644 --- a/v4l/scripts/unmerge-trees.sh +++ b/v4l/scripts/unmerge-trees.sh @@ -30,7 +30,7 @@ video4linux.orig/Makefile # 2.6-only stuff ifeq ($(VERSION).$(PATCHLEVEL),2.6) -@@ -131,7 +131,6 @@ ifeq ($(inst-m),) +@@ -139,7 +139,6 @@ ifeq ($(inst-m),) endif inst_common := ir-common.ko @@ -38,7 +38,7 @@ video4linux.orig/Makefile 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 -@@ -158,9 +157,6 @@ install:: rminstall +@@ -166,9 +165,6 @@ install:: rminstall -install -d $(KDIR26)/common -install -m 644 -c $(inst_common) $(KDIR26)/common @@ -76,3 +76,8 @@ diff -upr video4linux/saa7134-dvb.c video4linux.orig/saa7134-dvb.c #include "saa7134-reg.h" #include "saa7134.h" +diff -uprN video4linux/.dvb /dev/null +--- video4linux/.dvb 2005-07-29 00:59:17.000000000 +0000 ++++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +@@ -1 +0,0 @@ +-1 |