Browse Source

need HAVE_VIDEO4LINUX

David Rose 15 years ago
parent
commit
060217dcdd

+ 4 - 0
dtool/Config.pp

@@ -476,6 +476,10 @@
 // to empty if you lack this header file.
 #define PHAVE_JPEGINT_H 1
 
+// Do you want to compile video-for-linux?  If you have an older Linux
+// system with incompatible headers, define this to empty string.
+#defer HAVE_VIDEO4LINUX $[IS_LINUX]
+
 // Is libpng installed, and where?
 #define PNG_IPATH
 #define PNG_LPATH

+ 3 - 0
dtool/LocalSetup.pp

@@ -281,6 +281,9 @@ $[cdefine REPORT_OPENSSL_ERRORS]
 $[cdefine HAVE_JPEG]
 $[cdefine PHAVE_JPEGINT_H]
 
+/* Define to build video-for-linux. */
+$[cdefine HAVE_VIDEO4LINUX]
+
 /* Define if we have libpng installed.  */
 $[cdefine HAVE_PNG]
 

+ 3 - 0
makepanda/makepanda.py

@@ -1358,6 +1358,7 @@ DTOOL_CONFIG=[
     ("HAVE_PNG",                       'UNDEF',                  'UNDEF'),
     ("HAVE_JPEG",                      'UNDEF',                  'UNDEF'),
     ("PHAVE_JPEGINT_H",                '1',                      '1'),
+    ("HAVE_VIDEO4LINUX",               'UNDEF',                  '1'),
     ("HAVE_TIFF",                      'UNDEF',                  'UNDEF'),
     ("HAVE_SGI_RGB",                   '1',                      '1'),
     ("HAVE_TGA",                       '1',                      '1'),
@@ -1454,10 +1455,12 @@ def WriteConfigSettings():
         dtool_config["HAVE_XF86DGA"] = 'UNDEF'
         dtool_config["HAVE_GLX"] = 'UNDEF'
         dtool_config["IS_LINUX"] = 'UNDEF'
+        dtool_config["HAVE_VIDEO4LINUX"] = 'UNDEF'
         dtool_config["IS_OSX"] = '1'
 
     if (sys.platform.startswith("freebsd")):
         dtool_config["IS_LINUX"] = 'UNDEF'
+        dtool_config["HAVE_VIDEO4LINUX"] = 'UNDEF'
         dtool_config["IS_FREEBSD"] = '1'
         dtool_config["PHAVE_ALLOCA_H"] = 'UNDEF'
         dtool_config["PHAVE_MALLOC_H"] = 'UNDEF'

+ 1 - 1
panda/src/vision/config_vision.cxx

@@ -46,7 +46,7 @@ init_libvision() {
   initialized = true;
 
   WebcamVideo::init_type();
-#ifdef IS_LINUX
+#ifdef HAVE_VIDEO4LINUX
   WebcamVideoCursorV4L::init_type();
   WebcamVideoV4L::init_type();
 #endif

+ 1 - 1
panda/src/vision/webcamVideo.cxx

@@ -55,7 +55,7 @@ find_all_webcams() {
   find_all_webcams_ds();
 #endif
 
-#ifdef IS_LINUX
+#ifdef HAVE_VIDEO4LINUX
   extern void find_all_webcams_v4l();
   find_all_webcams_v4l();
 #endif

+ 1 - 1
panda/src/vision/webcamVideoCursorV4L.cxx

@@ -14,7 +14,7 @@
 
 #include "webcamVideoV4L.h"
 
-#ifdef IS_LINUX
+#ifdef HAVE_VIDEO4LINUX
 
 #include <fcntl.h>
 #include <sys/mman.h>

+ 2 - 2
panda/src/vision/webcamVideoCursorV4L.h

@@ -17,7 +17,7 @@
 
 #include "pandabase.h"
 
-#ifdef IS_LINUX
+#ifdef HAVE_VIDEO4LINUX
 
 #include "webcamVideo.h"
 
@@ -69,6 +69,6 @@ private:
   static TypeHandle _type_handle;
 };
 
-#endif // IS_LINUX
+#endif // HAVE_VIDEO4LINUX
 
 #endif

+ 1 - 1
panda/src/vision/webcamVideoV4L.cxx

@@ -14,7 +14,7 @@
 
 #include "webcamVideoV4L.h"
 
-#ifdef IS_LINUX
+#ifdef HAVE_VIDEO4LINUX
 
 #include "webcamVideoCursorV4L.h"
 #include "dcast.h"

+ 2 - 2
panda/src/vision/webcamVideoV4L.h

@@ -17,7 +17,7 @@
 
 #include "pandabase.h"
 
-#ifdef IS_LINUX
+#ifdef HAVE_VIDEO4LINUX
 
 #include "webcamVideo.h"
 
@@ -55,6 +55,6 @@ private:
   static TypeHandle _type_handle;
 };
 
-#endif // IS_LINUX
+#endif // HAVE_VIDEO4LINUX
 
 #endif