diff options
| author | Tom Schouten <doelie@users.sourceforge.net> | 2011-11-29 17:13:48 +0000 |
|---|---|---|
| committer | Tom Schouten <doelie@users.sourceforge.net> | 2011-11-29 17:13:48 +0000 |
| commit | 325d6ba1c380fc2d57923f7282d73d4d4224639e (patch) | |
| tree | 30e5aea37d6b227defa6024aaf0a22f5e66b4e62 | |
| parent | 6e2552bbb95b0c58ef9e7ab1021f4f3d85176109 (diff) | |
pdp: v4l build fixes
svn path=/trunk/externals/pdp/; revision=15805
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | modules/image_io/pdp_v4l.c | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index d5359ad..15d686a 100644 --- a/configure.ac +++ b/configure.ac @@ -168,8 +168,8 @@ else if test "x$have_libv4l" = "xyes" then AC_DEFINE(HAVE_PDP_LIBV4L, 1, [build pdp_v4l with libv4l]) - PDP_V4L_CFLAGS="`pkg-config --cflags libv4l`" - PDP_V4L_LIBS="`pkg-config --libs libv4l`" + PDP_V4L_CFLAGS="`pkg-config --cflags libv4l 2>/dev/null || pkg-config --cflags libv4l2`" + PDP_V4L_LIBS="`pkg-config --libs libv4l 2>/dev/null || pkg-config --libs libv4l2`" else PDP_V4L_CFLAGS="" PDP_V4L_LIBS="" diff --git a/modules/image_io/pdp_v4l.c b/modules/image_io/pdp_v4l.c index 12d527c..c0e4a72 100644 --- a/modules/image_io/pdp_v4l.c +++ b/modules/image_io/pdp_v4l.c @@ -38,10 +38,9 @@ #ifdef HAVE_LIBV4L1_VIDEODEV_H # include <libv4l1-videodev.h> -#elif 1 //defined HAVE_LINUX_VIDEODEV_H -# include <linux/videodev.h> #else -# error cannot compile pdp_v4l without new kernel and without libv4l-dev +# warning trying to use deprecated V4L-1 API +# include <linux/videodev.h> #endif #include <sys/mman.h> |