Improved method for setting CVS_DVB cflag Signed-off-by: Michael Krufky <mkrufky@m1k.net>

author: Michael Krufky <devnull@localhost> 2005-07-30 01:53:17 +0000
committer: Michael Krufky <devnull@localhost> 2005-07-30 01:53:17 +0000
commit: 6ce23c6f6d76f1adde155c4459feb0a445018520 (patch)
tree: 737181c60b2fcefb91b72044784343c316a00079
parent: 40d4548195e77a13aee01ed87e6519af5e9e10e3 (diff)
download: mediapointer-dvb-s2-6ce23c6f6d76f1adde155c4459feb0a445018520.tar.gz
mediapointer-dvb-s2-6ce23c6f6d76f1adde155c4459feb0a445018520.tar.bz2
3 files changed, 34 insertions, 38 deletions
diff --git a/v4l/Makefile b/v4l/Makefile
index 77e07570c..b452c8d0a 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -93,21 +93,11 @@ SNAPSHOT_CFLAGS	:= -DSNAPSHOT='$(shell cat $(snapshot))'
 EXTRA_CFLAGS	+= $(SNAPSHOT_CFLAGS)
 endif
 
-dvb-cvs := $(wildcard $(obj)/.dvb)
-ifneq ($(dvb-cvs),)
-DVB_CVS_CFLAGS	:= -DDVB_CVS=$(shell cat $(dvb-cvs) 2> /dev/null)
-ifneq ($(DVB_CVS_CFLAGS),)
-EXTRA_CFLAGS		+= $(DVB_CVS_CFLAGS)
-endif
-endif
-
 mm-kernel := $(TOPDIR)/.mm
 ifneq ($(mm-kernel),)
 MM_KERNEL_CFLAGS	:= -DMM_KERNEL=$(shell cat $(mm-kernel) 2> /dev/null)
-ifneq ($(MM_KERNEL_CFLAGS),)
 EXTRA_CFLAGS		+= $(MM_KERNEL_CFLAGS)
 endif
-endif
 
 bttv.o: $(bttv-objs)
 	$(LD) -r -o $@ $(bttv-objs)
diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh
index 631d3bdf0..9b4a5fe12 100644
--- a/v4l/scripts/merge-trees.sh
+++ b/v4l/scripts/merge-trees.sh
@@ -15,8 +15,9 @@ ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/or51132.h         or51132.
 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
+diff -upr video4linux.orig/Makefile video4linux/Makefile
+--- video4linux.orig/Makefile	2005-07-29 21:41:18.000000000 +0000
++++ video4linux/Makefile	2005-07-29 21:41:59.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
@@ -28,7 +29,15 @@ patch -p1 <<'DIFF'
  
  # 2.6-only stuff
  ifeq ($(VERSION).$(PATCHLEVEL),2.6)
-@@ -139,6 +139,7 @@ ifeq ($(inst-m),)
+@@ -54,6 +54,7 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
+ endif
+ 
+ # for DVB
++EXTRA_CFLAGS += -DDVB_CVS=1
+ EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/
+ EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/
+ ifeq ($(CONFIG_VIDEO_CX88_DVB),m)
+@@ -129,6 +130,7 @@ ifeq ($(inst-m),)
  endif
  
  inst_common := ir-common.ko
@@ -36,7 +45,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
-@@ -165,6 +166,9 @@ install:: rminstall
+@@ -155,6 +157,9 @@ install:: rminstall
  	-install -d $(KDIR26)/common
  	-install -m 644 -c $(inst_common) $(KDIR26)/common
  
@@ -47,8 +56,8 @@ patch -p1 <<'DIFF'
  	-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-23 05:35:09.000000000 +0000
-+++ video4linux/cx88-dvb.c	2005-07-23 05:36:30.000000000 +0000
+--- video4linux.orig/cx88-dvb.c	2005-07-29 21:40:53.000000000 +0000
++++ video4linux/cx88-dvb.c	2005-07-29 21:41:59.000000000 +0000
 @@ -32,10 +32,6 @@
  #include <linux/config.h>
  #include "compat.h"
@@ -61,8 +70,8 @@ diff -upr video4linux.orig/cx88-dvb.c video4linux/cx88-dvb.c
  #include "dvb-pll.h"
  
 diff -upr video4linux.orig/saa7134-dvb.c video4linux/saa7134-dvb.c
---- video4linux.orig/saa7134-dvb.c	2005-07-23 05:35:09.000000000 +0000
-+++ video4linux/saa7134-dvb.c	2005-07-23 05:36:50.000000000 +0000
+--- video4linux.orig/saa7134-dvb.c	2005-07-29 21:40:53.000000000 +0000
++++ video4linux/saa7134-dvb.c	2005-07-29 21:41:59.000000000 +0000
 @@ -32,10 +32,6 @@
  #include <linux/config.h>
  #include "compat.h"
@@ -74,8 +83,3 @@ 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 e82662115..856331fba 100644
--- a/v4l/scripts/unmerge-trees.sh
+++ b/v4l/scripts/unmerge-trees.sh
@@ -15,10 +15,9 @@ 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
+diff -upr video4linux/Makefile video4linux.orig/Makefile
+--- video4linux/Makefile	2005-07-29 21:44:41.000000000 +0000
++++ video4linux.orig/Makefile	2005-07-29 21:45:09.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
@@ -30,7 +29,15 @@ video4linux.orig/Makefile
  
  # 2.6-only stuff
  ifeq ($(VERSION).$(PATCHLEVEL),2.6)
-@@ -139,7 +139,6 @@ ifeq ($(inst-m),)
+@@ -54,7 +54,6 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
+ endif
+ 
+ # for DVB
+-EXTRA_CFLAGS += -DDVB_CVS=1
+ EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/
+ EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/
+ ifeq ($(CONFIG_VIDEO_CX88_DVB),m)
+@@ -130,7 +129,6 @@ ifeq ($(inst-m),)
  endif
  
  inst_common := ir-common.ko
@@ -38,7 +45,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
-@@ -166,9 +165,6 @@ install:: rminstall
+@@ -157,9 +155,6 @@ install:: rminstall
  	-install -d $(KDIR26)/common
  	-install -m 644 -c $(inst_common) $(KDIR26)/common
  
@@ -49,8 +56,8 @@ video4linux.orig/Makefile
  	-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-23 05:36:30.000000000 +0000
-+++ video4linux.orig/cx88-dvb.c	2005-07-23 05:35:09.000000000 +0000
+--- video4linux/cx88-dvb.c	2005-07-29 21:44:41.000000000 +0000
++++ video4linux.orig/cx88-dvb.c	2005-07-29 21:44:31.000000000 +0000
 @@ -32,6 +32,10 @@
  #include <linux/config.h>
  #include "compat.h"
@@ -63,8 +70,8 @@ diff -upr video4linux/cx88-dvb.c video4linux.orig/cx88-dvb.c
  #include "dvb-pll.h"
  
 diff -upr video4linux/saa7134-dvb.c video4linux.orig/saa7134-dvb.c
---- video4linux/saa7134-dvb.c	2005-07-23 05:36:50.000000000 +0000
-+++ video4linux.orig/saa7134-dvb.c	2005-07-23 05:35:09.000000000 +0000
+--- video4linux/saa7134-dvb.c	2005-07-29 21:44:41.000000000 +0000
++++ video4linux.orig/saa7134-dvb.c	2005-07-29 21:44:31.000000000 +0000
 @@ -32,6 +32,10 @@
  #include <linux/config.h>
  #include "compat.h"
@@ -76,8 +83,3 @@ 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
author	Michael Krufky <devnull@localhost>	2005-07-30 01:53:17 +0000
committer	Michael Krufky <devnull@localhost>	2005-07-30 01:53:17 +0000
commit	6ce23c6f6d76f1adde155c4459feb0a445018520 (patch)
tree	737181c60b2fcefb91b72044784343c316a00079
parent	40d4548195e77a13aee01ed87e6519af5e9e10e3 (diff)
download	mediapointer-dvb-s2-6ce23c6f6d76f1adde155c4459feb0a445018520.tar.gz mediapointer-dvb-s2-6ce23c6f6d76f1adde155c4459feb0a445018520.tar.bz2