ffmpeg | branch: master | Leo Izen <leo.i...@gmail.com> | Fri Jun 6 16:09:34 2025 -0400| [5fea5e3e11d6ff425db48f44489916399822aece] | committer: Leo Izen
configure: rename POSIX ioctl check Commit 00b64fca55a3a009c9d0e391c85f4fd3291e5d12 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.i...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5fea5e3e11d6ff425db48f44489916399822aece --- configure | 4 ++-- libavdevice/v4l2.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index de1b88150f..534b443f7d 100755 --- a/configure +++ b/configure @@ -2533,6 +2533,7 @@ HAVE_LIST=" $TOOLCHAIN_FEATURES $TYPES_LIST gzip + ioctl_posix libdrm_getfb2 makeinfo makeinfo_html @@ -2545,7 +2546,6 @@ HAVE_LIST=" opencl_videotoolbox perl pod2man - posix_ioctl texi2html xmllint zlib_gzip @@ -7275,7 +7275,7 @@ xmllint --version > /dev/null 2>&1 && enable xmllint || disable xmllint check_headers linux/fb.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 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 if enabled v4l2_m2m; then diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 0ae6872338..c38ecbb378 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -111,7 +111,7 @@ struct video_data { int (*open_f)(const char *file, int oflag, ...); int (*close_f)(int fd); int (*dup_f)(int fd); -#if HAVE_POSIX_IOCTL +#if HAVE_IOCTL_POSIX int (*ioctl_f)(int fd, int request, ...); #else int (*ioctl_f)(int fd, unsigned long int request, ...); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
