bdf47492d4
- Wine 8.12 changed the implementation of `macdrv_get_gpus_from_metal`, causing the patch used by nixpkgs to break. This patch splits that patch up to apply cleanly depending on the version; - Silence an implicit pointer to integer conversion warning due to the above patch (required by the Clang 16 stdenv bump); - Add the PCSC framework on Darwin, which is required as of Wine 8.14. Wine 8.14 changes the implementation of `macdrv_get_gpus_from_metal`, causing the patch to no longer apply cleanly. Splitting the patch allows only the parts that are still needed to apply cleanly dependin gon the Wine version being built.
23 lines
1.2 KiB
Diff
23 lines
1.2 KiB
Diff
diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m
|
|
--- a/dlls/winemac.drv/cocoa_display.m
|
|
+++ b/dlls/winemac.drv/cocoa_display.m
|
|
@@ -289,7 +289,7 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count)
|
|
* the primary GPU because we need to hide the integrated GPU for an automatic graphic switching pair to avoid apps
|
|
* using the integrated GPU. This is the behavior of Windows on a Mac. */
|
|
primary_device = [MTLCreateSystemDefaultDevice() autorelease];
|
|
- if (macdrv_get_gpu_info_from_registry_id(&primary_gpu, primary_device.registryID))
|
|
+ if (macdrv_get_gpu_info_from_registry_id(&primary_gpu, [primary_device registryID]))
|
|
goto done;
|
|
|
|
/* Hide the integrated GPU if the system default device is a dedicated GPU */
|
|
@@ -301,7 +301,7 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count)
|
|
|
|
for (i = 0; i < devices.count; i++)
|
|
{
|
|
- if (macdrv_get_gpu_info_from_registry_id(&gpus[gpu_count], devices[i].registryID))
|
|
+ if (macdrv_get_gpu_info_from_registry_id(&gpus[gpu_count], [devices[i] registryID]))
|
|
goto done;
|
|
|
|
if (hide_integrated && devices[i].isLowPower)
|
|
|