From 5e5cb766de14b12c21ee1077e04d4880dfd39040 Mon Sep 17 00:00:00 2001 From: Zaheer Abbas Merali Date: Wed, 7 Sep 2005 08:31:09 +0000 Subject: [PATCH] configure.ac: v4l2 is no longer in gst-plugins-base Original commit message from CVS: 2005-09-07 Zaheer Abbas Merali * configure.ac: v4l2 is no longer in gst-plugins-base --- ChangeLog | 5 +++++ configure.ac | 48 ------------------------------------------------ 2 files changed, 5 insertions(+), 48 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8513a3f30d..69903e576e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-09-07 Zaheer Abbas Merali + + * configure.ac: + v4l2 is no longer in gst-plugins-base + 2005-09-07 Jan Schmidt * configure.ac: diff --git a/configure.ac b/configure.ac index 40d9df8f33..201f9f762c 100644 --- a/configure.ac +++ b/configure.ac @@ -457,54 +457,6 @@ GST_CHECK_FEATURE(GST_V4L, [Video 4 Linux], v4lsrc v4lmjpegsrc v4lmjpegsink, [ fi ]) -dnl *** Video 4 Linux 2 *** -dnl for information about the header/define, see sys/v4l2/gstv4l2element.h -dnl renamed to GST_V4L2 because of some conflict with kernel headers -translit(dnm, m, l) AM_CONDITIONAL(USE_GST_V4L2, true) -GST_CHECK_FEATURE(GST_V4L2, [Video 4 Linux 2], v4l2src, [ - HAVE_GST_V4L2="no" - if test "$HAVE_X" = "yes" - then - AC_MSG_CHECKING([Checking for uptodate v4l2 installation]) - AC_TRY_COMPILE([ -#include -#include -#define _LINUX_TIME_H -#define __user -#include -#if defined(V4L2_MAJOR_VERSION) || defined(V4L2_MINOR_VERSION) -#error too early v4l2 version or no v4l2 at all -#endif - ], [ -return 0; - ], [ HAVE_GST_V4L2="yes" && AC_MSG_RESULT(yes)], - [ HAVE_GST_V4L2="no" && AC_MSG_RESULT(no) && - AC_CHECK_HEADER(linux/videodev2.h, - [ AC_MSG_WARN([video4linux2 headers were found, but they're old. Please update v4l2 to compile the v4l2 plugins])], - [ AC_MSG_WARN([video4linux2 was not found])]) - ]) - fi - dnl check for missing v4l2_buffer declaration (see #135919) - if [ test x$HAVE_GST_V4L2 = xyes ]; then - MISSING_DECL=0 - AC_MSG_CHECKING(struct v4l2_buffer declaration) - AC_TRY_COMPILE([ -#include -#include -#define _LINUX_TIME_H -#define __user -#include - ],[ -struct v4l2_buffer buf; -buf.index = 0; -return 0; - ], [ AC_MSG_RESULT(yes) ], [ MISSING_DECL=1 && AC_MSG_RESULT(no) ]) - if [ test x$MISSING_DECL = x1 ]; then - AC_DEFINE(GST_V4L2_MISSING_BUFDECL, 1, [struct v4l2_buffer missing]) - fi - fi -]) - dnl Next, check for the optional libraries: dnl These are all libraries used in building plug-ins dnl ================================================