v4l-dvb: updated to git20110427.
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 28 Apr 2011 16:43:08 +0000 (18:43 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 25 Jul 2011 05:04:20 +0000 (07:04 +0200)
lfs/v4l-dvb
src/patches/v4l-dvb_remove_backport_warning.patch [deleted file]

index e8f2e54..6c6a5fc 100644 (file)
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team <info@ipfire.org>                           #
+# Copyright (C) 2007-2011  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        #
@@ -34,10 +34,10 @@ else
 endif
 endif
 
-VER        = abd3aac6644e
+VER        = git20110427
 
 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
@@ -51,7 +51,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = fca89ad531c5d04dadbbc65997c92aac
+$(DL_FILE)_MD5 = 8b83a89332fe8468ebffd516a4a47128
 
 install : $(TARGET)
 
@@ -83,12 +83,9 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       # Remove backported warning...
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/v4l-dvb_remove_backport_warning.patch
-               cd $(DIR_APP) && make release VER=$(KVER)-$(VERSUFIX)
-       cd $(DIR_APP) && make $(MAKETUNING) all
-       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && make all KERNELRELEASE=$(KVER)-$(VERSUFIX) VER=2.6.32
+       cd $(DIR_APP) && make install KERNELRELEASE=$(KVER)-$(VERSUFIX) VER=2.6.32
        ln -sf $(DIR_APP)/ /usr/src/v4l-dvb
 #      @rm -rf $(DIR_APP)
        @$(POSTBUILD)
diff --git a/src/patches/v4l-dvb_remove_backport_warning.patch b/src/patches/v4l-dvb_remove_backport_warning.patch
deleted file mode 100644 (file)
index 7f57822..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur v4l-dvb-abd3aac6644e.org/v4l/compat.h v4l-dvb-abd3aac6644e/v4l/compat.h
---- v4l-dvb-abd3aac6644e.org/v4l/compat.h      2010-07-02 05:38:54.000000000 +0200
-+++ v4l-dvb-abd3aac6644e/v4l/compat.h  2010-12-04 12:19:09.531056981 +0100
-@@ -14,8 +14,6 @@
- #define INIT_DELAYED_WORK(a,b,c)      INIT_WORK(a,b,c)
- #endif
--#define EXPERIMENTAL_TREE
--
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
- #define usb_buffer_alloc(dev, size, mem_flags, dma) usb_alloc_coherent(dev, size, mem_flags, dma)
- #define usb_buffer_free(dev, size, addr, dma) usb_free_coherent(dev, size, addr, dma)