diff options
Diffstat (limited to 'app-emulation/wine-proton')
12 files changed, 119 insertions, 492 deletions
diff --git a/app-emulation/wine-proton/Manifest b/app-emulation/wine-proton/Manifest index 3edb02bce97d..b6597b2551d2 100644 --- a/app-emulation/wine-proton/Manifest +++ b/app-emulation/wine-proton/Manifest @@ -1,21 +1,16 @@ AUX README.gentoo 2435 BLAKE2B 2c41ce67c8f9139cf0a312c4477090077084550b79aa35ab4909de95046a2a0bbf6d05e549f59dfeb11253f1099878cbbd6fb141e3551c6b0ac503bef846d99b SHA512 0a5b2ac06c3b8cf1ef302d59193624bda224554476e1209aae485cbe913a0ffae6d553633983efaf89ce1296d52ec4dc2ab544ede96c2953e9f6ca602d5b787b AUX wine-proton-7.0.4-musl.patch 505 BLAKE2B 5c6d46c505e38c19e4c92e05243244739e6a2b84ebc548989167b65fe5ede439c628b510bce57ff8cd7ca765114c13dbb098116ba201ceba44069bf38daf5a64 SHA512 5e687119aa461e3440d3c7bbb2318db04ffbe414329931877b59a3f9752ee36e492bb25dda9b26c2f741664665487a34575423b24718e3f1b65f2d850c3681aa AUX wine-proton-7.0.4-noexecstack.patch 223 BLAKE2B dff1867e2977bd14fcfab9dfa2c2f1d3288f7edca75ddd7c9f02bfd06e9f63fac37bd59ea8aa891e13ab77bac35b369825d5490a9175ed9a7736e523b61d8944 SHA512 4ba3677042b693e513fc7a133c76a509f63d0ca20633d1e8d448bca9534c0d1a0fc58e77fa9b28fd8d936393605e97ee6e3bb5fac00872d6ac5808b7712586e3 -AUX wine-proton-7.0.4-restore-menubuilder.patch 572 BLAKE2B 7ace97fb82498d8f19297cab205d8b9ca07c5293172a0b017b5d887ec1f5daeb3ed64eb0a322904e528a72f4a225813c27b544015587d71fce97c41b6b1463a2 SHA512 1384f06d4264e22d332eb12fabd7408b8e250e39c195460f876460fe40d35d617c73100815c395f481e3af66676ccaa1a14592c05f1e5b092bfafe2f87112106 -AUX wine-proton-7.0.4-unwind.patch 1694 BLAKE2B 954cb0a395c3b45afc7a3f39f33d34cf041b9cf5a6c77d0a217d296c4c8d1f6503322c4f77188c4729b98318913b9bc86d37b7573713643590550297a0ae372a SHA512 f958e811a4754614bc9e7223f727e2c581c18607dccf14c6d7014012ff29107bd850540a40ff7a62e7bae6b87ae1ac28fd104fbbaf9ce954bf3acb38ddbeb7df -AUX wine-proton-7.0.6-mingw64-11.0.0.patch 849 BLAKE2B 26833ef532e7c5b8b0ae1442485c6c44f55a550c571942be2a894aada62ce87398973dfa5619f5a8d498b51479dda84eeae72803370539a7d28575a74310e173 SHA512 189bb20e8c399374567db308c2d3cf43a2b5e2d76b43970edaa3975c0c4ddb7fa245b9d05ed0f7a3452c8bf5264e743acff5a4830a94abd1c7df13664afc21e7 -AUX wine-proton-7.0.6-vulkan-libm.patch 429 BLAKE2B 437c37130a0bc64e135fe15f876d19f16afdb9586a12c3dd9010b8280333e880dd4125be32e42bd90a32349634daf9bee29d537280d83ebf6580f28f6b53e57b SHA512 12e331b39543b9fba089925ceee936e534612e625570cfe19653516cf95ebf9a2d99fc05373eafecd4ae4bbfc485c4aed9fba682f76219164117fd9f2879012f AUX wine-proton-8.0.1c-unwind.patch 1488 BLAKE2B 1a6d69484fb36f94f32d74679e809cfd7666363bede5dddedd2449e07251823b1ce86a717e06d342eec782aff501f27bc23433511c163da0b2a50c411df7ac53 SHA512 82ff0510fcab35471aa0db8f32f48cd62dbf78b3f5f36e3d191b86be55cb476df1ee689e5cd53c95d4f02199b5900eb0c8a45959693739a6c35e4c8b3cfa243f AUX wine-proton-8.0.4-restore-menubuilder.patch 382 BLAKE2B 04df3b2e495f49b4d66bc70a1198a3ab6c4dbb95c3ff145069b7086cf87de7233a1f5d6e56c861c0ff6f7e4b0869bb7ddf29a35ca9f32e47c05bf71fd0823ef3 SHA512 08bf5accb1ccf38519d5054c2d297da87aef0df5b5b5336d96e4b98a3af202ae8220c1e8cdf282c24b2706628e14a1afb7ff5f21f4a7a9f8e3f4f301f9e44c57 AUX wine-proton-8.0.5c-vulkan-libm.patch 447 BLAKE2B 026b982714ce21ce6492d5e3b9932f2af4b8f1342fc47de045d86e596996dab11a3b73bf5090714dbc5c405345b8d1a08afc6a337ddb91e744ca83c980ad390f SHA512 46655d7c65975a11a585acf9112fcc56242b2a65917aa8dc9ad9515b2f5348ad3e8a9b72d53b38b1d51ae9b661f175f54dda8cd3f04a56de1d0a18a2c4d6136c AUX wine-proton-9.0-rpath.patch 356 BLAKE2B f988fefb9590d1c8735f480349172b7c7634256ef07bfe19bc5a7e04363d1832cc999d7c30b78dc5af2f4a1c9bfac1f4fa5458461b865864dc3bbdff4e9f71fa SHA512 f0de44022c856ed9b058e6c64146e464e375114d56bcc369a7e72df847a4de0ad31cbb06042df3f6836b681cd342b8a228cf514a51ed9796542a4d9ea42a03e6 -DIST proton-wine-7.0-6.tar.gz 45780326 BLAKE2B f140fcfdd1a47904c34a49d0795fa3326d7cf0d3fac8d6c2ef2a4926181a46223f43a2d1ca96c543e800c8c46b2a3cc51ae306a029d68a42608876e869e177d5 SHA512 793bbe2b23042301a1b518717d78cfff01eaffa0388883d010659a45779b9136d33cfac63f0c3fbb1e458953a954b423eb70ac4fa87633352267db890ceb2fef +AUX wine-proton-9.0.4-binutils2.44.patch 4104 BLAKE2B 4a0884969ade4ea83890672392dd29eb641f6c82ecdd8a6dd47853cc59e2cea73d42a95ce2197fc2833170aed7af508b19136f11859501dec22909297a691905 SHA512 f3bec4565acb4446783e44ac9823978ed1f8881814f7cae7ad5c5bd8d70cf5f13e68f0abefcf1038426b9b055fec1dabf3a6bbfc21bae1420654fdabe7bd206f DIST proton-wine-8.0-5c.tar.gz 48710071 BLAKE2B 99627baea6fb3d51231aa1e75a2734c3c1baba88326baf15b3d421d57a00472d25ba51c2140b51152c8aeae7dd240d3d77bb0d8835aa7eb3b745a51be120f8bb SHA512 0cf98d4e67866e55cc8cd5ea8da0d76aee8e37b130b3cbca604083c913e98ddf9038ecd6f9761d2e11443e282b372977400e251456c6d40e1365210c7578234d DIST proton-wine-9.0-2.tar.gz 49125171 BLAKE2B ac1e4a63f94689bc4fcc6ab4e2d12cfc214f54181515434ab950d8975d131a5f6333b1e6cb9b67eda61cf3e652e57e27e60ba3cff6a6ac403b07178f382f7e25 SHA512 82efee3100da80f650229d1abf3df4896ab71af4a79c6e5cf03aa646c56f435daf07c6f084a3264067cf90ce509102e3d7ee6d4bf7d0650baf645b5ece08cc7c DIST proton-wine-9.0-4.tar.gz 49339922 BLAKE2B 914ca093ac288c26400e4eeb2ea33943fc8ad89052aa7c97b5c44286dc175745720455d65163baa90b0d0271eb8028549315a3e8095b91947db2bd96c6fc4852 SHA512 e061f0a55b25493f67ca3add8c7e41020bb57cb15e8fb4fdf3c23f0cab2d00b703c90fbcf0dc1ca8b67e1726a76cee910e9ea6f567c88bc6c520dd6c9dbb75e9 -EBUILD wine-proton-7.0.6.ebuild 13138 BLAKE2B d309ce8c55dc63f99f54205c9e7601decb0400cd73aa14fd7a10c2b3a45162a8abbb0b32ca8ba21d18637ffb75fe2ab88422c3d7a899679fcc459f1807173901 SHA512 90fcde31389524651e300680554ed27451eba0fb099599ea1a13ea10e24f9c147c8c3555c688262240db8ebc13c061541b841e8dd6d1966ea2d54a70141c8a93 -EBUILD wine-proton-8.0.5c.ebuild 14090 BLAKE2B bff5e2b5f272af1aeaa1ca0de729b71e2629a8006c0700e633ff189b29360a42c51ccdf2e34195a198787c1a30be1e2c98fd92204e0a4ade1f1fda643db0ba26 SHA512 519b265f61adeb062cb886ec1fe109371b40f9fefcf06d9143639141054f2037e1ec25adc832b35fba5f2de234aa1d470edf2500bf0656880be7d32f137d060a -EBUILD wine-proton-9.0.2.ebuild 14990 BLAKE2B 88c90b9f79fcb843ddcbc976c5e731a778b7c422cefb488fd2a34ff3e5f00eb225d06ee88dc75803a8827da17eff72e60feecba5029974baa393e76ebecfc930 SHA512 cfa95408eedd6a3c121a4b469f3675dbf6aff717c7a405f1068ab02ce6411434dcde561a29fd63d92a32322f38989077ddd98c27ccc05c1f1c453a1a54a367c1 -EBUILD wine-proton-9.0.4.ebuild 14991 BLAKE2B 7b8f8fdfe9784b6d436d36a9258bec4c793ad8f80fa02ec69d50b11fbf3e2bb1b9a522d542517dbba31bc46b96a17ba7ce8a55fd916e6a13e8c2f180152ccc0e SHA512 960a21425ddc327854f3e608569104b2f10226c8309909c8d77fdd66be770d0fd7514de2d55cc6ba1cc7571eb68b73cedc8cb1c7329b542b5093ebfca7d03946 -EBUILD wine-proton-9999.ebuild 15118 BLAKE2B cbd7e649fe3887d2f8ef0c08f0c71c8d5ed7e34b41e24468ffe96658393f2839e2ba73cdc18d066a068756e31c7d47ce674137c38de2f428e77c7f523878775d SHA512 b4bd206699b1d4a9129e0d5a2b39bf506677868a670b660c038df3de9d2b0593029f7ba0faeae793cd09933f83a0b87cc88ae6df7ee6826f19a6bffea3119545 -MISC metadata.xml 1652 BLAKE2B 3033e8c5d53353750c4b20d39e2d70e944ebbae42f7c01cf83539500dc73051b46ba65e43ea2a2d965778bd0fe079b94ccaba85e49189b63406ac650237c5e65 SHA512 9293efe946d3d129006a0cb5c05a8e99073d189b3c71fe6db730bf3a5293117cfa6a87481bc3de7c7b4df18b033d752ff8fd84cb1e32e9d9715f15c73eba5b00 +EBUILD wine-proton-8.0.5c.ebuild 14136 BLAKE2B 4358b1230118ceba29bd8a8176e9b90c474588a9f5a091fe72dd98b894b4ec4cfc18050d42a376f6f4a7cfb87c071a70cc081fe1c292fb32754e1cdf058e3875 SHA512 5b555cbf725fad0c1e97992187e5236ce8aa5bf47350c92494f4fa53e47449273599f1f10a16bef1b229e50200892e3cb869a54d4488e16aba76db02df121046 +EBUILD wine-proton-9.0.2.ebuild 15036 BLAKE2B 7bf4c5ff1fc60f4c1ea7b468c62571be4ccccdedfb7caaba25d7a0e9ca4f4714ed9ad96cb6a91708b0f6e0bd2063a3bcc9307d41845412a7b040e018fe16a2e8 SHA512 5fa1ff85991acf5bced2cf7da07fd28379873f4d2a62dd16451d0c5be5b8782201a7092683b65ea443b8c665e1247d0ad8d678898cb27b7a037b56f8751f300d +EBUILD wine-proton-9.0.4.ebuild 15037 BLAKE2B 2e7c353b3b1e8bfcb92fb7968063120083c10da52b96d1c3f4adae8dd912e9dbd27a900d20c94effc4b527188f74ba9062a6c975c0b4aae55db9e3ea10cb2912 SHA512 0acc616e47523e0be9644825ebfd12e5f08e80b58a41a1b00f0c9af00d7d88292989248f209e7a2f19d9262e90b56eb486af40f020adb802191eac2e2b21d03e +EBUILD wine-proton-9999.ebuild 15164 BLAKE2B 2d4aff78c021877212943032aca9e05599827a04cd736439a8bb3c494c7e53984342eb8f780b8201f0516f5b9e1cbe6b428a0c016f936d9e2887aec2fc14f275 SHA512 9cf1679a09c99b45ca16b7079618a599d071e188174275c808ab89c95d7e59ea66aa5c34799da52093b52d995070922a466a28ed2b744010dc5682f5cf9def3c +MISC metadata.xml 1561 BLAKE2B c56918ab8f385550a8afd059d6df3e4c8cec39a0820b327a88b72a8159f1852cdc33c6b5e24cb8bdcef628707b6bc80950044a5998c7ac4c4017b017eef80c29 SHA512 1f5b24e0151d29c377082acab47d58e6b324602b01f688250cd32789a01c5269eb8dc65fc8ba8e0830e54c2c2d07ee5f14876754fe906c6480cdd962c262bb3b diff --git a/app-emulation/wine-proton/files/wine-proton-7.0.4-restore-menubuilder.patch b/app-emulation/wine-proton/files/wine-proton-7.0.4-restore-menubuilder.patch deleted file mode 100644 index 760340791060..000000000000 --- a/app-emulation/wine-proton/files/wine-proton-7.0.4-restore-menubuilder.patch +++ /dev/null @@ -1,14 +0,0 @@ -Without Steam there is no launcher by default, users with more custom -setups may not need this but others will want access to desktop entries. ---- a/configure.ac -+++ b/configure.ac -@@ -3683,2 +3683,3 @@ - WINE_CONFIG_MAKEFILE(programs/winefile) -+WINE_CONFIG_MAKEFILE(programs/winemenubuilder) - WINE_CONFIG_MAKEFILE(programs/winemine) ---- a/loader/wine.inf.in -+++ b/loader/wine.inf.in -@@ -5630,2 +5630,3 @@ - [Services] -+HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r" - HKLM,"System\CurrentControlSet\Services\Eventlog\Application",,16 diff --git a/app-emulation/wine-proton/files/wine-proton-7.0.4-unwind.patch b/app-emulation/wine-proton/files/wine-proton-7.0.4-unwind.patch deleted file mode 100644 index 372def52ba0c..000000000000 --- a/app-emulation/wine-proton/files/wine-proton-7.0.4-unwind.patch +++ /dev/null @@ -1,40 +0,0 @@ -Fix build with llvm-libunwind, and also fix for non-llvm libunwind -when using clang+bfd given clang doesn't have _Unwind_Find_FDE in -its rtlib and expects it from llvm-libunwind. - -The _CONFIG_H_ check is for <llvm-libunwind-15 (adds _VERSION). ---- a/dlls/ntdll/unix/signal_x86_64.c -+++ b/dlls/ntdll/unix/signal_x86_64.c -@@ -646,7 +646,9 @@ - unsigned int cie_offset; - }; - -+#if defined(_LIBUNWIND_VERSION) || defined(____LIBUNWIND_CONFIG_H__) || !defined(__clang__) - extern const struct dwarf_fde *_Unwind_Find_FDE (void *, struct dwarf_eh_bases *); -+#endif - - static unsigned char dwarf_get_u1( const unsigned char **p ) - { -@@ -1368,7 +1370,7 @@ - unw_proc_info_t info; - int rc; - --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(_LIBUNWIND_VERSION) || defined(____LIBUNWIND_CONFIG_H__) - rc = unw_getcontext( &unw_context ); - if (rc == UNW_ESUCCESS) - rc = unw_init_local( &cursor, &unw_context ); -@@ -1491,11 +1493,13 @@ - NTSTATUS CDECL unwind_builtin_dll( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEXT *context ) - { - struct dwarf_eh_bases bases; -+#if defined(_LIBUNWIND_VERSION) || defined(____LIBUNWIND_CONFIG_H__) || !defined(__clang__) - const struct dwarf_fde *fde = _Unwind_Find_FDE( (void *)(context->Rip - 1), &bases ); - - if (fde) - return dwarf_virtual_unwind( context->Rip, &dispatch->EstablisherFrame, context, fde, - &bases, &dispatch->LanguageHandler, &dispatch->HandlerData ); -+#endif - #ifdef HAVE_LIBUNWIND - return libunwind_virtual_unwind( context->Rip, &dispatch->EstablisherFrame, context, - &dispatch->LanguageHandler, &dispatch->HandlerData ); diff --git a/app-emulation/wine-proton/files/wine-proton-7.0.6-mingw64-11.0.0.patch b/app-emulation/wine-proton/files/wine-proton-7.0.6-mingw64-11.0.0.patch deleted file mode 100644 index 54ecc49c7235..000000000000 --- a/app-emulation/wine-proton/files/wine-proton-7.0.6-mingw64-11.0.0.patch +++ /dev/null @@ -1,20 +0,0 @@ -Hack: this does not actually need stdarg.h, but including it ensures -that _mingw.h will be loaded before the rest of Wine's winnt.h avoiding -issues with mingw64-runtime-11.0.0, e.g.: - - _mingw.h:602:60: error: redefinition of ‘__fastfail’ - make[1]: *** [Makefile:5900: dlls/advapi32/crypt_des.cross.o] Error 1 - -(other crypt_*.c happen to include stdarg.h first and don't fail, but this -one does not, same for several other files in dlls/) - -Not an issue with non-proton Wine 7.0 as Wine did not define __fastfail -until ~wine-7.10. Wine 8 does define it but does not seem to be a problem -there (perhaps due to different header layout). A more "right" fix would -be welcome, but given Proton-7 seems EOL it is not judged important. ---- a/include/winnt.h -+++ b/include/winnt.h -@@ -32,2 +32,3 @@ - #include <string.h> -+#include <stdarg.h> - #endif diff --git a/app-emulation/wine-proton/files/wine-proton-7.0.6-vulkan-libm.patch b/app-emulation/wine-proton/files/wine-proton-7.0.6-vulkan-libm.patch deleted file mode 100644 index b81778fb957c..000000000000 --- a/app-emulation/wine-proton/files/wine-proton-7.0.6-vulkan-libm.patch +++ /dev/null @@ -1,12 +0,0 @@ -Valve's patches add use of "ceil" without using libm, it works -by accident with -O2 but fails with -Os. - -ld: dlls/winevulkan/vulkan.o: in function `fshack_vk_queue_present': -vulkan.c:(.text+0x12f46): undefined reference to `ceil' ---- a/dlls/winevulkan/Makefile.in -+++ b/dlls/winevulkan/Makefile.in -@@ -4,3 +4,3 @@ - IMPORTS = user32 gdi32 advapi32 setupapi win32u --EXTRALIBS = $(PTHREAD_LIBS) -+EXTRALIBS = -lm $(PTHREAD_LIBS) - diff --git a/app-emulation/wine-proton/files/wine-proton-9.0.4-binutils2.44.patch b/app-emulation/wine-proton/files/wine-proton-9.0.4-binutils2.44.patch new file mode 100644 index 000000000000..c0d4ef6f5287 --- /dev/null +++ b/app-emulation/wine-proton/files/wine-proton-9.0.4-binutils2.44.patch @@ -0,0 +1,105 @@ +Note that this is only an issue when using mingw (PE) binutils-2.44, +host (ELF) binutils-2.44 has no impact on this and, before this patch, +using 2.44 could only happen with off-by-default USE=crossdev-mingw. + +https://bugs.winehq.org/show_bug.cgi?id=57819 +https://sourceware.org/PR32675 +https://gitlab.winehq.org/wine/wine/-/merge_requests/7328 +--- a/dlls/ntdll/loader.c ++++ b/dlls/ntdll/loader.c +@@ -4047,5 +4047,5 @@ + NTSTATUS nts; + FARPROC fp; +- DWORD id; ++ INT_PTR id; + + TRACE( "(%p, %p, %p, %p, %p, 0x%08lx)\n", base, desc, dllhook, syshook, addr, flags ); +--- a/tools/winebuild/import.c ++++ b/tools/winebuild/import.c +@@ -1514,4 +1514,14 @@ + } + ++static void output_import_section( int index, int is_delay ) ++{ ++ if (!is_delay) ++ output( "\n\t.section .idata$%d\n", index ); ++ else if (index == 5) ++ output( "\n\t.section .data$didat%d\n", index ); ++ else ++ output( "\n\t.section .rdata$didat%d\n", index ); ++} ++ + /* create a Windows-style import library */ + static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struct strarray files ) +@@ -1633,18 +1643,18 @@ + output( "\t.long 0\n" ); /* TimeDateStamp */ + +- output( "\n\t.section .idata$5\n" ); ++ output_import_section( 5, is_delay ); + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* FirstThunk tail */ + output( ".L__wine_import_addrs:\n" ); + +- output( "\n\t.section .idata$4\n" ); ++ output_import_section( 4, is_delay ); + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* OriginalFirstThunk tail */ + output( ".L__wine_import_names:\n" ); + + /* required to avoid internal linker errors with some binutils versions */ +- output( "\n\t.section .idata$2\n" ); ++ output_import_section( 2, is_delay ); + } + else + { +- output( "\n\t.section .idata$2\n" ); ++ output_import_section( 2, is_delay ); + output( "%s\n", asm_globl( import_desc ) ); + output_rva( ".L__wine_import_names" ); /* OriginalFirstThunk */ +@@ -1654,8 +1664,8 @@ + output_rva( ".L__wine_import_addrs" ); /* FirstThunk */ + +- output( "\n\t.section .idata$4\n" ); ++ output_import_section( 4, is_delay ); + output( ".L__wine_import_names:\n" ); /* OriginalFirstThunk head */ + +- output( "\n\t.section .idata$5\n" ); ++ output_import_section( 5, is_delay ); + output( ".L__wine_import_addrs:\n" ); /* FirstThunk head */ + } +@@ -1668,9 +1678,9 @@ + new_output_as_file(); + +- output( "\n\t.section .idata$4\n" ); ++ output_import_section( 4, is_delay ); + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* OriginalFirstThunk tail */ +- output( "\n\t.section .idata$5\n" ); ++ output_import_section( 5, is_delay ); + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* FirstThunk tail */ +- output( "\n\t.section .idata$7\n" ); ++ output_import_section( 7, is_delay ); + output( "%s\n", asm_globl( import_name ) ); + output( "\t%s \"%s\"\n", get_asm_string_keyword(), spec->file_name ); +@@ -1763,8 +1773,8 @@ + } + +- output( "\n\t.section .idata$4\n" ); ++ output_import_section( 4, is_delay ); + output_thunk_rva( by_name ? -1 : odp->ordinal, ".L__wine_import_name" ); + +- output( "\n\t.section .idata$5\n" ); ++ output_import_section( 5, is_delay ); + output( "%s\n", asm_globl( imp_name ) ); + if (is_delay) +@@ -1775,5 +1785,5 @@ + if (by_name) + { +- output( "\n\t.section .idata$6\n" ); ++ output_import_section( 6, is_delay ); + output( ".L__wine_import_name:\n" ); + output( "\t.short %d\n", odp->hint ); +@@ -1782,5 +1792,5 @@ + + /* reference head object to always pull its sections */ +- output( "\n\t.section .idata$7\n" ); ++ output_import_section( 7, is_delay ); + output_rva( "%s", asm_name( import_desc ) ); + diff --git a/app-emulation/wine-proton/metadata.xml b/app-emulation/wine-proton/metadata.xml index 3eb642f0a513..4e53c42efe00 100644 --- a/app-emulation/wine-proton/metadata.xml +++ b/app-emulation/wine-proton/metadata.xml @@ -20,7 +20,6 @@ <flag name="osmesa">Enable off-screen rendering (OpenGL in bitmaps) support</flag> <flag name="perl">Install helpers that require perl (winedump/winemaker)</flag> <flag name="sdl">Enable gamepad support using <pkg>media-libs/libsdl2</pkg></flag> - <flag name="vkd3d">Enable DirectX 12 support using <pkg>app-emulation/vkd3d</pkg></flag> <flag name="wow64"> Enable running 32bit applications without 32bit ELF multilib by mapping to 64bit calls (experimental, diff --git a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild deleted file mode 100644 index c4630cc016e8..000000000000 --- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild +++ /dev/null @@ -1,390 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MULTILIB_COMPAT=( abi_x86_{32,64} ) -PYTHON_COMPAT=( python3_{10..13} ) -inherit autotools flag-o-matic multilib multilib-build prefix -inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper - -WINE_GECKO=2.47.3 -WINE_MONO=7.4.0 -WINE_PV=$(ver_rs 2 -) - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/ValveSoftware/wine.git" - EGIT_BRANCH="bleeding-edge" -else - SRC_URI="https://github.com/ValveSoftware/wine/archive/refs/tags/proton-wine-${WINE_PV}.tar.gz" - S="${WORKDIR}/${PN}-wine-${WINE_PV}" - KEYWORDS="-* amd64 ~x86" -fi - -DESCRIPTION="Valve Software's fork of Wine" -HOMEPAGE="https://github.com/ValveSoftware/wine/" - -LICENSE="LGPL-2.1+ BSD-2 IJG MIT ZLIB gsm libpng2 libtiff" -SLOT="${PV}" -IUSE=" - +abi_x86_32 +abi_x86_64 +alsa crossdev-mingw custom-cflags debug - +fontconfig +gecko +gstreamer llvm-libunwind +mono nls openal - osmesa perl pulseaudio +sdl selinux +ssl udev udisks +unwind usb - v4l +vkd3d +xcomposite xinerama -" - -# tests are non-trivial to run, can hang easily, don't play well with -# sandbox, and several need real opengl/vulkan or network access -RESTRICT="test" - -# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked -WINE_DLOPEN_DEPEND=" - dev-libs/libgcrypt:=[${MULTILIB_USEDEP}] - media-libs/freetype[${MULTILIB_USEDEP}] - media-libs/libglvnd[X,${MULTILIB_USEDEP}] - media-libs/vulkan-loader[X,${MULTILIB_USEDEP}] - x11-libs/libXcursor[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] - x11-libs/libXi[${MULTILIB_USEDEP}] - x11-libs/libXrandr[${MULTILIB_USEDEP}] - x11-libs/libXrender[${MULTILIB_USEDEP}] - x11-libs/libXxf86vm[${MULTILIB_USEDEP}] - fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] ) - osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] ) - sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] ) - ssl? ( - dev-libs/gmp:=[${MULTILIB_USEDEP}] - net-libs/gnutls:=[${MULTILIB_USEDEP}] - ) - udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) - v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) - xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) - xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) -" -WINE_COMMON_DEPEND=" - ${WINE_DLOPEN_DEPEND} - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) - gstreamer? ( - dev-libs/glib:2[${MULTILIB_USEDEP}] - media-libs/gst-plugins-base:1.0[opengl,${MULTILIB_USEDEP}] - media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] - ) - openal? ( media-libs/openal[${MULTILIB_USEDEP}] ) - pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] ) - udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) - unwind? ( - llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] ) - !llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] ) - ) - usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] ) - vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] ) -" -RDEPEND=" - ${WINE_COMMON_DEPEND} - app-emulation/wine-desktop-common - gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] ) - gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] ) - mono? ( app-emulation/wine-mono:${WINE_MONO} ) - perl? ( - dev-lang/perl - dev-perl/XML-LibXML - ) - selinux? ( sec-policy/selinux-wine ) - udisks? ( sys-fs/udisks:2 ) -" -DEPEND=" - ${WINE_COMMON_DEPEND} - sys-kernel/linux-headers - x11-base/xorg-proto -" -BDEPEND=" - ${PYTHON_DEPS} - dev-lang/perl - sys-devel/binutils - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - nls? ( sys-devel/gettext ) - !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) -" -IDEPEND=">=app-eselect/eselect-wine-2" - -QA_CONFIG_IMPL_DECL_SKIP=( - __clear_cache # unused on amd64+x86 (bug #900332) - res_getservers # false positive -) -QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext - -PATCHES=( - "${FILESDIR}"/${PN}-7.0.4-musl.patch - "${FILESDIR}"/${PN}-7.0.4-noexecstack.patch - "${FILESDIR}"/${PN}-7.0.4-restore-menubuilder.patch - "${FILESDIR}"/${PN}-7.0.4-unwind.patch - "${FILESDIR}"/${PN}-7.0.6-mingw64-11.0.0.patch - "${FILESDIR}"/${PN}-7.0.6-vulkan-libm.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} == binary ]] && return - - if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then - local mingw=-w64-mingw32 - for mingw in $(usev abi_x86_64 x86_64${mingw}) $(usev abi_x86_32 i686${mingw}); do - if ! type -P ${mingw}-gcc >/dev/null; then - eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain" - eerror "yourself by installing sys-devel/crossdev then running:" - eerror - eerror " crossdev --target ${mingw}" - eerror - eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw" - eerror "--> Note that mingw builds are default for ${PN} even without this USE." - die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found" - fi - done - fi -} - -src_prepare() { - # sanity check, bumping these has a history of oversights - local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \ - dlls/appwiz.cpl/addons.c || die) - if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then - local gmfatal= - [[ ${PV} == *9999 ]] && gmfatal=nonfatal - ${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " ${geckomono} " (please file a bug)" - fi - - default - - if tc-is-clang; then - # -mabi=ms was ignored by <clang:16 then turned error in :17 - # and it still gets used in install phase despite --with-mingw, - # drop as a quick fix for now which hopefully should be safe - sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die - fi - - # ensure .desktop calls this variant + slot - sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die - - # similarly to staging, append to `wine --version` for identification - sed -i "s/wine_build[^1]*1/& (Proton-${WINE_PV})/" configure.ac || die - - # datadir is not where wine-mono is installed, so prefixy alternate paths - hprefixify -w /get_mono_path/ dlls/mscoree/metahost.c - - # always update for patches (including user's wrt #432348) - eautoreconf - tools/make_requests || die # perl - dlls/winevulkan/make_vulkan -x vk.xml || die # python, needed for proton's - # tip: if need more for user patches, with portage can e.g. do - # echo "post_src_prepare() { tools/make_specfiles || die; }" \ - # > /etc/portage/env/app-emulation/wine-proton -} - -src_configure() { - WINE_PREFIX=/usr/lib/${P} - WINE_DATADIR=/usr/share/${P} - - local conf=( - --prefix="${EPREFIX}"${WINE_PREFIX} - --datadir="${EPREFIX}"${WINE_DATADIR} - --includedir="${EPREFIX}"/usr/include/${P} - --libdir="${EPREFIX}"${WINE_PREFIX} - --mandir="${EPREFIX}"${WINE_DATADIR}/man - - # upstream (Valve) doesn't really support misc configurations (e.g. - # adds vulkan code not always guarded by --with-vulkan), so force - # some major options that are typically needed by games either way - --with-freetype - --with-mingw # needed by many, notably Blizzard titles - --with-opengl - --with-vulkan - --with-x - - # ...and disable most options unimportant for games and unused by - # Proton rather than expose as volatile USEs with little support - --without-capi - --without-cups - --without-gphoto - --without-gssapi - --without-krb5 - --without-ldap - --without-netapi - --without-opencl - --without-pcap - --without-sane - ac_cv_lib_soname_odbc= - - $(use_enable gecko mshtml) - $(use_enable mono mscoree) - --disable-tests - $(use_with alsa) - $(use_with fontconfig) - $(use_with gstreamer) - $(use_with nls gettext) - $(use_with openal) - $(use_with osmesa) - --without-oss # media-sound/oss is not packaged (OSSv4) - $(use_with pulseaudio pulse) - $(use_with sdl) - $(use_with ssl gnutls) - $(use_with udev) - $(use_with udisks dbus) # dbus is only used for udisks - $(use_with unwind) - $(use_with usb) - $(use_with v4l v4l2) - $(use_with vkd3d) - $(use_with xcomposite) - $(use_with xinerama) - ) - - tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097) - filter-lto # build failure - filter-flags -Wl,--gc-sections # runtime issues (bug #931329) - use custom-cflags || strip-flags # can break in obscure ways at runtime - use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} - - # broken with gcc-15's c23 default (TODO: try w/o occasionally, bug #943849) - append-cflags -std=gnu17 - - # temporary workaround for tc-ld-force-bfd not yet enforcing with mold - # https://github.com/gentoo/gentoo/pull/28355 - [[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] && - append-ldflags -fuse-ld=bfd - - # >=wine-proton-9 has proper fixes and builds with gcc-14, but would - # rather not have to worry about fixing old branches (bug #924486) - append-cflags $(test-flags-CC -Wno-error=incompatible-pointer-types) - - # build using upstream's way (--with-wine64) - # order matters: configure+compile 64->32, install 32->64 - local -i bits - for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do - ( - einfo "Configuring ${PN} for ${bits}bits in ${WORKDIR}/build${bits} ..." - - mkdir ../build${bits} || die - cd ../build${bits} || die - - # CROSSCC_amd64/x86 are unused by Wine, but recognized here for users - if (( bits == 64 )); then - : "${CROSSCC:=${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}" - conf+=( --enable-win64 ) - elif use amd64; then - conf+=( - $(usev abi_x86_64 --with-wine64=../build64) - TARGETFLAGS=-m32 # for widl - ) - # _setup is optional, but use over Wine's auto-detect (+#472038) - multilib_toolchain_setup x86 - fi - : "${CROSSCC:=${CROSSCC_x86:-i686-w64-mingw32-gcc}}" - - # use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu) - : "${CROSSCFLAGS:=$( - filter-flags '-fstack-protector*' #870136 - filter-flags '-mfunction-return=thunk*' #878849 - - # some bashrc-mv users tend to do CFLAGS="${LDFLAGS}" and then - # strip-unsupported-flags miss these during compile-only tests - # (primarily done for 23.0 profiles' -z, not full coverage) - filter-flags '-Wl,-z,*' - - # -mavx with mingw-gcc has a history of obscure issues and - # disabling is seen as safer, e.g. `WINEARCH=win32 winecfg` - # crashes with -march=skylake >=wine-8.10, similar issues with - # znver4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273 - append-cflags -mno-avx #912268 - - CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}" - : "${CROSSLDFLAGS:=$( - filter-flags '-fuse-ld=*' - CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}" - export CROSS{CC,{C,LD}FLAGS} - - ECONF_SOURCE=${S} econf "${conf[@]}" - ) - done -} - -src_compile() { - use abi_x86_64 && emake -C ../build64 # do first - use abi_x86_32 && emake -C ../build32 -} - -src_install() { - use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install - use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last - - # symlink for plain 'wine' and install its man pages if 64bit-only #404331 - if use abi_x86_64 && use !abi_x86_32; then - dosym wine64 ${WINE_PREFIX}/bin/wine - dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader - local man - for man in ../build64/loader/wine.*man; do - : "${man##*/wine}" - : "${_%.*}" - insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1 - newins ${man} wine.1 - done - fi - - use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \ - "${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die - - # create variant wrappers for eselect-wine - local bin - for bin in "${ED}"${WINE_PREFIX}/bin/*; do - make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}" - done - - # don't let portage try to strip PE files with the wrong - # strip executable and instead handle it here (saves ~120MB) - dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows - use debug || - find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \ - -exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} + || die - - dodoc ANNOUNCE AUTHORS README* documentation/README* - readme.gentoo_create_doc -} - -pkg_preinst() { - has_version ${CATEGORY}/${PN} && WINE_HAD_ANY_SLOT= -} - -pkg_postinst() { - [[ -v WINE_HAD_ANY_SLOT ]] || readme.gentoo_print_elog - - if use abi_x86_32; then - # difficult to tell what is needed from here, but try to warn - if has_version 'x11-drivers/nvidia-drivers'; then - if has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]'; then - ewarn "x11-drivers/nvidia-drivers is installed but is built without" - ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit" - ewarn "applications under ${PN} will likely not be usable." - ewarn "Multi-card setups may need this on media-libs/mesa as well." - fi - elif has_version 'media-libs/mesa[-abi_x86_32]'; then - ewarn "media-libs/mesa seems to be in use but is built without" - ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit" - ewarn "applications under ${PN} will likely not be usable." - fi - fi - - ewarn - ewarn "Warning: please consider ${PN} provided as-is without real" - ewarn "support. Upstream does not want bug reports unless can reproduce" - ewarn "with real Steam+Proton, and Gentoo is largely unable to help" - ewarn "unless it is a build/packaging issue. So, if need support, try" - ewarn "normal Wine or Proton instead." - - eselect wine update --if-unset || die -} - -pkg_postrm() { - eselect wine update --if-unset || die -} diff --git a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild index ca291e4a2bfa..c5e848376068 100644 --- a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild +++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2024 Gentoo Authors +# Copyright 2022-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -127,6 +127,7 @@ PATCHES=( "${FILESDIR}"/${PN}-8.0.1c-unwind.patch "${FILESDIR}"/${PN}-8.0.4-restore-menubuilder.patch "${FILESDIR}"/${PN}-8.0.5c-vulkan-libm.patch + "${FILESDIR}"/${PN}-9.0.4-binutils2.44.patch ) pkg_pretend() { diff --git a/app-emulation/wine-proton/wine-proton-9.0.2.ebuild b/app-emulation/wine-proton/wine-proton-9.0.2.ebuild index 21ce4922b7c7..4315a6ab2158 100644 --- a/app-emulation/wine-proton/wine-proton-9.0.2.ebuild +++ b/app-emulation/wine-proton/wine-proton-9.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2024 Gentoo Authors +# Copyright 2022-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -138,6 +138,7 @@ PATCHES=( "${FILESDIR}"/${PN}-8.0.4-restore-menubuilder.patch "${FILESDIR}"/${PN}-8.0.5c-vulkan-libm.patch "${FILESDIR}"/${PN}-9.0-rpath.patch + "${FILESDIR}"/${PN}-9.0.4-binutils2.44.patch ) pkg_pretend() { diff --git a/app-emulation/wine-proton/wine-proton-9.0.4.ebuild b/app-emulation/wine-proton/wine-proton-9.0.4.ebuild index 1755a53c0c96..3b56b56302d6 100644 --- a/app-emulation/wine-proton/wine-proton-9.0.4.ebuild +++ b/app-emulation/wine-proton/wine-proton-9.0.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2024 Gentoo Authors +# Copyright 2022-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -138,6 +138,7 @@ PATCHES=( "${FILESDIR}"/${PN}-8.0.4-restore-menubuilder.patch "${FILESDIR}"/${PN}-8.0.5c-vulkan-libm.patch "${FILESDIR}"/${PN}-9.0-rpath.patch + "${FILESDIR}"/${PN}-9.0.4-binutils2.44.patch ) pkg_pretend() { diff --git a/app-emulation/wine-proton/wine-proton-9999.ebuild b/app-emulation/wine-proton/wine-proton-9999.ebuild index 4319a3a8efc7..64c99557d831 100644 --- a/app-emulation/wine-proton/wine-proton-9999.ebuild +++ b/app-emulation/wine-proton/wine-proton-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2024 Gentoo Authors +# Copyright 2022-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -138,6 +138,7 @@ PATCHES=( "${FILESDIR}"/${PN}-8.0.4-restore-menubuilder.patch "${FILESDIR}"/${PN}-8.0.5c-vulkan-libm.patch "${FILESDIR}"/${PN}-9.0-rpath.patch + "${FILESDIR}"/${PN}-9.0.4-binutils2.44.patch ) pkg_pretend() { |