git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 From b77d4806fd5de50d0b017a3e6a19c5bfdef7b3e4 Mon Sep 17 00:00:00 2001
   2 From: Khem Raj <raj.khem@gmail.com>
   3 Date: Mon, 13 Feb 2023 12:47:31 -0800
   4 Subject: [PATCH] v4l2: Define ioctl_req_t for posix/linux case
   5
   6 this is an issue seen with musl based linux distros e.g. alpine [1]
   7 musl is not going to change this since it breaks ABI/API interfaces
   8 Newer compilers are stringent ( e.g. clang16 ) which can now detect
   9 signature mismatches in function pointers too, existing code warned but
  10 did not error with older clang
  11
  12 Fixes
  13 gstv4l2object.c:544:23: error: incompatible function pointer types assigning to 'gint (*)(gint, ioctl_req_t, ...)' (aka 'int (*)(int, unsigned long, ...)') from 'int (int, int, ...)' [-Wincompatible-function-pointer-types]
  14     v4l2object->ioctl = ioctl;
  15                       ^ ~~~~~
  16
  17 [1] https://gitlab.alpinelinux.org/alpine/aports/-/issues/7580
  18
  19 Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3950]
  20 Signed-off-by: Khem Raj <raj.khem@gmail.com>
  21
  22 ---
  23  sys/v4l2/gstv4l2object.h | 2 ++
  24  1 file changed, 2 insertions(+)
  25
  26 diff --git a/sys/v4l2/gstv4l2object.h b/sys/v4l2/gstv4l2object.h
  27 index d95b375..5223cbb 100644
  28 --- a/sys/v4l2/gstv4l2object.h
  29 +++ b/sys/v4l2/gstv4l2object.h
  30 @@ -76,6 +76,8 @@ typedef gboolean  (*GstV4l2UpdateFpsFunction) (GstV4l2Object * v4l2object);
  31   * 'unsigned long' for the 2nd parameter */
  32  #ifdef __ANDROID__
  33  typedef unsigned ioctl_req_t;
  34 +#elif defined(__linux__) && !defined(__GLIBC__) /* musl/linux */
  35 +typedef int ioctl_req_t;
  36  #else
  37  typedef gulong ioctl_req_t;
  38  #endif