X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fv4l-dvb;h=ef0f383663007f5e3331107733b1cc92eb303e4f;hb=85981472c3ef260141178afe9a006935ecb913e2;hp=41e91d0841fcb696acfb454a41dfc486a938ce60;hpb=d5878acb443b9e55dec2c984287ecc479b3119c2;p=ipfire-2.x.git

diff --git a/lfs/v4l-dvb b/lfs/v4l-dvb
index 41e91d0841..ef0f383663 100644
--- a/lfs/v4l-dvb
+++ b/lfs/v4l-dvb
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2012  IPFire Team <info@ipfire.org>                      #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,20 +24,21 @@
 
 include Config
 
-VER        = b386f0d3baaf
+VERSUFIX=ipfire$(KCFG)
 
+VER        = 20120916
 THISAPP    = v4l-dvb-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-PAK_VER    = 2
-ifeq "$(SMP)" "1"
-	TARGET     = $(DIR_INFO)/$(THISAPP)-smp
+TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
+
+ifeq "$(KCFG)" "-xen"
+	XVER = 2.6.32
+	KVER = 2.6.32.60
 else
-	TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)
+	XVER = 3.2.0
 endif
-
-
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -46,7 +47,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = c1681dd766507fdac47cd615e79966ea
+$(DL_FILE)_MD5 = 7824fdd540605c54584df0d16f0e923b
 
 install : $(TARGET)
 
@@ -56,9 +57,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-dist: 
-	$(PAK)
-
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
@@ -78,14 +76,28 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-ifeq "$(SMP)" "1"
-	cd $(DIR_APP) && make release VER=$(KVER)-ipfire-smp
-else
-	cd $(DIR_APP) && make release VER=$(KVER)-ipfire
+	@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
-	cd $(DIR_APP) && make $(MAKETUNING) all
-	cd $(DIR_APP) && make install
-	-ln -s $(DIR_APP)/ /usr/src/v4l-dvb
-#	@rm -rf $(DIR_APP)
+	# 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
 	@$(POSTBUILD)