X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Fvideo.mk;h=8f46fbb90f1511aa7998dcd212080af4c555af07;hp=bd950e34365a0344e3c7d1b7bb2eb10386233949;hb=796a9d1091884a07817e5c140d0ff6a0b8c76235;hpb=c93d2afa0db0cc1e89779fd5e9c5eaa1054c153c

diff --git a/package/kernel/modules/video.mk b/package/kernel/modules/video.mk
index bd950e343..8f46fbb90 100644
--- a/package/kernel/modules/video.mk
+++ b/package/kernel/modules/video.mk
@@ -1,17 +1,16 @@
 #
-# 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.
 #
-# $Id$
 
 VIDEO_MENU:=Video Support
 
 define KernelPackage/video-core
   SUBMENU:=$(VIDEO_MENU)
   TITLE=Video4Linux support
-  DEPENDS:= @!TARGET_uml
+  DEPENDS:=@PCI_SUPPORT||USB_SUPPORT
   KCONFIG:= \
 	CONFIG_VIDEO_DEV \
 	CONFIG_VIDEO_V4L1=y \
@@ -48,7 +47,7 @@ $(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
+  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)
@@ -64,7 +63,7 @@ $(eval $(call KernelPackage,video-cpia2))
 define KernelPackage/video-konica
   SUBMENU:=$(VIDEO_MENU)
   TITLE:=Konica USB webcam support
-  DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-video kmod-video-core
+  DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-video +kmod-video-core
   KCONFIG:=CONFIG_USB_KONICAWC
   FILES:=$(LINUX_DIR)/drivers/media/video/usbvideo/konicawc.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,70,konicawc)
@@ -81,7 +80,7 @@ $(eval $(call KernelPackage,video-konica))
 define KernelPackage/video-ov511
   SUBMENU:=$(VIDEO_MENU)
   TITLE:=OV511 USB webcam support
-  DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-core kmod-video-core
+  DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-core +kmod-video-core
   KCONFIG:=CONFIG_VIDEO_OV511
   FILES:=$(LINUX_DIR)/drivers/media/video/ov511.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,70,ov511)
@@ -98,7 +97,7 @@ $(eval $(call KernelPackage,video-ov511))
 define KernelPackage/video-ovcamchip
   SUBMENU:=$(VIDEO_MENU)
   TITLE:=OV6xxx/OV7xxx Camera Chip support
-  DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-i2c-core kmod-video-core
+  DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-i2c-core +kmod-video-core
   KCONFIG:=CONFIG_VIDEO_OVCAMCHIP
   FILES:=$(LINUX_DIR)/drivers/media/video/ovcamchip/ovcamchip.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,70,ovcamchip)
@@ -116,7 +115,7 @@ $(eval $(call KernelPackage,video-ovcamchip))
 define KernelPackage/video-pwc
   SUBMENU:=$(VIDEO_MENU)
   TITLE:=Philips USB webcam support
-  DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-core kmod-video-core
+  DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-core +kmod-video-core
   KCONFIG:= \
 	CONFIG_USB_PWC \
 	CONFIG_USB_PWC_DEBUG=n
@@ -131,3 +130,20 @@ endef
 
 $(eval $(call KernelPackage,video-pwc))
 
+define KernelPackage/video-uvc
+  SUBMENU:=$(VIDEO_MENU)
+  TITLE:=USB Video Class (UVC) support
+  DEPENDS:=@LINUX_2_6 @!LINUX_2_6_25 @!LINUX_2_6_24 @!LINUX_2_6_23 @USB_SUPPORT +kmod-usb-core +kmod-video-core
+  KCONFIG:= \
+	CONFIG_USB_VIDEO_CLASS \
+	CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+  FILES:=$(LINUX_DIR)/drivers/media/video/uvc/uvcvideo.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,90,uvcvideo)
+endef
+
+
+define KernelPackage/video-uvc/description
+ Kernel modules for supporting USB Video Class (UVC) devices.
+endef
+
+$(eval $(call KernelPackage,video-uvc))