qcap: Port to libv4l2.

configure

@@ -870,7 +870,7 @@ with_sane
 with_sdl
 with_tiff
 with_udev
-with_v4l
+with_v4l2
 with_vkd3d
 with_vulkan
 with_xcomposite
@@ -2541,7 +2541,7 @@ Optional Packages:
   --without-sdl           do not use SDL
   --without-tiff          do not use TIFF
   --without-udev          do not use udev (plug and play support)
-  --without-v4l           do not use v4l1 (v4l support)
+  --without-v4l2          do not use v4l2 (video capture)
   --without-vkd3d         do not use vkd3d (Direct3D 12 support)
   --without-vulkan        do not use Vulkan
   --without-xcomposite    do not use the Xcomposite extension
@@ -4045,9 +4045,9 @@ if test "${with_udev+set}" = set; then :
 fi
 
 
-# Check whether --with-v4l was given.
-if test "${with_v4l+set}" = set; then :
-  withval=$with_v4l;
+# Check whether --with-v4l2 was given.
+if test "${with_v4l2+set}" = set; then :
+  withval=$with_v4l2;
 fi
 
 
@@ -7734,10 +7734,9 @@ fi
 done
 
 
-for ac_header in linux/videodev.h linux/videodev2.h libv4l1.h
+for ac_header in linux/videodev2.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
+  ac_fn_c_check_header_compile "$LINENO" "linux/videodev2.h" "ac_cv_header_linux_videodev2_h" "#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #include <sys/types.h>
@@ -7745,9 +7744,9 @@ ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#ifdef HAVE
 #include <asm/types.h>
 #endif
 "
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+if test "x$ac_cv_header_linux_videodev2_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_LINUX_VIDEODEV2_H 1
 _ACEOF
 
 fi
@@ -13483,15 +13482,15 @@ esac
 
 fi
 
-if test "x$with_v4l" != "xno"
+if test "x$with_v4l2" != "xno"
 then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lv4l1" >&5
-$as_echo_n "checking for -lv4l1... " >&6; }
-if ${ac_cv_lib_soname_v4l1+:} false; then :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lv4l2" >&5
+$as_echo_n "checking for -lv4l2... " >&6; }
+if ${ac_cv_lib_soname_v4l2+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_soname_save_LIBS=$LIBS
-LIBS="-lv4l1  $LIBS"
+LIBS="-lv4l2  $LIBS"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -13501,22 +13500,22 @@ LIBS="-lv4l1  $LIBS"
 #ifdef __cplusplus
 extern "C"
 #endif
-char v4l1_open ();
+char v4l2_open ();
 int
 main ()
 {
-return v4l1_open ();
+return v4l2_open ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   case "$LIBEXT" in
-    dll) ac_cv_lib_soname_v4l1=`$ac_cv_path_LDD conftest.exe | grep "v4l1" | sed -e "s/dll.*/dll/"';2,$d'` ;;
-    dylib) ac_cv_lib_soname_v4l1=`$OTOOL -L conftest$ac_exeext | grep "libv4l1\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libv4l1\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
-    *) ac_cv_lib_soname_v4l1=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libv4l1\\.$LIBEXT" | sed -e "s/^.*\\[\\(libv4l1\\.$LIBEXT[^	 ]*\\)\\].*$/\1/"';2,$d'`
-       if ${ac_cv_lib_soname_v4l1:+false} :; then :
-  ac_cv_lib_soname_v4l1=`$LDD conftest$ac_exeext | grep "libv4l1\\.$LIBEXT" | sed -e "s/^.*\(libv4l1\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'`
+    dll) ac_cv_lib_soname_v4l2=`$ac_cv_path_LDD conftest.exe | grep "v4l2" | sed -e "s/dll.*/dll/"';2,$d'` ;;
+    dylib) ac_cv_lib_soname_v4l2=`$OTOOL -L conftest$ac_exeext | grep "libv4l2\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libv4l2\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
+    *) ac_cv_lib_soname_v4l2=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libv4l2\\.$LIBEXT" | sed -e "s/^.*\\[\\(libv4l2\\.$LIBEXT[^	 ]*\\)\\].*$/\1/"';2,$d'`
+       if ${ac_cv_lib_soname_v4l2:+false} :; then :
+  ac_cv_lib_soname_v4l2=`$LDD conftest$ac_exeext | grep "libv4l2\\.$LIBEXT" | sed -e "s/^.*\(libv4l2\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'`
 fi ;;
   esac
 fi
@@ -13524,27 +13523,27 @@ rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
   LIBS=$ac_check_soname_save_LIBS
 fi
-if ${ac_cv_lib_soname_v4l1:+false} :; then :
+if ${ac_cv_lib_soname_v4l2:+false} :; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 $as_echo "not found" >&6; }
 
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_v4l1" >&5
-$as_echo "$ac_cv_lib_soname_v4l1" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_v4l2" >&5
+$as_echo "$ac_cv_lib_soname_v4l2" >&6; }
 
 cat >>confdefs.h <<_ACEOF
-#define SONAME_LIBV4L1 "$ac_cv_lib_soname_v4l1"
+#define SONAME_LIBV4L2 "$ac_cv_lib_soname_v4l2"
 _ACEOF
 
 
 fi
 fi
-if test "x$ac_cv_lib_soname_v4l1" = "x"; then :
-  case "x$with_v4l" in
-  x)   as_fn_append wine_notices "|libv4l ${notice_platform}development files not found." ;;
+if test "x$ac_cv_lib_soname_v4l2" = "x"; then :
+  case "x$with_v4l2" in
+  x)   as_fn_append wine_notices "|libv4l2 ${notice_platform}development files not found." ;;
   xno) ;;
-  *)   as_fn_error $? "libv4l ${notice_platform}development files not found.
-This is an error since --with-v4l was requested." "$LINENO" 5 ;;
+  *)   as_fn_error $? "libv4l2 ${notice_platform}development files not found.
+This is an error since --with-v4l2 was requested." "$LINENO" 5 ;;
 esac
 
 fi

configure.ac

@@ -81,7 +81,7 @@ AC_ARG_WITH(sane,      AS_HELP_STRING([--without-sane],[do not use SANE (scanner
 AC_ARG_WITH(sdl,       AS_HELP_STRING([--without-sdl],[do not use SDL]))
 AC_ARG_WITH(tiff,      AS_HELP_STRING([--without-tiff],[do not use TIFF]))
 AC_ARG_WITH(udev,      AS_HELP_STRING([--without-udev],[do not use udev (plug and play support)]))
-AC_ARG_WITH(v4l,       AS_HELP_STRING([--without-v4l],[do not use v4l1 (v4l support)]))
+AC_ARG_WITH(v4l2,      AS_HELP_STRING([--without-v4l2],[do not use v4l2 (video capture)]))
 AC_ARG_WITH(vkd3d,     AS_HELP_STRING([--without-vkd3d],[do not use vkd3d (Direct3D 12 support)]))
 AC_ARG_WITH(vulkan,    AS_HELP_STRING([--without-vulkan],[do not use Vulkan]))
 AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]),
@@ -674,7 +674,7 @@ AC_CHECK_HEADERS([pthread_np.h],,,
 #include <pthread.h>
 #endif])
 
-AC_CHECK_HEADERS([linux/videodev.h linux/videodev2.h libv4l1.h],,,
+AC_CHECK_HEADERS([linux/videodev2.h],,,
 [#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
@@ -1417,13 +1417,13 @@ fi
 WINE_NOTICE_WITH(sane,[test "x$ac_cv_lib_soname_sane" = "x"],
                  [libsane ${notice_platform}development files not found, scanners won't be supported.])
 
-dnl **** Check for libv4l1 ****
-if test "x$with_v4l" != "xno"
+dnl **** Check for libv4l2 ****
+if test "x$with_v4l2" != "xno"
 then
-    WINE_CHECK_SONAME(v4l1,v4l1_open,,,)
+    WINE_CHECK_SONAME(v4l2,v4l2_open)
 fi
-WINE_NOTICE_WITH(v4l,[test "x$ac_cv_lib_soname_v4l1" = "x"],
-                 [libv4l ${notice_platform}development files not found.])
+WINE_NOTICE_WITH(v4l2,[test "x$ac_cv_lib_soname_v4l2" = "x"],
+                 [libv4l2 ${notice_platform}development files not found.])
 
 dnl **** Check for libgphoto2 ****
 if test "x$with_gphoto" != "xno"

dlls/qcap/qcap_main.h

@@ -20,6 +20,7 @@
 #ifndef _QCAP_MAIN_H_DEFINED
 #define _QCAP_MAIN_H_DEFINED
 
+#include "wine/heap.h"
 #include "wine/strmbase.h"
 
 extern DWORD ObjectRefCount(BOOL increment) DECLSPEC_HIDDEN;

dlls/qcap/yuv.c

@@ -32,7 +32,7 @@
 #include "wine/debug.h"
 
 /* This is not used if V4L support is missing */
-#if defined(HAVE_LINUX_VIDEODEV_H) || defined(HAVE_LIBV4L1_H)
+#ifdef HAVE_LINUX_VIDEODEV2_H
 
 WINE_DEFAULT_DEBUG_CHANNEL(qcap);
 

include/config.h.in

@@ -411,9 +411,6 @@
 /* Define to 1 if you have the <libunwind.h> header file. */
 #undef HAVE_LIBUNWIND_H
 
-/* 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
 
@@ -501,9 +498,6 @@
 /* Define to 1 if you have the <linux/videodev2.h> header file. */
 #undef HAVE_LINUX_VIDEODEV2_H
 
-/* Define to 1 if you have the <linux/videodev.h> header file. */
-#undef HAVE_LINUX_VIDEODEV_H
-
 /* Define to 1 if you have the `llrint' function. */
 #undef HAVE_LLRINT
 
@@ -1410,8 +1404,8 @@
 /* Define to the soname of the libtiff library. */
 #undef SONAME_LIBTIFF
 
-/* Define to the soname of the libv4l1 library. */
-#undef SONAME_LIBV4L1
+/* Define to the soname of the libv4l2 library. */
+#undef SONAME_LIBV4L2
 
 /* Define to the soname of the libvkd3d library. */
 #undef SONAME_LIBVKD3D