Patch fails to apply since commit 67e2ee1b2635f6867d3c92a14192bffb1c026d33
adolfintel opened this issue · 5 comments
adolfintel commented
I'm applying the patch to the current dxvk master with these commands:
git clone https://github.com/doitsujin/dxvk
git clone https://github.com/Sporif/dxvk-async
cd dxvk
patch -Np1 < ../dxvk-async/dxvk-async.patch
sh package-release.sh master ../build --no-package
Some of the changes fail to apply during, here's the log:
Hunk #1 succeeded at 129 (offset 26 lines).
patching file src/dxvk/dxvk_context.cpp
Hunk #1 succeeded at 4117 (offset 280 lines).
Hunk #2 succeeded at 4358 (offset 265 lines).
Hunk #3 succeeded at 4380 (offset 266 lines).
Hunk #4 succeeded at 4788 (offset 440 lines).
Hunk #5 succeeded at 5202 with fuzz 1 (offset 425 lines).
patching file src/dxvk/dxvk_context.h
Hunk #1 succeeded at 1227 with fuzz 2 (offset 68 lines).
Hunk #2 succeeded at 1307 with fuzz 2 (offset 96 lines).
patching file src/dxvk/dxvk_graphics.cpp
Hunk #1 FAILED at 62.
Hunk #2 FAILED at 83.
Hunk #3 succeeded at 107 with fuzz 2 (offset 4 lines).
Hunk #4 succeeded at 116 (offset 4 lines).
2 out of 4 hunks FAILED -- saving rejects to file src/dxvk/dxvk_graphics.cpp.rej
patching file src/dxvk/dxvk_graphics.h
Hunk #1 succeeded at 187 (offset 2 lines).
Hunk #2 succeeded at 202 (offset 2 lines).
Hunk #3 FAILED at 228.
Hunk #4 succeeded at 258 (offset 3 lines).
1 out of 4 hunks FAILED -- saving rejects to file src/dxvk/dxvk_graphics.h.rej
patching file src/dxvk/dxvk_image.h
Hunk #1 succeeded at 539 with fuzz 1 (offset 74 lines).
Hunk #2 succeeded at 582 with fuzz 2 (offset 78 lines).
patching file src/dxvk/dxvk_options.cpp
Hunk #1 succeeded at 8 with fuzz 2 (offset -2 lines).
patching file src/dxvk/dxvk_options.h
Hunk #1 succeeded at 15 with fuzz 1 (offset -6 lines).
patching file src/dxvk/dxvk_pipecompiler.cpp
patching file src/dxvk/dxvk_pipecompiler.h
patching file src/dxvk/dxvk_pipemanager.cpp
patching file src/dxvk/dxvk_pipemanager.h
Hunk #2 succeeded at 101 (offset 5 lines).
patching file src/dxvk/meson.build
Hunk #1 succeeded at 90 with fuzz 1 (offset 7 lines).
DXVK fails to build afterwards.
adolfintel commented
True, I copied the wrong commit id, I'll rename the issue.
I was working on fixing your patch but since you're already working on it, I'll wait for your version
sn-o-w commented
@Sporif Recently were made some changes, especially to dxvk_graphics.cpp -> doitsujin/dxvk@67e2ee1
So, therefore, the patch fails to apply. 😥
Sporif commented
@sn-o-w Yes I fixed it yesterday, dxvk-async.patch now works with the latest master.