diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest index 99e0549..8d6e17f 100644 --- a/app-emulation/wine/Manifest +++ b/app-emulation/wine/Manifest @@ -2,8 +2,9 @@ AUX disable-dynamic-vertex-buffers.patch 1034 SHA256 afd5ec5aef9d768daf0ba5f0c5b AUX wine-1.1.15-winegcc.patch 1556 SHA256 dbd89db561d7583faf317d795b8c11231575d885e21c6414add39079604dbd0d SHA512 a6a6dbde16c1f850a5cb4d6b6fe1a8129bb267c44c19de63a4eb26933fd69ff98e440d257e467d766a6a6ac326d72dd621cae37fb593c8c62e43f588ccef3f25 WHIRLPOOL 3aea848b17217ab215f860c3526c44a5d9bd9e7adfe35c02bb5c841461bdaf4bd8ac4f8e8b990c0558980381fc1b2441b79edc3ff6dcde7455203fbd1fc3f49c AUX wine-1.4_rc2-multilib-portage.patch 1256 SHA256 9d0acd304d11d1bf73f56699754aaa1bfe1facba90648ee330fdbe08d9ff4938 SHA512 ac0b29e2b4c9b04bb6694a4e4da654446f68efbf90cda6809b45dad51e6679ac5410398763fde7e9505ef959493a037aa588cee58d14906563a4746702d2b0e9 WHIRLPOOL 8ea26266c327bc8313eca9b5d39c9741b226037750ca2d1d33262420093e05c306e7f004656c362c3c50b330d050cf9e5fceaa2b024a82809aae8b3617b0ae18 AUX wine-1.5.2-raw_input_mod.patch 108861 SHA256 0401f23221821d09f35f50d19389ad7c082c05fcf4acfccbbaf146fdaa0108c5 SHA512 66b1426df6bf0d974a8d431fa7658af10d7109bba3c4cda5f45ecff0ed7d9176b5c13f793ef53164e3fa16027171a18227b7e639f0597db23dc91e8239fd98f4 WHIRLPOOL c8f43b8aef8edfa568afbc1e2d9e6184d16f1a7bc1f440ddcfc43f1ca526d7667f405116a523afb34be20c8c2d0a1668dd2349814896d8e95f1409133a16754e +AUX wine-remove-support-for-GL_ARB_sync.patch 1375 SHA256 00db42000ab584619ec2ee8503753599588f0689a1daf30e4d1579d7dca9a548 SHA512 14d98c65a9882927c55470a82bcc541fd9dc25763bd03dc31deabd3b294bbb1196b56f27096a59fbcdb446645ff668e2750715146318ba566a24be5d3e656a76 WHIRLPOOL 26da7593c16d551dbf92f2911cba67c394589a0b5c217be55ce56f18c38c742ff3faddf6befb15fd015041bf256736213f711c9e7f62507f1fb99fdb18475031 DIST wine-1.5.2.tar.bz2 20104652 SHA256 8ee6fdaf716b5a1c7ccf9be9dc6d9b7546944e79351c4806b2fa596da418342f DIST wine_gecko-1.5-x86.msi 15950848 SHA256 2e372a1b87ff2a22ad5127400ece4b09e55591d9f84e00bb562d294898a49b5c DIST wine_gecko-1.5-x86_64.msi 16345088 SHA256 762e80b41e6922849b28299dc5810a28634d484fe73fb7ca52804460588a1730 -EBUILD wine-1.5.2-r9999.ebuild 6497 SHA256 58525e6de6c4a1d2112d96ced8dedbcb5ceb558f14690cdf9f1ac114f77faa90 SHA512 b58c585dc114ba9a7e882d19c264a61d6961bd7f91f95277bf28319c4791726f36a3bd26d6b4d6a5bbd260d57b1fe2722bb3882258030bb53f49a1c9e9ff87c1 WHIRLPOOL 0fe3f84a5348c0984a61300b8b07e5c736f05e0bb81fc94e095f8510d84b4b47fd9386d0df9f936e1c3d93f58602f8859a27662de941a05e21a03476a4e17805 +EBUILD wine-1.5.2-r9999.ebuild 6804 SHA256 23d3325d0fc4e6d516b777968ead8c01d7945006718c0d3f7a8362ccc74fb1bd SHA512 6d5b938f2d48f66d18ee7ec9a19fd892a5b05848d035538ddcbc7361208ed5cc2f1723eb7bb17378e9d49eb78af0bdf630a8a9d5204ce561684cce7ad1cfc534 WHIRLPOOL 9490d192382e7fd67b97933122dc00bc010b641c3fbe9fa964dc0d2d39e99b82d170de3b8b8d34ff9c544f190f2cd1d853694f1844b64a6dbe98db44323cf260 MISC metadata.xml 1558 SHA256 fa58b3b055a5f848f6861fa85ca2d5cb922ba9723a8a26d7e69dd78481209616 SHA512 6e52cbb2c2304c19213d647f93a51894c5ec3e23fac993976ca36e2002656094108e31d0f4ec7144288b565894e4d161f14cdb47b96fd8d61e25099c48e8f060 WHIRLPOOL 22ebef2ae581e47676ddc6ea2c3c1422e8eb77699e28d97a922b7ea0277d9d2f515629619c1b7bb8023aee99c235a414ca1e61e3e9572666891e73912aa0a47d diff --git a/app-emulation/wine/files/wine-remove-support-for-GL_ARB_sync.patch b/app-emulation/wine/files/wine-remove-support-for-GL_ARB_sync.patch new file mode 100644 index 0000000..4aa53af --- /dev/null +++ b/app-emulation/wine/files/wine-remove-support-for-GL_ARB_sync.patch @@ -0,0 +1,25 @@ +From 9298116a4337c2c1c2ea6c4ba587783678e913ed Mon Sep 17 00:00:00 2001 +From: Simon Ruggier +Date: Sun, 1 Apr 2012 23:41:28 -0400 +Subject: [PATCH] Remove support for GL_ARB_sync + +This works around a deadlock issue that World of Tanks started +triggering at version 7.2. +--- + dlls/wined3d/directx.c | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c +index 23cc6b2..c18bd1e 100644 +--- a/dlls/wined3d/directx.c ++++ b/dlls/wined3d/directx.c +@@ -114,7 +114,6 @@ static const struct wined3d_extension_map gl_extension_map[] = + {"GL_ARB_shader_texture_lod", ARB_SHADER_TEXTURE_LOD, 0 }, + {"GL_ARB_shading_language_100", ARB_SHADING_LANGUAGE_100, 0 }, + {"GL_ARB_shadow", ARB_SHADOW, 0 }, +- {"GL_ARB_sync", ARB_SYNC, 0 }, + {"GL_ARB_texture_border_clamp", ARB_TEXTURE_BORDER_CLAMP, 0 }, + {"GL_ARB_texture_compression", ARB_TEXTURE_COMPRESSION, 0 }, + {"GL_ARB_texture_compression_rgtc", ARB_TEXTURE_COMPRESSION_RGTC, 0 }, +-- +1.7.9.1 diff --git a/app-emulation/wine/wine-1.5.2-r9999.ebuild b/app-emulation/wine/wine-1.5.2-r9999.ebuild index 9c25e0e..e93e1bc 100644 --- a/app-emulation/wine/wine-1.5.2-r9999.ebuild +++ b/app-emulation/wine/wine-1.5.2-r9999.ebuild @@ -29,7 +29,8 @@ SRC_URI="${SRC_URI} LICENSE="LGPL-2.1" SLOT="0" -IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap mp3 ncurses nls odbc openal opencl +opengl +oss +perl png samba scanner selinux ssl test +threads +truetype udisks v4l +win32 +win64 +X xcomposite xinerama xml" +# Pinkbyte: add fglrx VIDEO_CARDS use +IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap mp3 ncurses nls odbc openal opencl +opengl +oss +perl png samba scanner selinux ssl test +threads +truetype udisks v4l video_cards_fglrx +win32 +win64 +X xcomposite xinerama xml" REQUIRED_USE="elibc_glibc? ( threads )" #286560 RESTRICT="test" #72375 @@ -128,6 +129,9 @@ src_prepare() { epatch "${FILESDIR}"/${P}-raw_input_mod.patch # Pinkbyte: fix perfomance problems with vertex buffers epatch "${FILESDIR}"/disable-dynamic-vertex-buffers.patch + # Pinkbyte: fix deadlock issue with WoT on fglrx (http://bugs.winehq.org/show_bug.cgi?id=30330). + # Thanks to eto-rapchik@jabber.ru for discovering this issue. + use video_cards_fglrx && epatch "${FILESDIR}"/${PN}-remove-support-for-GL_ARB_sync.patch # Pinkbyte: finally, this should be executed after applying such patches "${S}"/tools/make_requests #