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

Patch fails to apply #77

Open
TechySkills opened this issue Jul 1, 2024 · 0 comments
Open

Patch fails to apply #77

TechySkills opened this issue Jul 1, 2024 · 0 comments

Comments

@TechySkills
Copy link

Steps I used:

git clone https://github.com/doitsujin/dxvk
git clone https://github.com/Sporif/dxvk-async
cd dxvk
C:\Program Files\Git\usr\bin\patch.exe" -Np1 < ../dxvk-async/dxvk-async.patch

Here are the logs:

(Stripping trailing CRs from patch; use --binary to disable.)
patching file meson.build
Hunk #1 succeeded at 182 (offset 60 lines).
(Stripping trailing CRs from patch; use --binary to disable.)
patching file src/dxvk/dxvk_context.cpp
Hunk #1 succeeded at 5089 (offset 549 lines).
Hunk #2 succeeded at 5447 (offset 556 lines).
Hunk #3 succeeded at 5471 (offset 556 lines).
Hunk #4 succeeded at 5979 (offset 610 lines).
Hunk #5 succeeded at 6398 (offset 618 lines).
(Stripping trailing CRs from patch; use --binary to disable.)
patching file src/dxvk/dxvk_context.h
Hunk #1 succeeded at 1639 (offset 146 lines).
Hunk #2 succeeded at 1722 (offset 146 lines).
(Stripping trailing CRs from patch; use --binary to disable.)
patching file src/dxvk/dxvk_graphics.cpp
Hunk #1 succeeded at 979 (offset 80 lines).
Hunk #2 FAILED at 908.
1 out of 2 hunks FAILED -- saving rejects to file src/dxvk/dxvk_graphics.cpp.rej
(Stripping trailing CRs from patch; use --binary to disable.)
patching file src/dxvk/dxvk_graphics.h
Hunk #1 succeeded at 530 (offset 9 lines).
Hunk #2 succeeded at 587 (offset 9 lines).
(Stripping trailing CRs from patch; use --binary to disable.)
patching file src/dxvk/dxvk_image.h
Hunk #1 succeeded at 549 (offset 2 lines).
Hunk #2 succeeded at 588 (offset 2 lines).
(Stripping trailing CRs from patch; use --binary to disable.)
patching file src/dxvk/dxvk_options.cpp
Hunk #1 FAILED at 10.
1 out of 1 hunk FAILED -- saving rejects to file src/dxvk/dxvk_options.cpp.rej
(Stripping trailing CRs from patch; use --binary to disable.)
patching file src/dxvk/dxvk_options.h
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant