X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fv4l-dvb;h=9cf277caf9992d3c95e6fc6d77a3d377a35b3ccb;hp=5f2751ad2958de1912de2cd1b5529da3d6228624;hb=30b1c1c72855e469034d9f7a6d4410367fa3069c;hpb=e0027e6cdc8fb4b7849430aa805a0314fef2b6a7

diff --git a/lfs/v4l-dvb b/lfs/v4l-dvb
index 5f2751ad2..9cf277caf 100644
--- a/lfs/v4l-dvb
+++ b/lfs/v4l-dvb
@@ -35,7 +35,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
 
 ifeq "$(KCFG)" "-xen"
 	XVER = 2.6.32
-	KVER = 2.6.32.59
+	KVER = 2.6.32.61
 else
 	XVER = 3.2.0
 endif
@@ -78,7 +78,25 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/v4l-dvb_rtl28xx_add_usb_ids.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/v4l-dvb_rtl28xx_commented_usb_clear_halt.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/v4l-dvb_usbv2_dont_report_pidfilter_fail.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/v4l-dvb_fix_tua6034_pll.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/v4l-dvb_bestunar_us638x.patch
+
 	cd $(DIR_APP) && make allyesconfig KERNELRELEASE=$(KVER)-$(VERSUFIX) VER=$(XVER)
+ifeq "$(KCFG)" "-omap"
+	# Disable failing OMAP2 Video Out and IR RX51 driver
+	cd $(DIR_APP) && sed -i -e \
+		"s|^CONFIG_VIDEO_OMAP2_VOUT=m|# CONFIG_VIDEO_OMAP2_VOUT is not set|g" \
+		v4l/.config
+	cd $(DIR_APP) && sed -i -e \
+		"s|^CONFIG_IR_RX51=m|# CONFIG_IR_RX51 is not set|g" \
+		v4l/.config
+endif
+	# Disable Radio Shark (missing tuner module)
+	cd $(DIR_APP) && sed -i -e \
+		"s|^CONFIG_RADIO_SHARK=m|# CONFIG_RADIO_SHARK is not set|g" \
+		v4l/.config
 	cd $(DIR_APP) && make all KERNELRELEASE=$(KVER)-$(VERSUFIX) VER=$(XVER)
 	cd $(DIR_APP) && make install KERNELRELEASE=$(KVER)-$(VERSUFIX) VER=$(XVER)
 	ln -sf $(DIR_APP)/ /usr/src/v4l-dvb