Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
8d4f636d
Commit
8d4f636d
authored
Jan 13, 2013
by
Damjan Jovanovic
Committed by
Alexandre Julliard
Jan 14, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
qcap: Use libv4l1.h when available, instead of linux/videodev.h which is deprecated/obsolete.
parent
19f9420f
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
6 deletions
+11
-6
configure
configure
+1
-1
configure.ac
configure.ac
+1
-1
v4l.c
dlls/qcap/v4l.c
+5
-3
yuv.c
dlls/qcap/yuv.c
+1
-1
config.h.in
include/config.h.in
+3
-0
No files found.
configure
View file @
8d4f636d
...
...
@@ -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
...
...
configure.ac
View file @
8d4f636d
...
...
@@ -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
...
...
dlls/qcap/v4l.c
View file @
8d4f636d
...
...
@@ -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
);
#if
def 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
*/
dlls/qcap/yuv.c
View file @
8d4f636d
...
...
@@ -32,7 +32,7 @@
#include "wine/debug.h"
/* This is not used if V4L support is missing */
#if
def HAVE_LINUX_VIDEODEV_H
#if
defined(HAVE_LINUX_VIDEODEV_H) || defined(HAVE_LIBV4L1_H)
WINE_DEFAULT_DEBUG_CHANNEL
(
qcap
);
...
...
include/config.h.in
View file @
8d4f636d
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment