[wine] 1.5.11-1

Wed Aug 22 19:54:06 UTC 2012

commit b99de91493ffc7fbf5b93200a3c656c3c7bcbb8c
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Wed Aug 22 21:53:17 2012 +0200

    1.5.11-1
    
    - version upgrade
    - use changed libOSMesa check from gentoo (>f18 still fails see rhbz#849405)

 .gitignore                     |    4 ++++
 sources                        |    4 ++--
 wine-1.5.10-osmesa-check.patch |   33 +++++++++++++++++++++++++++++++++
 wine.spec                      |   28 +++++++++++++++++++++++-----
 4 files changed, 62 insertions(+), 7 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index b1835a4..33cfea6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,7 @@
 /wine-1.5.8.tar.bz2.sign
 /wine-1.5.9.tar.bz2
 /wine-1.5.9.tar.bz2.sign
+/wine-1.5.10.tar.bz2
+/wine-1.5.10.tar.bz2.sign
+/wine-1.5.11.tar.bz2
+/wine-1.5.11.tar.bz2.sign
diff --git a/sources b/sources
index f73c0c9..4c9f0f9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-65a98308d60f878462f4c404d2d013b2  wine-1.5.9.tar.bz2
-145243a4801c7ee6d3b631d71702995d  wine-1.5.9.tar.bz2.sign
+930485c8df59edcf0a6e3fd87cca8b39  wine-1.5.11.tar.bz2
+45750fa026fd05db8480cf243235c203  wine-1.5.11.tar.bz2.sign
diff --git a/wine-1.5.10-osmesa-check.patch b/wine-1.5.10-osmesa-check.patch
new file mode 100644
index 0000000..1f96db3
--- /dev/null
+++ b/wine-1.5.10-osmesa-check.patch
@@ -0,0 +1,33 @@
+From a233e35ca650db2758de0fd31450b8ce2d86d5e3 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino at gentoo.org>
+Date: Tue, 7 Aug 2012 01:29:01 -0400
+Subject: [PATCH] Do not check for libGL symbols when checking libOSMesa
+
+If mesa had been built with shared glapi, glAccum is not available in
+libOSMesa without explicitly linking to libGL. In addition, in
+mesa-8.0.x and earlier, libOSMesa needs to be explicitly linked to
+libglapi if mesa was built with shared glapi, see
+https://bugs.gentoo.org/show_bug.cgi?id=399813
+---
+ configure.ac |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4bd43d1..c7a718f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1132,7 +1132,10 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c
+ 
+                  if test "$ac_cv_header_GL_osmesa_h" = "yes"
+                  then
+-                    WINE_CHECK_SONAME(OSMesa,glAccum,,,[$X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS])
++ WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[$OPENGL_LIBS $X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS])
++                    if test "x$ac_cv_lib_soname_OSMesa" = "x"; then
++ WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[-lglapi $OPENGL_LIBS $X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS])
++                    fi
+                  fi
+                  WINE_NOTICE_WITH(osmesa,[test "x$ac_cv_lib_soname_OSMesa" = "x"],
+                                  [libOSMesa ${notice_platform}development files not found (or too old), OpenGL rendering in bitmaps won't be supported.])
+-- 
+1.7.8.6
+
diff --git a/wine.spec b/wine.spec
index e93b274..4708083 100644
--- a/wine.spec
+++ b/wine.spec
@@ -1,16 +1,16 @@
 %global no64bit   0
-%global winegecko 1.6
+%global winegecko 1.7
 %global winemono  0.0.4
 
 Name:           wine
-Version:        1.5.9
-Release:        2%{?dist}
+Version:        1.5.11
+Release:        1%{?dist}
 Summary:        A compatibility layer for windows applications
 
 Group:          Applications/Emulators
 License:        LGPLv2+
 URL:            http://www.winehq.org/
-Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-%{version}.tar.bz2
+Source0:        http://downloads.sourceforge.net/wine/wine-%{version}.tar.bz2
 Source10:       http://downloads.sourceforge.net/wine/wine-%{version}.tar.bz2.sign
 
 Source1:        wine.init
@@ -31,6 +31,11 @@ Source107:      wine-wineboot.desktop
 Source108:      wine-wordpad.desktop
 Source109:      wine-oleview.desktop
 
+# build fixes
+# do not check for glAccum
+# wget http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-emulation/wine/files/wine-1.5.10-osmesa-check.patch?revision=1.1
+Patch1:          wine-1.5.10-osmesa-check.patch
+
 # wine bugs
 
 # desktop dir
@@ -89,7 +94,7 @@ BuildRequires:  libgphoto2-devel
 BuildRequires:  isdn4k-utils-devel
 # modular x
 BuildRequires:  libX11-devel
-BuildRequires:  mesa-libGL-devel mesa-libGLU-devel
+BuildRequires:  mesa-libGL-devel mesa-libGLU-devel mesa-libOSMesa-devel
 BuildRequires:  libXxf86dga-devel libXxf86vm-devel
 BuildRequires:  libXrandr-devel libXrender-devel
 BuildRequires:  libXext-devel
@@ -495,6 +500,8 @@ This package adds an openal driver for wine.
 %prep
 %setup -q
 
+%patch1 -p1 -b.osmesa
+
 %patch511 -p1 -b.cjk
 
 %patch1001 -p1 -b.winepulse
@@ -971,6 +978,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/wine/dssenh.dll.so
 %{_libdir}/wine/dswave.dll.so
 %{_libdir}/wine/dwmapi.dll.so
+%{_libdir}/wine/dwrite.dll.so
 %{_libdir}/wine/dxdiagn.dll.so
 %{_libdir}/wine/dxgi.dll.so
 %{_libdir}/wine/eject.exe.so
@@ -1484,6 +1492,16 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %endif
 
 %changelog
+* Sat Aug 18 2012 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.5.11-1
+- version upgrade
+- use changed libOSMesa check from gentoo (>f18 still fails see rhbz#849405)
+
+* Tue Jul 31 2012 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.5.10-1
+- version upgrade
+- wine gecko 1.7
+
 * Sat Jul 21 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 1.5.9-2
 - isdn4linux now builds on ARM
 
