Bug#771751: unblock: wine-development/1.7.29-4
Package: release.debian.org
User: release.debian.org@packages.debian.org
Usertags: unblock
Severity: normal
Please unblock wine-development. It fixes four important issues: a
texture corruption bug, a missing recommends on i386, a bug in the
launcher script, and depending rather than recommending gecko.
unblock wine-development/1.7.29-4
diff -Nru wine-development-1.7.29/debian/changelog wine-development-1.7.29/debian/changelog
--- wine-development-1.7.29/debian/changelog 2014-10-19 17:22:34.000000000 -0400
+++ wine-development-1.7.29/debian/changelog 2014-11-30 19:58:43.000000000 -0500
@@ -1,3 +1,17 @@
+wine-development (1.7.29-4) unstable; urgency=medium
+
+ * Fix upstream texture corruption bug (closes: #770483).
+ * Add libgl1-mesa-dri recommends to wine32 (closes: #771613).
+
+ -- Michael Gilbert <mgilbert@debian.org> Mon, 01 Dec 2014 00:53:30 +0000
+
+wine-development (1.7.29-3) unstable; urgency=medium
+
+ * Add missing test in wine launcher script (closes: #767011).
+ * Recommend instead of depending wine-gecko (closes: #767717).
+
+ -- Michael Gilbert <mgilbert@debian.org> Sun, 02 Nov 2014 03:41:35 +0000
+
wine-development (1.7.29-2) unstable; urgency=medium
* Build-depend on libgnutls28-dev to restore SSL support; enforce it at
diff -Nru wine-development-1.7.29/debian/control wine-development-1.7.29/debian/control
--- wine-development-1.7.29/debian/control 2014-10-19 17:28:12.000000000 -0400
+++ wine-development-1.7.29/debian/control 2014-12-01 01:09:05.000000000 -0500
@@ -84,8 +84,9 @@
x11-utils,
libncurses5,
libfreetype6,
- libwine-gecko-2.24,
Recommends:
+ libgl1-mesa-dri,
+ libwine-gecko-2.24,
libasound2-plugins,
Suggests:
wine32-development-preloader,
@@ -101,8 +102,8 @@
${misc:Depends},
${shlibs:Depends},
x11-utils,
- libwine-gecko-2.24,
Recommends:
+ libwine-gecko-2.24,
libasound2-plugins,
wine32-development (>= ${source:Version}),
Suggests:
diff -Nru wine-development-1.7.29/debian/control.in wine-development-1.7.29/debian/control.in
--- wine-development-1.7.29/debian/control.in 2014-10-19 17:08:55.000000000 -0400
+++ wine-development-1.7.29/debian/control.in 2014-11-30 19:49:45.000000000 -0500
@@ -84,8 +84,9 @@
x11-utils,
libncurses5,
libfreetype6,
- libwine-gecko-2.24,
Recommends:
+ libgl1-mesa-dri,
+ libwine-gecko-2.24,
libasound2-plugins,
Suggests:
wine32VERSION-preloader,
@@ -101,8 +102,8 @@
${misc:Depends},
${shlibs:Depends},
x11-utils,
- libwine-gecko-2.24,
Recommends:
+ libwine-gecko-2.24,
libasound2-plugins,
wine32VERSION (>= ${source:Version}),
Suggests:
diff -Nru wine-development-1.7.29/debian/patches/series wine-development-1.7.29/debian/patches/series
--- wine-development-1.7.29/debian/patches/series 2014-10-19 17:08:55.000000000 -0400
+++ wine-development-1.7.29/debian/patches/series 2014-11-30 19:52:03.000000000 -0500
@@ -14,3 +14,5 @@
glu32-link.patch
debian-gnutls.patch
+
+upstream-37406.patch
diff -Nru wine-development-1.7.29/debian/patches/upstream-37406.patch wine-development-1.7.29/debian/patches/upstream-37406.patch
--- wine-development-1.7.29/debian/patches/upstream-37406.patch 1969-12-31 19:00:00.000000000 -0500
+++ wine-development-1.7.29/debian/patches/upstream-37406.patch 2014-11-30 19:53:07.000000000 -0500
@@ -0,0 +1,36 @@
+commit aad1997dff990ceeba90ece0d535c7826044a5cf
+Author: Stefan Dösinger <stefan@codeweavers.com>
+Date: Wed Oct 22 21:56:38 2014 +0200
+
+ wined3d: Remove texture locations after downloading all subresources.
+
+--- a/dlls/wined3d/surface.c
++++ b/dlls/wined3d/surface.c
+@@ -1207,7 +1207,6 @@ static void surface_unload(struct wined3d_resource *resource)
+ surface_load_location(surface, surface->resource.map_binding);
+ surface_invalidate_location(surface, ~surface->resource.map_binding);
+ }
+- wined3d_texture_force_reload(surface->container);
+
+ context = context_acquire(device, NULL);
+ gl_info = context->gl_info;
+--- a/dlls/wined3d/texture.c
++++ b/dlls/wined3d/texture.c
+@@ -979,6 +979,7 @@ static void wined3d_texture_unload(struct wined3d_resource *resource)
+ sub_resource->resource_ops->resource_unload(sub_resource);
+ }
+
++ wined3d_texture_force_reload(texture);
+ wined3d_texture_unload_gl_texture(texture);
+ }
+
+--- a/dlls/wined3d/volume.c
++++ b/dlls/wined3d/volume.c
+@@ -451,7 +451,6 @@ static void volume_unload(struct wined3d_resource *resource)
+ }
+
+ /* The texture name is managed by the container. */
+- wined3d_texture_force_reload(volume->container);
+ volume->flags &= ~WINED3D_VFLAG_CLIENT_STORAGE;
+
+ resource_unload(resource);
diff -Nru wine-development-1.7.29/debian/scripts/wine wine-development-1.7.29/debian/scripts/wine
--- wine-development-1.7.29/debian/scripts/wine 2014-10-19 17:08:55.000000000 -0400
+++ wine-development-1.7.29/debian/scripts/wine 2014-11-30 19:37:00.000000000 -0500
@@ -21,7 +21,7 @@
fi
if test -z $WINEPREFIX; then
- if "$wine" = "$wine64"; then
+ if test "$wine" = "$wine64"; then
wineprefix=$HOME/.wine64
else
wineprefix=$HOME/.wine
Reply to: