[pkgsrc/trunk]: pkgsrc/emulators/wine winex11.drv: if 800x600 is not availabl...

[jmcneill <jmcneill%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/05729a1d5c6c
branches:  trunk
changeset: 543945:05729a1d5c6c
user:      jmcneill <jmcneill%pkgsrc.org@localhost>
date:      Sat Jun 28 05:18:57 2008 +0000

description:
winex11.drv: if 800x600 is not available, attempt 800x480 before giving up.
This lets me launch Diablo II on an EeePC, which runs menus at 800x600 but
allows the actual game itself to run at 640x480, without hooking up an
external VGA monitor.

diffstat:

 emulators/wine/distinfo         |   3 ++-
 emulators/wine/patches/patch-ca |  21 +++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletions(-)

diffs (39 lines):

diff -r 20ee0e931f5e -r 05729a1d5c6c emulators/wine/distinfo
--- a/emulators/wine/distinfo   Sat Jun 28 00:13:59 2008 +0000
+++ b/emulators/wine/distinfo   Sat Jun 28 05:18:57 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.81 2008/06/28 00:13:08 jmcneill Exp $
+$NetBSD: distinfo,v 1.82 2008/06/28 05:18:57 jmcneill Exp $
 
 SHA1 (wine-1.0.tar.bz2) = 84150abdda18bc34b187335c6862718a6e08d255
 RMD160 (wine-1.0.tar.bz2) = 1dbfa38e54e7d6269ad4110f22b2791393fd3b59
@@ -16,3 +16,4 @@
 SHA1 (patch-ba) = 342564062296d316a20f1c0b3ad7aaa17e7e79be
 SHA1 (patch-bb) = 77cad41a7e8e34f12243e53f6c1cec998bedefda
 SHA1 (patch-bc) = 1542a59718229a41e23aff93e4571bf7127a276b
+SHA1 (patch-ca) = 1383c03cc83cefe6099b58340db2bc468c7524bb
diff -r 20ee0e931f5e -r 05729a1d5c6c emulators/wine/patches/patch-ca
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/wine/patches/patch-ca   Sat Jun 28 05:18:57 2008 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-ca,v 1.1 2008/06/28 05:18:57 jmcneill Exp $
+
+--- dlls/winex11.drv/settings.c.orig   2008-06-27 11:42:50.000000000 -0400
++++ dlls/winex11.drv/settings.c        2008-06-27 11:43:40.000000000 -0400
+@@ -431,6 +431,16 @@
+         return DISP_CHANGE_SUCCESSFUL;
+     }
+ 
++    if (devmode->dmPelsWidth == 800 && devmode->dmPelsHeight == 600)
++    {
++      DEVMODEW newdm = *devmode;
++
++      ERR("800x600 not available, trying 800x480\n");
++      newdm.dmPelsWidth = 800;
++      newdm.dmPelsHeight = 480;
++      return X11DRV_ChangeDisplaySettingsEx(devname, &newdm, hwnd, flags, lpvoid);
++    }
++
+     /* no valid modes found */
+     ERR("No matching mode found %ux%ux%u @%u! (%s)\n",
+         devmode->dmPelsWidth, devmode->dmPelsHeight,