X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/22348e0a56e08b641ebc3f3ed9b87d74a2c3a38c..a2c5c63f00eed4bd0f72af349362990f9acfff11:/package/qc-usb/Makefile

diff --git a/package/qc-usb/Makefile b/package/qc-usb/Makefile
index a1a16b34c..8fd666809 100644
--- a/package/qc-usb/Makefile
+++ b/package/qc-usb/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=qc-usb
-PKG_VERSION:=0.6.5
+PKG_VERSION:=0.6.6
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/qce-ga
-PKG_MD5SUM:=6f6787e1dda11ca3b936ad434154f426
+PKG_MD5SUM:=9eab8fb3a75326d1565d59b0c7256075
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -38,8 +38,8 @@ endef
 define KernelPackage/video-quickcam
 $(call Package/qc-usb/Default)
   SUBMENU:=Video Support
-  TITLE:=USB QuickCam Express webcam support
-  DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-core +kmod-video-core
+  TITLE:=QuickCam Express USB webcam support
+  DEPENDS:=@USB_SUPPORT +kmod-usb-core kmod-video-core
   FILES:=$(PKG_BUILD_DIR)/quickcam.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,90,quickcam)
 endef
@@ -49,28 +49,39 @@ define KernelPackage/video-quickcam/description
  with similar chipsets.
 endef
 
+ifeq ($(KERNEL),2.4)
+  ifeq ($(LINUX_KARCH),i386)
+    KERNEL_C_OPTS:= -Os -mpreferred-stack-boundary=2 -march=i486 -fno-unit-at-a-time
+  endif
+  ifeq ($(LINUX_KARCH),mips)
+    KERNEL_C_OPTS:= -Os -G 0 -mlong-calls -mno-abicalls -fno-pic -finline-limit=100000 -mabi=32 -march=mips32 -Wa,-32 -Wa,-march=mips32 -Wa,-mips32 -Wa,--trap
+  endif
+endif
+
 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)" \
-		modules
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		LINUX_DIR="$(LINUX_DIR)" \
+		ARCH="$(LINUX_KARCH)" \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
+		CC="$(TARGET_CC)" \
+		LD="$(TARGET_CC) -nodefaultlibs -nostartfiles" \
+		USER_OPT="$(KERNEL_C_OPTS)" \
+		quickcam.$(LINUX_KMOD_SUFFIX)
   endef
 endif
 
-define Build/Compile
-	$(call Build/Compile/kmod)
+define Build/Compile/user
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		qcset
 endef
 
+define Build/Compile
+	$(call Build/Compile/kmod)
+	$(call Build/Compile/user)
+endef
+
 define Package/qc-usb-utils/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/qcset $(1)/usr/bin/