From c1ff9900eaf0827860e727187d4d8ab89a7f7de3ad443c7361c3e2d3809f9b5a Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Sat, 23 Jul 2011 09:07:00 +0000
Subject: [PATCH] - 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
---
 susepatches.patch   | 43 -------------------------------------------
 wine-1.3.24.tar.bz2 |  3 ---
 wine-1.3.25.tar.bz2 |  3 +++
 wine.changes        | 12 ++++++++++++
 wine.spec           |  2 +-
 5 files changed, 16 insertions(+), 47 deletions(-)
 delete mode 100644 wine-1.3.24.tar.bz2
 create mode 100644 wine-1.3.25.tar.bz2

diff --git a/susepatches.patch b/susepatches.patch
index 22b40f0..3f270b8 100644
--- a/susepatches.patch
+++ b/susepatches.patch
@@ -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
diff --git a/wine-1.3.24.tar.bz2 b/wine-1.3.24.tar.bz2
deleted file mode 100644
index 9df8272..0000000
--- a/wine-1.3.24.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:942872dbe4746e7eace1bda070a32c16afbb7e06acd14530cbe6f956bcf48a5d
-size 19525589
diff --git a/wine-1.3.25.tar.bz2 b/wine-1.3.25.tar.bz2
new file mode 100644
index 0000000..5588e0a
--- /dev/null
+++ b/wine-1.3.25.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:04376e22a88a729855885414d21e6ba681d1fd938279a8d23d2280a009f4c783
+size 19580626
diff --git a/wine.changes b/wine.changes
index e5ca876..f8b477e 100644
--- a/wine.changes
+++ b/wine.changes
@@ -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
 
diff --git a/wine.spec b/wine.spec
index a5b6580..6bc9079 100644
--- a/wine.spec
+++ b/wine.spec
@@ -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