add upstream fixes for 1.7.2

[openwrt.git] / package / qc-usb / Makefile

diff --git a/package/qc-usb/Makefile b/package/qc-usb/Makefile
index 67d27a7..57f6394 100644 (file)
--- a/package/qc-usb/Makefile
+++ b/package/qc-usb/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
@@ -13,60 +13,54 @@ PKG_NAME:=qc-usb
 PKG_VERSION:=0.6.5
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/qc-usb-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/qce-ga
 PKG_MD5SUM:=6f6787e1dda11ca3b936ad434154f426
-PKG_CAT:=zcat
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/kernel.mk
 
-define Package/qc-usb-utils/Default
-  TITLE:=Utility programs for the qc-usb kernel module
-  DESCRIPTION:=\
-       Utilities to tweak paramters of your QuickCam Express or \\\
-       similar webcam. These programs are completely useless without a \\\
-       qc-usb-modules package.
+define Package/qc-usb/Default
   URL:=http://qce-ga.sourceforge.net/
 endef
 
 define Package/qc-usb-utils
+$(call Package/qc-usb/Default)
   SECTION:=utils
-  CATECORY:=Utilities
-  $(call Package/qc-usb-utils/Default)
+  CATEGORY:=Utilities
+  TITLE:=Utility programs for the qc-usb kernel module
+endef
+
+define Package/qc-usb-utils/description
+ Utilities to tweak parameters of your QuickCam Express or similar webcam. 
+ These programs are completely useless without a qc-usb-modules package.
 endef
 
-define KernelPackage/qc-usb
-  TITLE:=Support for USB QuickCam Express webcam
-  DESCRIPTION:=\
-       Kernel support for Logitech's QuickCam Express webcam and \\\
-       other webcams with similar chipsets.
-  SUBMENU:=USB Support
-  DEPENDS:=@LINUX_2_6
-  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
+define KernelPackage/video-quickcam
+$(call Package/qc-usb/Default)
+  SUBMENU:=Video Support
+  TITLE:=QuickCam Express USB webcam support
+  DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-core kmod-video-core
   FILES:=$(PKG_BUILD_DIR)/quickcam.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,70,quickcam)
+  AUTOLOAD:=$(call AutoLoad,90,quickcam)
+endef
+
+define KernelPackage/video-quickcam/description
+ Kernel support for Logitech's QuickCam Express webcam and other webcams 
+ with similar chipsets.
 endef
 
-ifeq ($(CONFIG_LINUX_2_6),y)
-  define Build/Compile/linux26
+ifneq ($(CONFIG_PACKAGE_kmod-video-quickcam),)
+  define Build/Compile/kmod
        $(MAKE) -C $(LINUX_DIR) \
-               PATH="$(TARGET_PATH)" \
-                KVER="$(LINUX_VERSION)" \
-               KERNELRELEASE="$(LINUX_VERSION)" \
-                KSRC="$(LINUX_DIR)" \
-                SUBDIRS="$(PKG_BUILD_DIR)" \
-                KERNEL_DIR="$(KERNEL_DIR)" \
-                ARCH="$(LINUX_KARCH)" \
-                CROSS_COMPILE="$(TARGET_CROSS)" \
+               ARCH="$(LINUX_KARCH)" \
+               CROSS_COMPILE="$(TARGET_CROSS)" \
+               SUBDIRS="$(PKG_BUILD_DIR)" \
                modules
   endef
 endif
 
 define Build/Compile
-       $(call Build/Compile/linux26)
-
+       $(call Build/Compile/kmod)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CFLAGS="$(TARGET_CFLAGS)" \
                qcset
@@ -74,8 +68,8 @@ endef
 
 define Package/qc-usb-utils/install
        $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/qcset $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/qcset $(1)/usr/bin/
 endef
 
 $(eval $(call BuildPackage,qc-usb-utils))
-$(eval $(call KernelPackage,qc-usb))
+$(eval $(call KernelPackage,video-quickcam))