diff options
| -rw-r--r-- | v4l/ChangeLog | 10 | ||||
| -rw-r--r-- | v4l/Make.config | 3 | ||||
| -rw-r--r-- | v4l/Makefile | 8 | ||||
| -rw-r--r-- | v4l/scripts/merge-trees.sh | 12 | ||||
| -rw-r--r-- | v4l/scripts/unmerge-trees.sh | 12 |
5 files changed, 26 insertions, 19 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index e634cc493..f0ebcb607 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,13 @@ +2005-10-25 21:18 mkrufky + + * ../v4l/Make.config: + * ../v4l/Makefile: + * ../v4l/scripts/merge-trees.sh: + * ../v4l/scripts/unmerge-trees.sh: + - Revert build changes with respect to saa7134-alsa. + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-10-25 19:24 nshmyrev * ../linux/drivers/media/video/cx88/cx88-alsa.c: diff --git a/v4l/Make.config b/v4l/Make.config index db208dc4c..2b75f1f13 100644 --- a/v4l/Make.config +++ b/v4l/Make.config @@ -12,8 +12,7 @@ CONFIG_TVP5150 := m CONFIG_SAA711X := m CONFIG_EM2820 := m -CONFIG_VIDEO_ALSA := m -CONFIG_VIDEO_ALSA_TESTING := n +CONFIG_VIDEO_ALSA := n # doesn't build on kernels older than 2.6.12 diff --git a/v4l/Makefile b/v4l/Makefile index 37cfed5cc..73944eed5 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -18,7 +18,8 @@ bttv-objs := bttv-driver.o bttv-cards.o bttv-risc.o bttv-if.o \ bttv-vbi.o bttv-i2c.o saa7134-objs := saa7134-core.o saa7134-i2c.o saa7134-video.o \ saa7134-vbi.o saa7134-tvaudio.o saa7134-oss.o \ - saa7134-cards.o saa7134-ts.o saa7134-input.o + saa7134-cards.o saa7134-ts.o saa7134-input.o \ + saa7134-alsa.o cx88xx-objs := cx88-cards.o cx88-core.o cx88-i2c.o cx88-tvaudio.o \ cx88-input.o cx8800-objs := cx88-video.o cx88-vbi.o @@ -37,14 +38,11 @@ obj-$(CONFIG_TVP5150) += tvp5150.o obj-$(CONFIG_SAA711X) += saa711x.o obj-$(CONFIG_EM2820) += em2820.o -ifeq ($(CONFIG_VIDEO_ALSA),m) # THIS IS NOT FINISHED YET --- IT IS HERE ONLY FOR DEVELOPERS !!!! -ifeq ($(CONFIG_VIDEO_ALSA_TESTING),m) +ifeq ($(CONFIG_VIDEO_ALSA),m) cx8801-objs := cx88-alsa.o obj-$(CONFIG_VIDEO_CX88) += cx88-alsa.o endif - saa7134-objs += saa7134-alsa.o -endif obj-$(CONFIG_VIDEO_SAA7134) += saa7134.o saa7134-empress.o saa6752hs.o obj-$(CONFIG_VIDEO_IR) += ir-common.o diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh index c231f9161..fcbe09a0e 100644 --- a/v4l/scripts/merge-trees.sh +++ b/v4l/scripts/merge-trees.sh @@ -29,7 +29,7 @@ patch -p2 <<'DIFF' diff -up v4l-kernel.orig/v4l/Make.config v4l-kernel/v4l/Make.config --- v4l-kernel.orig/v4l/Make.config 2005-10-08 17:31:57.000000000 -0400 +++ v4l-kernel/v4l/Make.config 2005-10-08 17:46:08.000000000 -0400 -@@ -33,5 +33,7 @@ endif +@@ -32,5 +32,7 @@ endif ifeq ($(CONFIG_VIDEO_BUF_DVB),m) CONFIG_VIDEO_CX88_DVB := m CONFIG_VIDEO_SAA7134_DVB := m @@ -40,7 +40,7 @@ diff -up v4l-kernel.orig/v4l/Make.config v4l-kernel/v4l/Make.config diff -up v4l-kernel.orig/v4l/Makefile v4l-kernel/v4l/Makefile --- v4l-kernel.orig/v4l/Makefile 2005-10-08 17:31:57.000000000 -0400 +++ v4l-kernel/v4l/Makefile 2005-10-08 17:45:48.000000000 -0400 -@@ -71,6 +71,7 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6) +@@ -69,6 +69,7 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6) endif # for DVB @@ -48,7 +48,7 @@ diff -up v4l-kernel.orig/v4l/Makefile v4l-kernel/v4l/Makefile EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/ EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/ ifeq ($(CONFIG_VIDEO_CX88_DVB),m) -@@ -173,7 +174,7 @@ export LC_ALL +@@ -171,7 +172,7 @@ export LC_ALL default:: links .version $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules @@ -57,7 +57,7 @@ diff -up v4l-kernel.orig/v4l/Makefile v4l-kernel/v4l/Makefile @echo creating symbolic links... @find ../linux/drivers/media/video -name '*.[c,h]' -type f -exec ln -sf '{}' . \; @find ../linux/drivers/usb/media -name '*.[c,h]' -type f -exec ln -sf '{}' . \; -@@ -186,7 +187,7 @@ links:: +@@ -184,7 +185,7 @@ links:: @find ../linux/drivers/media/dvb/frontends -name '*.[c,h]' -type l -exec ln -sf '{}' . \; @find ../linux/drivers/media/dvb/bt8xx -name '*.[c,h]' -type l -exec ln -sf '{}' . \; @@ -66,7 +66,7 @@ diff -up v4l-kernel.orig/v4l/Makefile v4l-kernel/v4l/Makefile @echo -e "\nInstalling new V4L modules at corresponding Kernel dir..." @strip --strip-debug $(inst-m) -@@ -249,7 +250,7 @@ dvb-rminstall:: +@@ -247,7 +248,7 @@ dvb-rminstall:: $(addprefix $(KDIR26)/dvb/frontends/, $(addsuffix .gz,$(inst_frontends))) 2>/dev/null @echo @@ -75,7 +75,7 @@ diff -up v4l-kernel.orig/v4l/Makefile v4l-kernel/v4l/Makefile @echo -e "\nEliminating old V4L modules (errors on this step is not a problem).." -@rm -r $(DEST) \ -@@ -270,7 +271,7 @@ rminstall:: +@@ -268,7 +269,7 @@ rminstall:: rmmodules:: rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d) diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh index e8516accf..90b2ee2ca 100644 --- a/v4l/scripts/unmerge-trees.sh +++ b/v4l/scripts/unmerge-trees.sh @@ -10,7 +10,7 @@ patch -p2 <<'DIFF' diff -up v4l-kernel/v4l/Make.config v4l-kernel.orig/v4l/Make.config --- v4l-kernel/v4l/Make.config 2005-10-08 17:46:08.000000000 -0400 +++ v4l-kernel.orig/v4l/Make.config 2005-10-08 17:31:57.000000000 -0400 -@@ -33,7 +33,5 @@ endif +@@ -32,7 +32,5 @@ endif ifeq ($(CONFIG_VIDEO_BUF_DVB),m) CONFIG_VIDEO_CX88_DVB := m CONFIG_VIDEO_SAA7134_DVB := m @@ -21,7 +21,7 @@ diff -up v4l-kernel/v4l/Make.config v4l-kernel.orig/v4l/Make.config diff -up v4l-kernel/v4l/Makefile v4l-kernel.orig/v4l/Makefile --- v4l-kernel/v4l/Makefile 2005-10-08 17:45:48.000000000 -0400 +++ v4l-kernel.orig/v4l/Makefile 2005-10-08 17:31:57.000000000 -0400 -@@ -71,7 +71,6 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6) +@@ -69,7 +69,6 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6) endif # for DVB @@ -29,7 +29,7 @@ diff -up v4l-kernel/v4l/Makefile v4l-kernel.orig/v4l/Makefile EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/ EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/ ifeq ($(CONFIG_VIDEO_CX88_DVB),m) -@@ -174,7 +173,7 @@ export LC_ALL +@@ -172,7 +171,7 @@ export LC_ALL default:: links .version $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules @@ -38,7 +38,7 @@ diff -up v4l-kernel/v4l/Makefile v4l-kernel.orig/v4l/Makefile @echo creating symbolic links... @find ../linux/drivers/media/video -name '*.[c,h]' -type f -exec ln -sf '{}' . \; @find ../linux/drivers/usb/media -name '*.[c,h]' -type f -exec ln -sf '{}' . \; -@@ -187,7 +186,7 @@ links:: +@@ -185,7 +184,7 @@ links:: @find ../linux/drivers/media/dvb/frontends -name '*.[c,h]' -type l -exec ln -sf '{}' . \; @find ../linux/drivers/media/dvb/bt8xx -name '*.[c,h]' -type l -exec ln -sf '{}' . \; @@ -47,7 +47,7 @@ diff -up v4l-kernel/v4l/Makefile v4l-kernel.orig/v4l/Makefile @echo -e "\nInstalling new V4L modules at corresponding Kernel dir..." @strip --strip-debug $(inst-m) -@@ -250,7 +249,7 @@ dvb-rminstall:: +@@ -248,7 +247,7 @@ dvb-rminstall:: $(addprefix $(KDIR26)/dvb/frontends/, $(addsuffix .gz,$(inst_frontends))) 2>/dev/null @echo @@ -56,7 +56,7 @@ diff -up v4l-kernel/v4l/Makefile v4l-kernel.orig/v4l/Makefile @echo -e "\nEliminating old V4L modules (errors on this step is not a problem).." -@rm -r $(DEST) \ -@@ -271,7 +270,7 @@ rminstall:: dvb-rminstall +@@ -269,7 +268,7 @@ rminstall:: dvb-rminstall rmmodules:: rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d) |