SHA256
1
0
forked from pool/wine

- 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:
Marcus Meissner 2011-07-23 09:07:00 +00:00 committed by Git OBS Bridge
parent cac093d394
commit c1ff9900ea
5 changed files with 16 additions and 47 deletions

View File

@ -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

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:942872dbe4746e7eace1bda070a32c16afbb7e06acd14530cbe6f956bcf48a5d
size 19525589

3
wine-1.3.25.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:04376e22a88a729855885414d21e6ba681d1fd938279a8d23d2280a009f4c783
size 19580626

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Sat Jul 23 11:06:06 CEST 2011 - meissner@suse.de
- 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.
-------------------------------------------------------------------
Fri Jul 8 22:34:27 CEST 2011 - meissner@suse.de

View File

@ -34,7 +34,7 @@ BuildRequires: gstreamer-0_10-plugins-base-devel
License: LGPLv2.1+
Group: System/Emulators/PC
AutoReqProv: on
Version: 1.3.24
Version: 1.3.25
Release: 1
Summary: An MS Windows Emulator
Url: http://www.winehq.com