Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dxvk_2: 2.3 -> 2.3.1 #302187

Merged
merged 2 commits into from
Apr 28, 2024
Merged

dxvk_2: 2.3 -> 2.3.1 #302187

merged 2 commits into from
Apr 28, 2024

Conversation

r-ryantm
Copy link
Contributor

@r-ryantm r-ryantm commented Apr 6, 2024

Maintainer comments: In addition to the automatic update, I pushed a cleanup to drop mcfgthread-12.dll as a build requirement. I also fixed a build issue with DXVK 1.10.3 when using GCC 13.

Fixes #283642.


Automatic update generated by nixpkgs-update tools. This update was made based on information from passthru.updateScript.

meta.description for dxvk_2 is: A Vulkan-based translation layer for Direct3D 9/10/11

meta.homepage for dxvk_2 is: https://github.com/doitsujin/dxvk

meta.changelog for dxvk_2 is: https://github.com/doitsujin/dxvk/releases

Updates performed
  • Ran passthru.UpdateScript
To inspect upstream changes
Impact

Checks done


  • built on NixOS
  • The tests defined in passthru.tests, if any, passed
  • found 2.3.1 with grep in /nix/store/7nksqkmh2hb1gcn4qqpi3s264071v3z2-dxvk-2.3.1
  • found 2.3.1 in filename of file in /nix/store/7nksqkmh2hb1gcn4qqpi3s264071v3z2-dxvk-2.3.1

Rebuild report (if merged into master) (click to expand)
2 total rebuild path(s)

2 package rebuild(s)

First fifty rebuilds by attrpath
dxvk
dxvk_2
Instructions to test this update (click to expand)

Either download from Cachix:

nix-store -r /nix/store/7nksqkmh2hb1gcn4qqpi3s264071v3z2-dxvk-2.3.1 \
  --option binary-caches 'https://cache.nixos.org/ https://nix-community.cachix.org/' \
  --option trusted-public-keys '
  nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=
  cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
  '

(The Cachix cache is only trusted for this store-path realization.)
For the Cachix download to work, your user must be in the trusted-users list or you can use sudo since root is effectively trusted.

Or, build yourself:

nix-build -A dxvk_2 https://github.com/r-ryantm/nixpkgs/archive/f9c6b7c958146cef3e7f30979b55c4bc3d266412.tar.gz

Or:

nix build github:r-ryantm/nixpkgs/f9c6b7c958146cef3e7f30979b55c4bc3d266412#dxvk_2

After you've downloaded or built it, look at the files and if there are any, run the binaries:

ls -la /nix/store/7nksqkmh2hb1gcn4qqpi3s264071v3z2-dxvk-2.3.1
ls -la /nix/store/7nksqkmh2hb1gcn4qqpi3s264071v3z2-dxvk-2.3.1/bin


Pre-merge build results

We have automatically built all packages that will get rebuilt due to
this change.

This gives evidence on whether the upgrade will break dependent packages.
Note sometimes packages show up as failed to build independent of the
change, simply because they are already broken on the target branch.

Result of nixpkgs-review --extra-nixpkgs-config '{ allowInsecurePredicate = x: true; }' run on x86_64-linux 1

4 packages built:
  • dxvk
  • dxvk.bin
  • dxvk.lib
  • dxvk_2

Maintainer pings

cc @reckenrode for testing.

@wegank
Copy link
Member

wegank commented Apr 25, 2024

@ofborg build dxvk dxvk.passthru.tests dxvk_2 dxvk_2.passthru.tests

r-ryantm and others added 2 commits April 25, 2024 01:36
- Reformat per RFC-166;
- Update setup script to report on and offer to clean up obsolete mcfgthread DLL;
- Switch DXVK to thread model to Win32 from MCF; and
- Clean up Meson build configuration.
@reckenrode
Copy link
Contributor

https://github.com/ofborg build dxvk dxvk.passthru.tests dxvk_2 dxvk_2.passthru.tests

@reckenrode
Copy link
Contributor

I accidentally dropped pthreads from dxvk_2. The force push put it back.

@reckenrode
Copy link
Contributor

reckenrode commented Apr 25, 2024

Before any one merges this, I’d like to get confirmation from Linux users about the changes to confirm it works for them (especially 32-bit).

@LovingMelody
Copy link
Contributor

LovingMelody commented Apr 27, 2024

Looks like this package builds but does not work still I receive the error 0328:err:module:import_dll Library libmcfgthread-1.dll (which is needed by L"C:\\windows\\system32\\dxgi.dll")

Edit: Seems like an issue w/ my build machine's cache, I was able to rebuild and confirm that star citizen at least runs without issue

@wegank wegank merged commit e412b1f into NixOS:master Apr 28, 2024
24 checks passed
@r-ryantm r-ryantm deleted the auto-update/dxvk_2 branch April 28, 2024 12:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

dxvk broken: missing libmcfgthread-1.dll, stack overflow while initializing
4 participants