Unverified Commit fd270313 authored by Randy Eckenrode's avatar Randy Eckenrode
Browse files

wine64Packages: 8.17 -> 8.20 

https://www.winehq.org/announce/8.18
https://www.winehq.org/announce/8.19
https://www.winehq.org/announce/8.20
parent 2387a37f

pkgs/applications/emulators/wine/base.nix

+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { 
      # uses property syntax in one place. The first patch is necessary only with older

      # versions of Wine. The second is needed on all versions of Wine.

      (lib.optional (lib.versionOlder version "8.12") ./darwin-metal-compat-pre8.12.patch)

      (lib.optional (lib.versionOlder version "8.18") ./darwin-metal-compat-pre8.19.patch)

      ./darwin-metal-compat.patch

      # Wine requires `qos.h`, which is not included by default on the 10.12 SDK in nixpkgs.

      ./darwin-qos.patch

pkgs/applications/emulators/wine/darwin-metal-compat-pre8.18.patch

0 → 100644
+12 −0
Original line number Diff line number Diff line 
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

@@ -354,7 +354,7 @@ static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gp

 

     device = [CGDirectDisplayCopyCurrentMetalDevice(display_id) autorelease];

     if (device && [device respondsToSelector:@selector(registryID)])

-        ret = macdrv_get_gpu_info_from_registry_id(gpu, device.registryID);

+        ret = macdrv_get_gpu_info_from_registry_id(gpu, [device registryID]);

 

 done:

     [pool release];

pkgs/applications/emulators/wine/darwin-metal-compat.patch

+7 −6
Original line number Diff line number Diff line 
diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m

index fbbe16efcbf..2db375ff3d5 100644

--- a/dlls/winemac.drv/cocoa_display.m

+++ b/dlls/winemac.drv/cocoa_display.m

@@ -354,7 +354,7 @@ static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gp

@@ -387,7 +387,7 @@ static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gp

 

     device = [CGDirectDisplayCopyCurrentMetalDevice(display_id) autorelease];

     if (device && [device respondsToSelector:@selector(registryID)])

-        ret = macdrv_get_gpu_info_from_registry_id(gpu, device.registryID);

+        ret = macdrv_get_gpu_info_from_registry_id(gpu, [device registryID]);

 

 done:

     [pool release];
 
-        return macdrv_get_gpu_info_from_registry_id(gpu, device.registryID);

+        return macdrv_get_gpu_info_from_registry_id(gpu, [device registryID]);

     else

         return -1;

 }

pkgs/applications/emulators/wine/sources.nix

+9 −9
Original line number Diff line number Diff line
@@ -69,9 +69,9 @@ in rec { 


  unstable = fetchurl rec {

    # NOTE: Don't forget to change the hash for staging as well.

    version = "8.17";

    version = "8.20";

    url = "https://dl.winehq.org/wine/source/8.x/wine-${version}.tar.xz";

    hash = "sha256-8BeFvTFix05l3rE6oK3XEeN8SERUcZvt0OjCsaNGm34=";

    hash = "sha256-SNa3a9ZDBaICBX+8GdkiwfSWJfbRqYJZJ8ChhXJzmYI=";

    inherit (stable) patches;



    ## see http://wiki.winehq.org/Gecko
@@ -88,9 +88,9 @@ in rec { 


    ## see http://wiki.winehq.org/Mono

    mono = fetchurl rec {

      version = "8.0.0";

      version = "8.1.0";

      url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";

      hash = "sha256-dbP0XcodyJhX/p6TLaeHEPZMxtSe8asMcjoXcIW0cRs=";

      hash = "sha256-DtPsUzrvebLzEhVZMc97EIAAmsDFtMK8/rZ4rJSOCBA=";

    };



    updateScript = writeShellScript "update-wine-unstable" ''
@@ -116,8 +116,8 @@ in rec { 


  staging = fetchFromGitHub rec {

    # https://github.com/wine-staging/wine-staging/releases

    version = "8.17.1";

    hash = "sha256-h36NDFYsI0y8TG41IH10IdF4QEuBkBewQ3knZ9iwDpg=";

    version = "8.20";

    hash = "sha256-CiWTXjUR1+GY+MO7djHfVUH71zSo3lpH9IaqS5zCeJ8=";

    owner = "wine-staging";

    repo = "wine-staging";

    rev = "v${version}";
@@ -127,12 +127,12 @@ in rec { 


  wayland = fetchFromGitLab {

    # https://gitlab.collabora.com/alf/wine/-/tree/wayland

    version = "8.0";

    hash = "sha256-whRnm21UyKZ4AQufNmctzivISVobnCeidmpYz65vlyk=";

    version = "8.2";

    hash = "sha256-Eb2SFBIeQQ3cVZkUQcwNT5mcYe0ShFxBdMc3BlqkwTo=";

    domain = "gitlab.collabora.com";

    owner = "alf";

    repo = "wine";

    rev = "2f80bd757739f2dd8da41abceae6b87d2c568152";

    rev = "b2547ddf9e08cafce98cf7734d5c4ec926ef3536";



    inherit (unstable) gecko32 gecko64;