- Updated to 1.3.25 development snapshot
- Rewrite of the audio support, using the Win7 architecture. - Old-style sound drivers for Jack, NAS and ESD are removed. - Graphics driver architecture changes for the DIB engine. - Improved handling of the shell recycle bin. - Better joystick support in DirectInput. - Initial stub for VBScript support. - Various bug fixes. OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=97
This commit is contained in:
@@ -5,7 +5,6 @@ Subject: [PATCH] libv4l: Fixed videodev.h header moving away from glibc to libv4
|
||||
|
||||
---
|
||||
configure.ac | 9 +++++++++
|
||||
dlls/avicap32/avicap32_main.c | 10 +++++++---
|
||||
dlls/qcap/v4l.c | 8 ++++++--
|
||||
dlls/qcap/yuv.c | 2 +-
|
||||
4 files changed, 23 insertions(+), 6 deletions(-)
|
||||
@@ -30,48 +29,6 @@ index 0e86713..8df9993 100644
|
||||
dnl Check for broken kernel header that doesn't define __user
|
||||
AC_CHECK_HEADERS([linux/capi.h],,,[#define __user])
|
||||
|
||||
diff --git a/dlls/avicap32/avicap32_main.c b/dlls/avicap32/avicap32_main.c
|
||||
index 349ee5d..d6a9609 100644
|
||||
--- a/dlls/avicap32/avicap32_main.c
|
||||
+++ b/dlls/avicap32/avicap32_main.c
|
||||
@@ -40,6 +40,10 @@
|
||||
#endif
|
||||
#ifdef HAVE_LINUX_VIDEODEV_H
|
||||
# include <linux/videodev.h>
|
||||
+#else
|
||||
+# ifdef HAVE_LIBV4L1_VIDEODEV_H
|
||||
+# include <libv4l1-videodev.h>
|
||||
+# endif
|
||||
#endif
|
||||
#ifdef HAVE_UNISTD_H
|
||||
# include <unistd.h>
|
||||
@@ -91,7 +95,7 @@ HWND VFWAPI capCreateCaptureWindowA(LPCSTR lpszWindowName, DWORD dwStyle, INT x,
|
||||
return retW;
|
||||
}
|
||||
|
||||
-#ifdef HAVE_LINUX_VIDEODEV_H
|
||||
+#if defined(HAVE_LINUX_VIDEODEV_H) || defined(HAVE_LIBV4L1_VIDEODEV_H)
|
||||
|
||||
static int xioctl(int fd, int request, void * arg)
|
||||
{
|
||||
@@ -163,7 +167,7 @@ static BOOL query_video_device(int devnum, char *name, int namesize, char *versi
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
-#else /* HAVE_LINUX_VIDEODEV_H */
|
||||
+#else /* HAVE_LINUX_VIDEODEV_H || HAVE_LIBV4L1_VIDEODEV_H */
|
||||
|
||||
static BOOL query_video_device(int devnum, char *name, int namesize, char *version, int versionsize)
|
||||
{
|
||||
@@ -171,7 +175,7 @@ static BOOL query_video_device(int devnum, char *name, int namesize, char *versi
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
-#endif /* HAVE_LINUX_VIDEODEV_H */
|
||||
+#endif /* HAVE_LINUX_VIDEODEV_H | HAVE_LIBV4L1_VIDEODEV_H */
|
||||
|
||||
/***********************************************************************
|
||||
* capGetDriverDescriptionA (AVICAP32.@)
|
||||
diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c
|
||||
index fadcd49..0d35cfe 100644
|
||||
--- a/dlls/qcap/v4l.c
|
||||
|
Reference in New Issue
Block a user