Changeset 49316 in vbox

Timestamp:

Oct 29, 2013 8:30:37 AM (11 years ago)

Author:

vboxsync

Message:

some ExtPack build magic

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• src/VBox/Devices/Makefile.kmk (modified) (1 diff)
• src/VBox/Devices/build/VBoxDD.cpp (modified) (11 diffs)
• src/VBox/Devices/build/VBoxDD.h (modified) (2 diffs)

trunk/Config.kmk

@@ -469 +469 @@
  VBOX_WITH_PCI_PASSTHROUGH_IMPL = 1
 endif
+ifndef VBOX_WITHOUT_HOSTWEBCAM
+ VBOX_WITH_USB_VIDEO_IMPL = 1
+endif
 # Enable the hal/sysfs USB code on Linux.
 ifeq ($(KBUILD_TARGET),linux)
@@ -1023 +1026 @@
  VBOX_WITH_VRDP=
  VBOX_WITH_EHCI_IMPL=
+ VBOX_WITH_USB_VIDEO_IMPL=
  VBOX_WITH_EXTPACK_PUEL=
  VBOX_WITH_EXTPACK_PUEL_BUILD=

trunk/src/VBox/Devices/Makefile.kmk

@@ -305 +305 @@
   if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
    VBoxDD_DEFS          += VBOX_WITH_EHCI_IMPL
-  endif
-  VBoxDD_DEFS           += VBOX_WITH_USB
-  if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
-   VBoxDD_DEFS          += VBOX_WITH_EHCI_IMPL
    VBoxDD_SOURCES       += \
         USB/DevEHCI.cpp
+  endif
+
+  if defined(VBOX_WITH_USB_VIDEO_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
+   VBoxDD_DEFS          += VBOX_WITH_USB_VIDEO_IMPL
+   VBoxDD_SOURCES       += \
+        $(PATH_ROOT)/src/VBox/ExtPacks/Puel/UsbWebcam/UsbWebcam.cpp \
+        $(PATH_ROOT)/src/VBox/ExtPacks/Puel/UsbWebcam/UsbWebcamDesc.cpp \
+        $(PATH_ROOT)/src/VBox/ExtPacks/Puel/UsbWebcam/jpggen.cpp \
+        $(PATH_ROOT)/src/VBox/ExtPacks/Puel/UsbWebcam/DrvHostWebcam/DrvHostWebcam.cpp \
+        $(PATH_ROOT)/src/VBox/ExtPacks/Puel/UsbWebcam/DrvHostWebcam/JPEGEnc.cpp
+   $(PATH_ROOT)/src/VBox/ExtPacks/Puel/UsbWebcam/DrvHostWebcam/JPEGEnc.cpp_INCS = \
+        $(PATH_ROOT)/src/libs/jpeg-8a
+   VBoxDD_SOURCES.linux += \
+        $(PATH_ROOT)/src/VBox/ExtPacks/Puel/UsbWebcam/DrvHostWebcam/HostWebcam-v4l2.cpp
+   VBoxDD_SOURCES.win   += \
+        $(PATH_ROOT)/src/VBox/ExtPacks/Puel/UsbWebcam/DrvHostWebcam/HostWebcam-win.cpp
+   VBoxDD_SOURCES.darwin+= \
+        $(PATH_ROOT)/src/VBox/ExtPacks/Puel/UsbWebcam/DrvHostWebcam/HostWebcam-darwin.cpp
+   VBoxDD_LIBS += \
+        $(PATH_STAGE_LIB)/VBox-libjpeg$(VBOX_SUFF_LIB)
   endif
 

trunk/src/VBox/Devices/build/VBoxDD.cpp

@@ -181 +181 @@
         return rc;
 #endif
-
 #ifdef VBOX_WITH_PCI_PASSTHROUGH_IMPL
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DevicePciRaw);
@@ -263 +262 @@
     if (RT_FAILURE(rc))
         return rc;
-#endif /* VBOX_WITH_NETSHAPER */
+#endif
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvAUDIO);
     if (RT_FAILURE(rc))
@@ -273 +272 @@
     if (RT_FAILURE(rc))
         return rc;
-
 #ifdef VBOX_WITH_VUSB
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvVUSBRootHub);
@@ -279 +277 @@
         return rc;
 #endif
-
+#ifdef VBOX_WITH_USB_VIDEO_IMPL
+    rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostWebcam);
+    if (RT_FAILURE(rc))
+        return rc;
+#endif
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvNamedPipe);
     if (RT_FAILURE(rc))
@@ -289 +291 @@
     if (RT_FAILURE(rc))
         return rc;
-
 #if defined(RT_OS_LINUX) || defined(VBOX_WITH_WIN_PARPORT_SUP)
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostParallel);
@@ -295 +296 @@
         return rc;
 #endif
-
 #if defined(RT_OS_DARWIN) || defined(RT_OS_LINUX) || defined(RT_OS_SOLARIS) || defined(RT_OS_WINDOWS) || defined(RT_OS_FREEBSD)
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostSerial);
@@ -301 +301 @@
         return rc;
 #endif
-
 #ifdef VBOX_WITH_SCSI
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvSCSI);
     if (RT_FAILURE(rc))
         return rc;
-
 # if defined(RT_OS_LINUX)
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvSCSIHost);
@@ -312 +310 @@
         return rc;
 # endif
-
-#endif
-
+#endif
 #ifdef VBOX_WITH_DRV_DISK_INTEGRITY
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvDiskIntegrity);
@@ -320 +316 @@
         return rc;
 #endif
-
 #ifdef VBOX_WITH_PCI_PASSTHROUGH_IMPL
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvPciRaw);
@@ -346 +341 @@
     if (RT_FAILURE(rc))
         return rc;
-
 # ifdef VBOX_WITH_SCSI
     rc = pCallbacks->pfnRegister(pCallbacks, &g_UsbMsd);
@@ -353 +347 @@
 # endif
 #endif
-
 #ifdef VBOX_WITH_VUSB
     rc = pCallbacks->pfnRegister(pCallbacks, &g_UsbHidKbd);
     if (RT_FAILURE(rc))
         return rc;
-
     rc = pCallbacks->pfnRegister(pCallbacks, &g_UsbHidMou);
+    if (RT_FAILURE(rc))
+        return rc;
+#endif
+#ifdef VBOX_WITH_USB_VIDEO_IMPL
+    rc = pCallbacks->pfnRegister(pCallbacks, &g_DevWebcam);
     if (RT_FAILURE(rc))
         return rc;

trunk/src/VBox/Devices/build/VBoxDD.h

@@ -114 +114 @@
 extern const PDMDRVREG g_DrvAcpiCpu;
 extern const PDMDRVREG g_DrvVUSBRootHub;
+#ifdef VBOX_WITH_USB_VIDEO_IMPL
+extern const PDMDRVREG g_DrvHostWebcam;
+#endif
 extern const PDMDRVREG g_DrvChar;
 extern const PDMDRVREG g_DrvNamedPipe;
@@ -135 +138 @@
 extern const PDMUSBREG g_UsbHidMou;
 #endif
+#ifdef VBOX_WITH_USB_VIDEO_IMPL
+extern const PDMUSBREG g_DevWebcam;
+#endif
 
 #ifdef VBOX_WITH_SCSI