Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Zsolt Vadász
wine
Commits
8d4f636d
Commit
8d4f636d
authored
12 years ago
by
Damjan Jovanovic
Committed by
Alexandre Julliard
12 years ago
Browse files
Options
Downloads
Patches
Plain Diff
qcap: Use libv4l1.h when available, instead of linux/videodev.h which is deprecated/obsolete.
parent
19f9420f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
configure
+1
-1
1 addition, 1 deletion
configure
configure.ac
+1
-1
1 addition, 1 deletion
configure.ac
dlls/qcap/v4l.c
+5
-3
5 additions, 3 deletions
dlls/qcap/v4l.c
dlls/qcap/yuv.c
+1
-1
1 addition, 1 deletion
dlls/qcap/yuv.c
include/config.h.in
+3
-0
3 additions, 0 deletions
include/config.h.in
with
11 additions
and
6 deletions
configure
+
1
−
1
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
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
1
−
1
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
...
...
This diff is collapsed.
Click to expand it.
dlls/qcap/v4l.c
+
5
−
3
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
);
#ifdef
HAVE_LINUX_VIDEODEV_H
#if
def
ined(
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
*/
This diff is collapsed.
Click to expand it.
dlls/qcap/yuv.c
+
1
−
1
View file @
8d4f636d
...
...
@@ -32,7 +32,7 @@
#include
"wine/debug.h"
/* This is not used if V4L support is missing */
#ifdef
HAVE_LINUX_VIDEODEV_H
#if
def
ined(
HAVE_LINUX_VIDEODEV_H
) || defined(HAVE_LIBV4L1_H)
WINE_DEFAULT_DEBUG_CHANNEL
(
qcap
);
...
...
This diff is collapsed.
Click to expand it.
include/config.h.in
+
3
−
0
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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment