Add patch to fix DirectDrawGammaControl errors #119931 by David.

Package-Manager: portage-2.1_pre3-r1

4 files changed, 40 insertions, 7 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index a6b18610b82a..ab4ced10e192 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.122 2006/01/20 11:56:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.123 2006/01/25 00:03:11 vapier Exp $
+
+  25 Jan 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/wine-0.9.6-force-ddraw-gamma.patch, wine-0.9.6.ebuild:
+  Add patch to fix DirectDrawGammaControl errors #119931 by David.
 
 *wine-0.9.6 (20 Jan 2006)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 93bd2eb5ac0a..3a6a19281424 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 af2baeac3302f48fe7d0fc7a1b72386c ChangeLog 22471
+MD5 0ee8efa996e4101ca01fc18eaf1b233c ChangeLog 22653
 MD5 fb8724a36ec3bef0ad3a3c36376b786a files/digest-wine-0.9 63
 MD5 d46df5add2535f22ad43db8247d7a45b files/digest-wine-0.9.1 65
 MD5 cc82e89428aa4f49f2f2ab3544488c02 files/digest-wine-0.9.2 65
@@ -21,6 +21,7 @@ MD5 c8ec4d9cf45eb34d587a17129ab09fb9 files/digest-wine-20050830 67
 MD5 cf49af131a341a471a493cd0d5693fd2 files/digest-wine-20050930 67
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-wine-9999 0
 MD5 491474e73029992d0fd9b888d0d1b4ce files/wine-0.9.4-null-thread-check.patch 878
+MD5 125d70d60f356673616cf1effa73d5d1 files/wine-0.9.6-force-ddraw-gamma.patch 862
 MD5 138d22e6669e8997cdf4dc6292db748d files/wine-20041019-alsa-headers.patch 448
 MD5 bcce3a9782f7fdfae1035b456e394ce2 files/wine-20041019-no-stack.patch 180
 MD5 32c5bd022b8547d02b07517dd7a9bc02 files/wine-20050111-upstream-registry-fix.patch.bz2 13584
@@ -42,7 +43,7 @@ MD5 1dab11f89e3d7f4b10bd789bed7d0265 wine-0.9.2.ebuild 4150
 MD5 7631647054ad75a7482c54627b6bc6c0 wine-0.9.3.ebuild 4150
 MD5 05dad88ebc41ff704ccae477c247cbcf wine-0.9.4.ebuild 4201
 MD5 eb706be561b681a9fa0b68ee46e0f095 wine-0.9.5-r1.ebuild 4153
-MD5 3d71bf827d41e220c389d730869bb11b wine-0.9.6.ebuild 4115
+MD5 899c0866cff91c999e4d24346b01467c wine-0.9.6.ebuild 4180
 MD5 034954140861812f7f678c15391019ba wine-0.9.ebuild 4148
 MD5 901fdaa0cd066cc44ee555ae51e334de wine-20041019-r3.ebuild 3505
 MD5 f70a71dc17b70bded5afc14ac1dd0c7d wine-20050111-r2.ebuild 3647
@@ -58,7 +59,7 @@ MD5 1755d1d5e576c6a1c9c567f380843050 wine-9999.ebuild 4171
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFD0Odi2+ySkm8kpY0RArxIAJ9qO4upJ+OGaIQC71ogwojAaR01MgCgnhX6
-2xzYTSLxX6QMdcLP/6tBvk0=
-=shk9
+iD8DBQFD1sDj2+ySkm8kpY0RAgXAAJ48kNz7ZVvI7Nmw1EptwL9zYB2hkgCfVSdc
+Ba7XJaZofo5UuBCAfdfjpX8=
+=5yA7
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/files/wine-0.9.6-force-ddraw-gamma.patch b/app-emulation/wine/files/wine-0.9.6-force-ddraw-gamma.patch
new file mode 100644
index 000000000000..120a38f210ef
--- /dev/null
+++ b/app-emulation/wine/files/wine-0.9.6-force-ddraw-gamma.patch
@@ -0,0 +1,27 @@
+Always return DD_OK instead of actual result
+
+http://bugs.winehq.org/show_bug.cgi?id=3192
+http://bugs.gentoo.org/119931
+
+--- dlls/ddraw/surface_gamma.c
++++ dlls/ddraw/surface_gamma.c
+@@ -58,7 +58,8 @@
+ {
+     ICOM_THIS_FROM(IDirectDrawSurfaceImpl, IDirectDrawGammaControl, iface);
+     TRACE("(%p)->(%08lx,%p)\n", iface,dwFlags,lpGammaRamp);
+-    return This->get_gamma_ramp(This, dwFlags, lpGammaRamp);
++    This->get_gamma_ramp(This, dwFlags, lpGammaRamp);
++    return DD_OK;
+ }
+ 
+ static HRESULT WINAPI
+@@ -66,7 +67,8 @@
+ {
+     ICOM_THIS_FROM(IDirectDrawSurfaceImpl, IDirectDrawGammaControl, iface);
+     TRACE("(%p)->(%08lx,%p)\n", iface,dwFlags,lpGammaRamp);
+-    return This->set_gamma_ramp(This, dwFlags, lpGammaRamp);
++    This->set_gamma_ramp(This, dwFlags, lpGammaRamp);
++    return DD_OK;
+ }
+ 
+ const IDirectDrawGammaControlVtbl DDRAW_IDDGC_VTable =
diff --git a/app-emulation/wine/wine-0.9.6.ebuild b/app-emulation/wine/wine-0.9.6.ebuild
index a10b3b964af0..ba1209d0981b 100644
--- a/app-emulation/wine/wine-0.9.6.ebuild
+++ b/app-emulation/wine/wine-0.9.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.6.ebuild,v 1.2 2006/01/20 13:34:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.6.ebuild,v 1.3 2006/01/25 00:03:11 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -80,6 +80,7 @@ src_unpack() {
 	unpack wine-${PV}.tar.bz2
 	cd "${S}"
 
+	epatch "${FILESDIR}"/wine-0.9.6-force-ddraw-gamma.patch #119931
 	epatch "${FILESDIR}"/wine-20050524-alsa-headers.patch
 	epatch "${FILESDIR}"/winearts-kdecvs-fix.patch
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in