diff options
Diffstat (limited to 'app-emulation/wine-vanilla')
-rw-r--r-- | app-emulation/wine-vanilla/Manifest | 3 | ||||
-rw-r--r-- | app-emulation/wine-vanilla/files/wine-vanilla-7.21-opengl32.patch | 73 | ||||
-rw-r--r-- | app-emulation/wine-vanilla/wine-vanilla-7.21-r1.ebuild (renamed from app-emulation/wine-vanilla/wine-vanilla-7.21.ebuild) | 3 |
3 files changed, 77 insertions, 2 deletions
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest index aa24705e3015..1fbca684fa7d 100644 --- a/app-emulation/wine-vanilla/Manifest +++ b/app-emulation/wine-vanilla/Manifest @@ -2,6 +2,7 @@ AUX wine-vanilla-7.0-noexecstack.patch 223 BLAKE2B dff1867e2977bd14fcfab9dfa2c2f AUX wine-vanilla-7.0-unwind.patch 1694 BLAKE2B 017c7b761d692f8e8d23f52e51529880f95bddf5fee4309ab97bee951527bd427924dbb335e4bf57a27405e3d2440666f774c6859b81933d3007247e1cbf4898 SHA512 5d20960a8eda2d80097d6db81287c9d05ed4ea50df974c93391a427b743383a6806f24bc552c18a9336e7aea0ceb801972865ff470bde8ea7fd9423f57eb09ae AUX wine-vanilla-7.20-unwind.patch 1450 BLAKE2B 3f90cc131104ad72a11ae30c582b79b3e4d8c0278d51c0a193fb9e460cf088b315503bd08bd904e8d28f72f40ab3df90f83f2542b991888a2f504cc7d2adad4d SHA512 a6c4672a44c1220d5b1efabeca535a4a3510fe92aac73c38f65a09bfbd271af8b8b1bfe2c408ba5356806cb71252a6956b8130fcd06a475037b9e51d28c2a156 AUX wine-vanilla-7.21-crossflags.patch 876 BLAKE2B fa0bfd1f5fba242a8a99bf94e5ebb2c9cc07bb452d84d542f64a7f73795646af91283ac98dc2a78199ad6d0652544d7768a602539bd7c083ac5b9cf9fd4472ae SHA512 fe5160233246ac2335bb7f38daa761978544a935238d7b99cccf36fe09efa171bc4addbdeedbb457c28ea3a85377f4615ba68d04544ff887c94ff8341e3a8178 +AUX wine-vanilla-7.21-opengl32.patch 2741 BLAKE2B 8bf1a5f55172b3f8310e8c9e1b3a0329281ed32632376d4db4a225ab7f5032215d891d9adbbab0ef9bc6f4b1a1acee162910b1abfe02fb45f201b3697624d513 SHA512 a3727cdefee70060fb08eae246c3fe5f9c7179c3cf471ebc7f414559eed717151216c843adc0145e4cd3781191d2863a71ce2902ca14f46b872be83c48ba5c1c DIST wine-7.0.1.tar.xz 27167768 BLAKE2B 9bf74e7077fe4b77611f8195feeb53fc6475bdaeac97dab5221942115d6108d8786f93d4a96745bad72afb074b15129fec9b0b2f10261d91c9a9b57bd2240ded SHA512 5a5258132fe30bfb5313454598b85e7d97a74d1e0c7ca7af16aa8c486e316ad34ab74a25fd9a403c98ad1f3280385232f7d159bb824f713e920a4a0dae62c944 DIST wine-7.0.tar.xz 27120912 BLAKE2B 84bfeb28d56f0f40bb93b1b5bf8954c8be2fd90fde5a61608e7c35f48addcce7a4d660e63c3caa3ca2c365d1e83b55a1c3485872b2d6bfa8941e2bce44c4aca6 SHA512 eec17b046ed5447eb540f421c9b2748d9419ce087496c2743a9914fd27bbe5ff9da0cfe47d3cd76fa97323bd1188a1d82b1eef4968d86ed1957dc1a95e28529c DIST wine-7.19.tar.xz 28502612 BLAKE2B b7b270656955c7a1e1d84e8bbc7e3e8abff5aedadb5e8a458f0b1109d746875a359f3d2f53b1c9c6caae65d17fd1d205466cd3a884034a8bad6afe9456f13b5d SHA512 f76dbda97cccad4c0f249b5dd4e8d48afa832134f1704ae228650bb73ee82823e628b23bd53a3f8729e06a8933597ff2fffa5551f156fc9c9181b67c066747d5 @@ -11,6 +12,6 @@ EBUILD wine-vanilla-7.0-r3.ebuild 10596 BLAKE2B 9e62fe7db88a8e8e8232b4cd2cea88bd EBUILD wine-vanilla-7.0.1.ebuild 10272 BLAKE2B ae3917c6d7900e0a211384a600c29b825ab686da4ad79e89a7c479a997b2bdea65862feed77a94d134532b1ac437524004523da9343de8b61d7790f46c567b1b SHA512 ee9cebb5af001838f9659f576b7f54a06e12994c4e35bca445c521f6031367915ef2e898f9776482209c201e2653735322767b9000c9d8534d167e64c6273cdb EBUILD wine-vanilla-7.19.ebuild 10187 BLAKE2B 9008395c2c412674f26b5273ae83cdaad211eadfa70de7d75a7a336b0c3ed189ae0d2c60cd957c8c10f1bcdb22fe9c59a48f034b9e597ccf36c55540a374301c SHA512 9d0ae015c3a171768d01d769df742f66741e2d5fa14cfcbcd458e7ccabb7f7b98cabdcf1eff55b88a8b927c85e14aea7319e0edeac1ca57e60335144768f752e EBUILD wine-vanilla-7.20.ebuild 10188 BLAKE2B 77c7365ec9c58166b07a13e4204bb0a0e2251816c502dbea050877cc19b7864b16e7c4513cac8ad2225137f70137808d58eec17469af09f1278263a87f5aba10 SHA512 db487e83f4bfded1b71a0d4b3ba1608cc46a9f5a767a78d2efb9bbd545038fba041c92234f851156fee5e637c13b3e76286a88139d250131320b45af4106fc8f -EBUILD wine-vanilla-7.21.ebuild 10289 BLAKE2B b0c41654525de30f0bdd43319febc764ede2786ec6078579fefad02ba38bc3f793decf9a046a74af7ca7b870ca12cbede6b4a54446fa4f83a5854991dad8e649 SHA512 b7e7a4d33898c4c01be37350c219dd1f223074ed5908fcdf7d6ec2b61a9e1575b5faa7cab570cdc2625f2f986552bf3f0a99bdd040e943760b97c3eb05b3b138 +EBUILD wine-vanilla-7.21-r1.ebuild 10318 BLAKE2B 0b6c50edab0c79d522c20d2f59e062f9b01b51fe3aafd21f2adc4150156ba060029020c09f7d6a1c59b1ea0d22725beab85bdb908b447f9630d8951a3ef39025 SHA512 16fc2e67425af712f00bb8b952a03a717bff142461c29c6fde4df79e6ff97e9b6cf44a81521568e666638382efdaac53e0067b8fde8b867d92f69a256e0dcc83 EBUILD wine-vanilla-9999.ebuild 10290 BLAKE2B 5520ca47cd05a6ce11837819857cee2fc4d718ee8d7a2c14273f64d8d2f5280b4d063bf12b2462e8b38ba3010dc51859fbf0193e34a8bc6194759e0186bf36fd SHA512 ac5154d780d37c350f7078704efe4914bc733a6a1f72aa9ad74106e73b32c7580fbe54687e30f70754eca05f96eeed2b21083db10692bb67f799e2f64fdc9cd8 MISC metadata.xml 2376 BLAKE2B c37d5b769ce6ea0fd6ac0cde1084a332e34c13d31633d5c60970f89a932f621c0332b97b0667bbc42098a01c979919ac9d8d30487f2ad6691259270641b85485 SHA512 2968f0df88d5d95c0c649ae15cbc9088061c915046b2014448dad782a4abfa8cb173b6ec8ac15575329e5ce882342dfd1f5076a0ea8a2e89800fdc9628dc05f9 diff --git a/app-emulation/wine-vanilla/files/wine-vanilla-7.21-opengl32.patch b/app-emulation/wine-vanilla/files/wine-vanilla-7.21-opengl32.patch new file mode 100644 index 000000000000..9411e05e96fd --- /dev/null +++ b/app-emulation/wine-vanilla/files/wine-vanilla-7.21-opengl32.patch @@ -0,0 +1,73 @@ +Fixes PE opengl32.dll failing to initialize. + +https://gitlab.winehq.org/wine/wine/-/commit/34099bba6cb +From: RĂ©mi Bernon <rbernon@codeweavers.com> +Date: Mon, 14 Nov 2022 11:55:51 +0100 +Subject: [PATCH] ntdll: Delay loading unixlibs until the functions are + requested. + +Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53909 +--- a/dlls/ntdll/unix/virtual.c ++++ b/dlls/ntdll/unix/virtual.c +@@ -98,6 +98,7 @@ struct builtin_module + unsigned int refcount; + void *handle; + void *module; ++ char *unix_path; + void *unix_handle; + }; + +@@ -583,6 +584,7 @@ static void add_builtin_module( void *module, void *handle ) + builtin->handle = handle; + builtin->module = module; + builtin->refcount = 1; ++ builtin->unix_path = NULL; + builtin->unix_handle = NULL; + list_add_tail( &builtin_modules, &builtin->entry ); + } +@@ -603,6 +605,7 @@ void release_builtin_module( void *module ) + list_remove( &builtin->entry ); + if (builtin->handle) dlclose( builtin->handle ); + if (builtin->unix_handle) dlclose( builtin->unix_handle ); ++ free( builtin->unix_path ); + free( builtin ); + } + break; +@@ -652,6 +655,8 @@ static NTSTATUS get_builtin_unix_funcs( void *module, BOOL wow, const void **fun + LIST_FOR_EACH_ENTRY( builtin, &builtin_modules, struct builtin_module, entry ) + { + if (builtin->module != module) continue; ++ if (builtin->unix_path && !builtin->unix_handle) ++ builtin->unix_handle = dlopen( builtin->unix_path, RTLD_NOW ); + if (builtin->unix_handle) + { + *funcs = dlsym( builtin->unix_handle, ptr_name ); +@@ -669,26 +674,19 @@ static NTSTATUS get_builtin_unix_funcs( void *module, BOOL wow, const void **fun + */ + NTSTATUS load_builtin_unixlib( void *module, const char *name ) + { +- void *handle; + sigset_t sigset; +- NTSTATUS status = STATUS_DLL_NOT_FOUND; ++ NTSTATUS status = STATUS_SUCCESS; + struct builtin_module *builtin; + +- if (!(handle = dlopen( name, RTLD_NOW ))) return status; + server_enter_uninterrupted_section( &virtual_mutex, &sigset ); + LIST_FOR_EACH_ENTRY( builtin, &builtin_modules, struct builtin_module, entry ) + { + if (builtin->module != module) continue; +- if (!builtin->unix_handle) +- { +- builtin->unix_handle = handle; +- status = STATUS_SUCCESS; +- } ++ if (!builtin->unix_path) builtin->unix_path = strdup( name ); + else status = STATUS_IMAGE_ALREADY_LOADED; + break; + } + server_leave_uninterrupted_section( &virtual_mutex, &sigset ); +- if (status) dlclose( handle ); + return status; + } + diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.21.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.21-r1.ebuild index d931d7219d8d..38fe963828ae 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.21.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.21-r1.ebuild @@ -128,7 +128,8 @@ QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext PATCHES=( "${FILESDIR}"/${PN}-7.0-noexecstack.patch "${FILESDIR}"/${PN}-7.20-unwind.patch - "${FILESDIR}"/${PN}-7.21-crossflags.patch + "${FILESDIR}"/${P}-crossflags.patch + "${FILESDIR}"/${P}-opengl32.patch ) pkg_pretend() { |