qcap: Use libv4l1.h when available, instead of linux/videodev.h which is deprecated/obsolete.

This commit is contained in:
Damjan Jovanovic 2013-01-13 21:06:14 +02:00 committed by Alexandre Julliard
parent 19f9420f62
commit 8d4f636d54
5 changed files with 11 additions and 6 deletions

2
configure vendored
View File

@ -6251,7 +6251,7 @@ fi
done
for ac_header in linux/videodev.h linux/videodev2.h
for ac_header in linux/videodev.h linux/videodev2.h libv4l1.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#ifdef HAVE_SYS_TIME_H

View File

@ -667,7 +667,7 @@ AC_CHECK_HEADERS([pthread_np.h],,,
#include <pthread.h>
#endif])
AC_CHECK_HEADERS([linux/videodev.h linux/videodev2.h],,,
AC_CHECK_HEADERS([linux/videodev.h linux/videodev2.h libv4l1.h],,,
[#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif

View File

@ -45,7 +45,9 @@
#ifdef HAVE_ASM_TYPES_H
#include <asm/types.h>
#endif
#ifdef HAVE_LINUX_VIDEODEV_H
#ifdef HAVE_LIBV4L1_H
#include <libv4l1.h>
#elif defined(HAVE_LINUX_VIDEODEV_H)
#include <linux/videodev.h>
#endif
#ifdef HAVE_UNISTD_H
@ -68,7 +70,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(qcap_v4l);
#ifdef HAVE_LINUX_VIDEODEV_H
#if defined(HAVE_LINUX_VIDEODEV_H) || defined(HAVE_LIBV4L1_H)
static typeof(open) *video_open = open;
static typeof(close) *video_close = close;
@ -994,4 +996,4 @@ HRESULT qcap_driver_stop(Capture *capBox, FILTER_STATE *state)
FAIL_WITH_ERR;
}
#endif /* HAVE_LINUX_VIDEODEV_H */
#endif /* HAVE_LINUX_VIDEODEV_H || HAVE_LINUX_LIBV4L1_H */

View File

@ -32,7 +32,7 @@
#include "wine/debug.h"
/* This is not used if V4L support is missing */
#ifdef HAVE_LINUX_VIDEODEV_H
#if defined(HAVE_LINUX_VIDEODEV_H) || defined(HAVE_LIBV4L1_H)
WINE_DEFAULT_DEBUG_CHANNEL(qcap);

View File

@ -347,6 +347,9 @@
/* Define to 1 if you have the `ossaudio' library (-lossaudio). */
#undef HAVE_LIBOSSAUDIO
/* Define to 1 if you have the <libv4l1.h> header file. */
#undef HAVE_LIBV4L1_H
/* Define if you have the libxml2 library */
#undef HAVE_LIBXML2