v4l-dvb: updated to 20120916.

diff --git a/lfs/v4l-dvb b/lfs/v4l-dvb
index 3b3d22b2c041df2d21441e83511342ccde6da6a8..5f2751ad2958de1912de2cd1b5529da3d6228624 100644 (file)
--- a/lfs/v4l-dvb
+++ b/lfs/v4l-dvb
@@ -26,24 +26,28 @@ include Config
 
 VERSUFIX=ipfire$(KCFG)
 
-VER        = 20111225
+VER        = 20120916
 THISAPP    = v4l-dvb-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
 
+ifeq "$(KCFG)" "-xen"
+       XVER = 2.6.32
+       KVER = 2.6.32.59
+else
+       XVER = 3.2.0
+endif
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) v4l-dvb_update_it913x_1_25.patch.gz
+objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-v4l-dvb_update_it913x_1_25.patch.gz = $(DL_FROM)/v4l-dvb_update_it913x_1_25.patch.gz
 
-$(DL_FILE)_MD5 = 264c5f4ad7aad8dd2960799c80a7908c
-v4l-dvb_update_it913x_1_25.patch.gz_MD5 = c3e397bd64f618edbfcaa56466cdbf14
+$(DL_FILE)_MD5 = 7824fdd540605c54584df0d16f0e923b
 
 install : $(TARGET)
 
@@ -73,10 +77,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP)/linux && zcat $(DIR_DL)/v4l-dvb_update_it913x_1_25.patch.gz | \
-                                       patch -Np1 
-       cd $(DIR_APP) && make allyesconfig KERNELRELEASE=$(KVER)-$(VERSUFIX) VER=2.6.32
-       cd $(DIR_APP) && make all KERNELRELEASE=$(KVER)-$(VERSUFIX) VER=2.6.32
-       cd $(DIR_APP) && make install KERNELRELEASE=$(KVER)-$(VERSUFIX) VER=2.6.32
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/v4l-dvb_rtl28xx_add_usb_ids.patch
+       cd $(DIR_APP) && make allyesconfig KERNELRELEASE=$(KVER)-$(VERSUFIX) VER=$(XVER)
+       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)

diff --git a/make.sh b/make.sh
index f5407ebacf262ba89affe4cae830560d474e8b5f..1e08be6d34c77aa4478d838dc2e93c326835921f 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -379,7 +379,7 @@ buildipfire() {
   # The xen and PAE kernels are only available for x86
   if [ "${MACHINE_TYPE}" != "arm" ]; then
     ipfiremake linux2                  KCFG="-xen"
-#    ipfiremake v4l-dvb                        KCFG="-xen"
+    ipfiremake v4l-dvb                 KCFG="-xen"
 #    ipfiremake mISDN                  KCFG="-xen"
     ipfiremake cryptodev               KCFG="-xen"
     ipfiremake compat-wireless         KCFG="-xen"
@@ -392,7 +392,7 @@ buildipfire() {
 
     ipfiremake linux                   KCFG="-pae"
 #    ipfiremake kvm-kmod                       KCFG="-pae"
-#    ipfiremake v4l-dvb                        KCFG="-pae"
+    ipfiremake v4l-dvb                 KCFG="-pae"
     ipfiremake alsa                    KCFG="-pae" KMOD=1
 #    ipfiremake mISDN                  KCFG="-pae"
     ipfiremake cryptodev               KCFG="-pae"
@@ -406,7 +406,7 @@ buildipfire() {
 
     ipfiremake linux                   KCFG=""
 #    ipfiremake kvm-kmod                       KCFG=""
-#    ipfiremake v4l-dvb                        KCFG=""
+    ipfiremake v4l-dvb                 KCFG=""
     ipfiremake alsa                    KCFG="" KMOD=1
 #    ipfiremake mISDN                  KCFG=""
     ipfiremake cryptodev               KCFG=""

diff --git a/src/patches/v4l-dvb_rtl28xx_add_usb_ids.patch b/src/patches/v4l-dvb_rtl28xx_add_usb_ids.patch
new file mode 100644 (file)
index 0000000..1dd649a
--- /dev/null
+++ b/src/patches/v4l-dvb_rtl28xx_add_usb_ids.patch
@@ -0,0 +1,14 @@
+diff -Naur v4l-dvb-20120916.org/linux/drivers/media/usb/dvb-usb-v2/rtl28xxu.c v4l-dvb-20120916/linux/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
+--- v4l-dvb-20120916.org/linux/drivers/media/usb/dvb-usb-v2/rtl28xxu.c 2012-09-16 05:46:03.000000000 +0200
++++ v4l-dvb-20120916/linux/drivers/media/usb/dvb-usb-v2/rtl28xxu.c     2012-09-19 20:03:04.538168193 +0200
+@@ -1228,6 +1228,10 @@
+               &rtl2832u_props, "G-Tek Electronics Group Lifeview LV5TDLX DVB-T", NULL) },
+       { DVB_USB_DEVICE(USB_VID_TERRATEC, USB_PID_NOXON_DAB_STICK,
+               &rtl2832u_props, "NOXON DAB/DAB+ USB dongle", NULL) },
++      { DVB_USB_DEVICE(0x1d19, 0x1101,
++              &rtl2832u_props, "DK DVB-T USB dongle", NULL) },
++      { DVB_USB_DEVICE(0x1f4d, 0xc803,
++              &rtl2832u_props, "Trekstor DVB-T DAB FM USB dongle", NULL) },
+       { }
+ };
+ MODULE_DEVICE_TABLE(usb, rtl28xxu_id_table);