virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

configure: rename POSIX ioctl check

Browse Source 
Commit 00b64fca55 introduced configure
detection for HAVE_POSIX_IOCTL but unfortunately this conflicts with
v4l-utils version 1.30, which itself checks for #ifdef HAVE_POSIX_IOCTL
in a public header and erroneously determines it to be true because we
define this to be 0.

Since this is only used for avdevice/v4l2, we rename this to something
else, namely ioctl_posix, simply to prevent the name conflict with the
file /usr/include/libv4l2.h at least until they can upstream a fix on
their end.

Signed-off-by: Leo Izen <leo.izen@gmail.com>
This commit is contained in:
Leo Izen
2025-06-06 16:09:34 -04:00
parent ebcf2dcb2c
commit 5fea5e3e11
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -2533,6 +2533,7 @@ HAVE_LIST="
$TOOLCHAIN_FEATURES $TOOLCHAIN_FEATURES
$TYPES_LIST $TYPES_LIST
gzip gzip
ioctl_posix
libdrm_getfb2 libdrm_getfb2
makeinfo makeinfo
makeinfo_html makeinfo_html
@ -2545,7 +2546,6 @@ HAVE_LIST="
opencl_videotoolbox opencl_videotoolbox
perl perl
pod2man pod2man
posix_ioctl
texi2html texi2html
xmllint xmllint
zlib_gzip zlib_gzip
@ -7275,7 +7275,7 @@ xmllint --version > /dev/null 2>&1 && enable xmllint || disable xmllint
check_headers linux/fb.h check_headers linux/fb.h
check_headers linux/videodev2.h check_headers linux/videodev2.h
test_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_sanitized struct_v4l2_frmivalenum_discrete test_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_sanitized struct_v4l2_frmivalenum_discrete
test_code cc sys/ioctl.h "int ioctl(int, int, ...)" && enable posix_ioctl test_code cc sys/ioctl.h "int ioctl(int, int, ...)" && enable ioctl_posix
# check V4L2 codecs available in the API # check V4L2 codecs available in the API
if enabled v4l2_m2m; then if enabled v4l2_m2m; then

2
libavdevice/v4l2.c
View File

@ -111,7 +111,7 @@ struct video_data {
int (*open_f)(const char *file, int oflag, ...); int (*open_f)(const char *file, int oflag, ...);
int (*close_f)(int fd); int (*close_f)(int fd);
int (*dup_f)(int fd); int (*dup_f)(int fd);
#if HAVE_POSIX_IOCTL #if HAVE_IOCTL_POSIX
int (*ioctl_f)(int fd, int request, ...); int (*ioctl_f)(int fd, int request, ...);
#else #else
int (*ioctl_f)(int fd, unsigned long int request, ...); int (*ioctl_f)(int fd, unsigned long int request, ...);