Accepting request 76021 from Emulators

update to 1.3.24

OBS-URL: https://build.opensuse.org/request/show/76021
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wine?expand=0&rev=98

susepatches.patch

@@ -0,0 +1,116 @@
+From 329b3307e628f4deec732f4d2261aa8cd0fd81ea Mon Sep 17 00:00:00 2001
+From: Marcus Meissner <marcus@jet.franken.de>
+Date: Fri, 8 Jul 2011 22:10:36 +0200
+Subject: [PATCH] libv4l: Fixed videodev.h header moving away from glibc to libv4l-devel
+
+---
+ 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(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0e86713..8df9993 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -651,6 +651,15 @@ AC_CHECK_HEADERS([linux/videodev.h],,,
+ #include <asm/types.h>
+ #endif])
+ 
++AC_CHECK_HEADERS([libv4l1-videodev.h],,,
++[#ifdef HAVE_SYS_TIME_H
++#include <sys/time.h>
++#endif
++#include <sys/types.h>
++#ifdef HAVE_ASM_TYPES_H
++#include <asm/types.h>
++#endif])
++
+ 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
++++ b/dlls/qcap/v4l.c
+@@ -63,7 +63,11 @@
+ #include <asm/types.h>
+ #endif
+ #ifdef HAVE_LINUX_VIDEODEV_H
+-#include <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>
+@@ -71,7 +75,7 @@
+ 
+ WINE_DEFAULT_DEBUG_CHANNEL(qcap_v4l);
+ 
+-#ifdef HAVE_LINUX_VIDEODEV_H
++#if defined(HAVE_LINUX_VIDEODEV_H) || defined(HAVE_LIBV4L1_VIDEODEV_H)
+ 
+ static typeof(open) *video_open = open;
+ static typeof(close) *video_close = close;
+diff --git a/dlls/qcap/yuv.c b/dlls/qcap/yuv.c
+index 608e571..bbc1b50 100644
+--- a/dlls/qcap/yuv.c
++++ b/dlls/qcap/yuv.c
+@@ -32,7 +32,7 @@
+ #include "wine/debug.h"
+ 
+ /* This is not used if V4L support is missing */
+-#ifdef HAVE_LINUX_VIDEODEV_H
++#if defined(HAVE_LINUX_VIDEODEV_H) || defined(HAVE_LIBV4L1_VIDEODEV_H)
+ 
+ WINE_DEFAULT_DEBUG_CHANNEL(qcap);
+ 
+-- 
+1.7.3.4
+

wine-1.3.23.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:17fc85b4d3edde123768f069e9f061bf60d87efa7a607633fb435a4388ea5519
-size 19475016

wine-1.3.24.tar.bz2

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

wine.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Fri Jul  8 22:34:27 CEST 2011 - meissner@suse.de
+
+- Updated to 1.3.24 development snapshot
+  - Various DirectInput improvements.
+  - Support for line breaking in Uniscribe.
+  - More UI elements in builtin Shell Explorer.
+  - Some more D3DX9 functions.
+  - Improved support for shell known folders.
+  - Various bug fixes.
+- libv4l headers no longer are in glibc, but in libv4l on factory 
+- updated winetricks to 20110629
+
 -------------------------------------------------------------------
 Wed Jun 29 16:46:15 CEST 2011 - meissner@suse.de
 

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.23
+Version:        1.3.24
 Release:        1
 Summary:        An MS Windows Emulator
 Url:            http://www.winehq.com
@@ -47,7 +47,7 @@ Source4:        wine.desktop
 Source5:        ubuntuwine.tar.bz2
 # SUSE specific patches
 # - currently none, but add them here
-#Patch0:         susepatches.patch
+Patch0:         susepatches.patch
 Recommends:     wine-gecko wine-mp3
 %ifarch %ix86 x86_64
 Requires:       wine-32bit = %version
@@ -104,7 +104,7 @@ libraries.
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0 -p1
 #
 cp %{S:3} .
 #
@@ -115,6 +115,9 @@ cat VERSION
 # e.g. Steam hates it.
 export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-fomit-frame-pointer//'`
 %endif
+# keep just for susepatches with configure changes
+autoconf
+autoheader -I include
 %configure \
 	--with-x \
 %ifarch x86_64