TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 01:07:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

need HAVE_VIDEO4LINUX

Browse Source
This commit is contained in:
David Rose 2010-08-29 17:53:17 +00:00
parent cec641bea1
commit 060217dcdd
9 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dtool/Config.pp
View File

@ -476,6 +476,10 @@
// to empty if you lack this header file. // to empty if you lack this header file.
#define PHAVE_JPEGINT_H 1 #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? // Is libpng installed, and where?
#define PNG_IPATH #define PNG_IPATH
#define PNG_LPATH #define PNG_LPATH

3
dtool/LocalSetup.pp
View File

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

3
makepanda/makepanda.py
View File

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

2
panda/src/vision/config_vision.cxx
View File

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

2
panda/src/vision/webcamVideo.cxx
View File

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

2
panda/src/vision/webcamVideoCursorV4L.cxx
View File

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

4
panda/src/vision/webcamVideoCursorV4L.h
View File

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

2
panda/src/vision/webcamVideoV4L.cxx
View File

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

4
panda/src/vision/webcamVideoV4L.h
View File

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