From 157f1fad33e13c5b01c2dc5fbc674e107605f866 Mon Sep 17 00:00:00 2001 From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> Date: Thu, 20 Sep 2007 07:31:06 +0000 Subject: [PATCH] video modules changes: change dependency on kmod-video-core from select to depends, cleanup git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8856 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/video.mk | 35 +++++++++++++++++---------------- package/qc-usb/Makefile | 15 +++++--------- package/spca5xx-le/Makefile | 6 ++---- package/spca5xx/Makefile | 5 +---- package/uvcvideo/Makefile | 9 +++------ 5 files changed, 29 insertions(+), 41 deletions(-) diff --git a/package/kernel/modules/video.mk b/package/kernel/modules/video.mk index 79ee7029f..4a3603164 100644 --- a/package/kernel/modules/video.mk +++ b/package/kernel/modules/video.mk @@ -44,10 +44,26 @@ endef $(eval $(call KernelPackage,video-core)) +define KernelPackage/video-cpia2 + SUBMENU:=$(VIDEO_MENU) + TITLE:=CPIA2 video driver + DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-core kmod-video-core + KCONFIG:=CONFIG_VIDEO_CPIA2 + FILES:=$(LINUX_DIR)/drivers/media/video/cpia2/cpia2.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,70,cpia2) +endef + +define KernelPackage/video-cpia2/description + Kernel modules for supporting CPIA2 USB based cameras. +endef + +$(eval $(call KernelPackage,video-cpia2)) + + define KernelPackage/video-pwc SUBMENU:=$(VIDEO_MENU) - TITLE:=Philips webcam support - DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-core +kmod-video-core + TITLE:=Philips USB webcam support + DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-core kmod-video-core KCONFIG:= \ CONFIG_USB_PWC \ CONFIG_USB_PWC_DEBUG=n @@ -62,18 +78,3 @@ endef $(eval $(call KernelPackage,video-pwc)) - -define KernelPackage/video-cpia2 - SUBMENU:=$(VIDEO_MENU) - TITLE:=CPIA2 video driver - DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-core +kmod-video-core - KCONFIG:=CONFIG_VIDEO_CPIA2 - FILES:=$(LINUX_DIR)/drivers/media/video/cpia2/cpia2.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,70,cpia2) -endef - -define KernelPackage/video-cpia2/description - Kernel modules for supporting CPIA2 USB based cameras. -endef - -$(eval $(call KernelPackage,video-cpia2)) diff --git a/package/qc-usb/Makefile b/package/qc-usb/Makefile index a1a16b34c..57f63941f 100644 --- a/package/qc-usb/Makefile +++ b/package/qc-usb/Makefile @@ -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:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-core kmod-video-core FILES:=$(PKG_BUILD_DIR)/quickcam.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,90,quickcam) endef @@ -52,14 +52,9 @@ endef 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 diff --git a/package/spca5xx-le/Makefile b/package/spca5xx-le/Makefile index e3c0d285c..08312b126 100644 --- a/package/spca5xx-le/Makefile +++ b/package/spca5xx-le/Makefile @@ -16,15 +16,16 @@ PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME).tar.bz2 PKG_SOURCE_URL:=http://www.acmesystems.it/download/owrt/ PKG_MD5SUM:= + PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME) include $(INCLUDE_DIR)/package.mk define KernelPackage/video-spca5xx-le SUBMENU:=Video Support - DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-core +kmod-video-core TITLE:=SPCA5xx based USB webcam support (Light Edition) URL:=http://mxhaard.free.fr/ + DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-core kmod-video-core FILES:=$(PKG_BUILD_DIR)/spca5xx.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,90,spca5xx) endef @@ -33,9 +34,6 @@ define Build/Compile $(MAKE) -C $(LINUX_DIR) \ ARCH="$(LINUX_KARCH)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ - KERNELVERSION="$(KERNEL)" \ - KERNEL_VERSION="$(LINUX_VERSION)" \ - KERNELDIR="$(LINUX_DIR)" \ SUBDIRS="$(PKG_BUILD_DIR)" \ modules endef diff --git a/package/spca5xx/Makefile b/package/spca5xx/Makefile index 3d48b7e3d..25de916f7 100644 --- a/package/spca5xx/Makefile +++ b/package/spca5xx/Makefile @@ -21,9 +21,9 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/video-gspca SUBMENU:=Video Support - DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-core +kmod-video-core TITLE:=SPCA5xx based USB webcam support URL:=http://mxhaard.free.fr/ + DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-core kmod-video-core FILES:=$(PKG_BUILD_DIR)/gspca.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,90,gspca) endef @@ -32,9 +32,6 @@ define Build/Compile $(MAKE) -C $(LINUX_DIR) \ ARCH="$(LINUX_KARCH)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ - KERNELVERSION="$(KERNEL)" \ - KERNEL_VERSION="$(LINUX_VERSION)" \ - KERNELDIR="$(LINUX_DIR)" \ SUBDIRS="$(PKG_BUILD_DIR)" \ modules endef diff --git a/package/uvcvideo/Makefile b/package/uvcvideo/Makefile index 97e292446..4aa9834a0 100644 --- a/package/uvcvideo/Makefile +++ b/package/uvcvideo/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 @@ -21,9 +21,9 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/video-uvc SUBMENU:=Video Support - DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-core +kmod-video-core - TITLE:=Linux-UVC based USB webcam support + TITLE:=USB Video Class (UVC) support URL:=http://linux-uvc.berlios.de/ + DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-core kmod-video-core FILES:=$(PKG_BUILD_DIR)/uvcvideo.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,90,uvcvideo) endef @@ -32,9 +32,6 @@ define Build/Compile $(MAKE) -C $(LINUX_DIR) \ ARCH="$(LINUX_KARCH)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ - KERNELVERSION="$(KERNEL)" \ - KERNEL_VERSION="$(LINUX_VERSION)" \ - KERNELDIR="$(LINUX_DIR)" \ SUBDIRS="$(PKG_BUILD_DIR)" \ modules endef -- 2.20.1