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

Wine xiv git/update to latest wine-tkg-git master #28

Open
wants to merge 84 commits into
base: master
Choose a base branch
from

Conversation

rankynbass
Copy link

Just a quick PR to keep the repo up-to-date with wine-tkg-git changes.

Proof of success: https://github.com/rankynbass/unofficial-wine-xiv-git/actions?query=branch%3Awine-xiv-git%2Fupdate-to-latest

Tk-Glitch and others added 30 commits July 21, 2024 16:21
* ntsync5: Rebase patches

wine-staging rebase esync

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

* ntsync5: Move older version and rebase fastsync script

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

---------

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>
…ion to legacy (Frogging-Family#1235)

* childwindow-proton: Rebase against c2d46eaa1ef07a2921e5711212e9c5c354f58112

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

* childwindow-proton: Update childwindow-proton script

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

* childwindow-proton: Move older version to legacy

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

---------

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>
…rsion to legacy (Frogging-Family#1237)

* proton-cpu-topology-overrides: Move older version to legacy

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

* proton-cpu-topology-overrides: Rebase patch againts 90d2a173aa9b4f8c85e5a6f653f03ecf9b6f4e22

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

* proton-cpu-topology-overrides: Rebase script

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

---------

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>
* remove unused code from proton-tkg-nofsync patch

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

* staging_fixes: revert esync changes for ntsync5

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

* Fix1

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

* Revert "remove unused code from proton-tkg-nofsync patch"

This reverts commit 0fff7dc.

---------

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>
…ript install (Frogging-Family#1244)

* remove unused code from proton-tkg-nofsync patch

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

* proton-tkg-addition: Rebase patch

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

* proton-tkg-addition: Rename older version and update script

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

* Revert "remove unused code from proton-tkg-nofsync patch"

This reverts commit 4793cc2.

---------

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>
…1248)

* remove unused code from proton-tkg-nofsync patch

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

* childwindow-proton: rebase patch, update script and move older version to legacy

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

* Revert "remove unused code from proton-tkg-nofsync patch"

This reverts commit cee3f96.

* childwindow-proton: fix typo in script

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

---------

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>
…rogging-Family#1251)

* proton-tkg-additions: Rebase patch and update script

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

* proton-tkg-additions: Rename older version

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

* proton-tkg-additions: remove space in script

* fix script

---------

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>
…ly#1256)

* New hotfix patch: battlenet for Battle.Net launcher

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

* customization.cfg: Add option for battlenet_fix hotfix

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

* hotfixes: fix some moments

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

---------

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>
…ild window (Frogging-Family#1257)

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>
…cript (Frogging-Family#1260)

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>
Signed-off-by: Kirill Artemev <artewar6767@gmail.com>
Signed-off-by: Kirill Artemev <artewar6767@gmail.com>
)

* battlenet-fix: dont apply patch on staging commit

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

* customization.cfg: Remove _battlenet_fix variable

* battlenet-fix: Don`t check variable "_battlenet_fix"

I think we don't need this variable, it's better to apply the patch automatically

---------

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>
As part of implementing better dependency autoresolution,
a9d0a33 ("[IMPROVE] Better deps resolver (Frogging-Family#1138)") and
ff45a43 ("proton: Enable dependency autoresolver")
removed the _nomakepkg_dep_resolution_distro option from
customization.cfg and proton-tkg.cfg. However, CI workflows
for non-makepkg builds of Wine and Proton still expect to
set this option.

In addition, the workflow for Arch makepkg builds of Wine
contains a workaround for Frogging-Family#237
that was obviated in part by 37ce946 ("fix pipewire-jack
not providing jack2 anymore on arch linux anymore (Frogging-Family#675)")
and in part by 4971465 ("makepkg: Only grab lib32 deps
when _NOLIB32 is set to "false").

Update the currently maintained CI workflows to remove
these outdated steps. This shouldn't affect anything,
as the steps being removed were already doing nothing.
Also rework the logic for adding -esync and -fsync to make
various conditions for adding these three pkgname components
clearer. For example, ntsync can (theoretically) coexist
with esync; in that case we would add just -ntsync, not
-esync-ntsync (cf. esync and fsync coexistence).
…n-tkg.cfg (Frogging-Family#1268)

ntsync is part of the kernel UAPI, so the presence of the
ntsync module on the build host is not required to build
Wine with ntsync support. A complete ntsync header file at
/usr/include/linux/ntsync.h (replacing, if applicable, the
incomplete stub mainlined in kernel 6.10) is sufficient.

Note also that the proposed ntsync patchset targets kernels
>= 6.8, but builds still work if the build host is running
an earlier kernel. This is most immediately relevant for CI,
as the ubuntu-latest GitHub Actions runner has kernel 6.5.
Signed-off-by: Kirill Artemev <artewar6767@gmail.com>
Signed-off-by: Kirill Artemev <artewar6767@gmail.com>
* childwindow-proton: rebase legacy patch c2d46ea

Fix compability with wine 9.13

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

* Small change in childwindow-proton

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

---------

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>
…" is set in addition with an empty CUSTOM_MINGW_PATH value.

Fixes Frogging-Family#1269
… bug (Frogging-Family#1279)

Enabled if esync/fsync is used after wine 54ca1ab607d3ff22a1f57a9561430f64c75f0916
Artewar67 and others added 7 commits October 26, 2024 00:59
* ntsync5: rebase patches for cebad42f

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

* ntsync5: Move older patches to legacy and update script

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

* ntsync5: Fix apply staging and ERROR_INVALID_HANDLE in steam

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

---------

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>
Signed-off-by: Kirill Artemev <artewar6767@gmail.com>
Signed-off-by: Kirill Artemev <artewar6767@gmail.com>
* fsync: rebase for cebad42

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

* remove string

---------

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>
- Update esync/fsync unix patchsets for e01b708 and move previous versions to legacy
- Disable server_Abort_waiting_on_a_completion_port_when_closing_it on 291888b+
…y#1302)

Since Wine 4db7ed25b9 ("winevulkan: Cache downloaded files
in make_vulkan."), Wine builds with Vulkan enabled fail on
Arch runners due to insufficient permissions when
dlls/winevulkan/make_vulkan attempts to create a cache
directory at /home/user/.cache/wine.

Fix the build failure by setting the currently unused
XDG_CACHE_HOME envvar to force the cache directory to be
created somewhere inside /tmp instead.

This additionally fixes build failures that would otherwise
arise in dlls/opencl/make_opencl, dlls/opengl32/make_opengl,
and tools/make_unicode, all of which use that envvar to
derive the same cache directory path and attempt to create
it at build time if it doesn't exist.

Note that dlls/appwiz.cpl/addons.c also references that
envvar, but setting it during build time should not affect
anything during runtime.
@rankynbass
Copy link
Author

rankynbass commented Nov 7, 2024

Artewar67 and others added 21 commits November 8, 2024 02:10
Frogging-Family#1304)

* ntsync5: rebase patch against 962017beef4a0405e4fece0075e286e445da55da

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

* ntsync5: move older version to legacy update script

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

* ntsync5: Proper support for wait completion ports for legacy

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

---------

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>
…ing-Family#1308)

* fsync: rebase against 962017beef4a0405e4fece0075e286e445da55da

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

* fsync: move older version to legacy

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

* fsync: fix patches

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

---------

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>
* esync: rebase patches and fix fsync patches

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

* fix patches

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

---------

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>
…1103e05a (Frogging-Family#1319)

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>
…argeting *_9.0 version

Looks like an oversight
…gging-Family#1321)

* ntsync5: rebase against 45953cdb

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

* ntsync5: Move older version to legacy and update script

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

---------

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>
Signed-off-by: Kirill Artemev <artewar6767@gmail.com>
LoL now uses vanguard anticheat that acts in kernel level
which means that is impossible to running currently on Wine
Is better to remove it.
* ntsync5: rebase against e24ba584

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

* ntsync5: move older version to legacy and update script

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

---------

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>
This patches doesn`t have code for completion.c which cause wineserver crash in Battle.Net

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>
* Update customization.cfg

Add clarification

* Attempt at clarifying the default config and presets situation.

---------

Co-authored-by: Tk-Glitch <ti3nou@gmail.com>
)

* ntdll-WRITECOPY: Additional patch for mainline

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

* fix script

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

---------

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>
…Family#1338)

* Updated de-steamify-90.mypatch for currentent experimental

* Updated de-steamify-90-be.mypatch for current bleeding-edge
@rankynbass
Copy link
Author

rankynbass commented Dec 6, 2024

There's some cpu topology stuff in the pre 10.0 commits that don't play nice with tkg patches yet, but if we build on exactly v9.22 staging it'll work just fine.
https://github.com/rankynbass/unofficial-wine-xiv-git/actions?query=branch%3Awine-xiv-git%2Fupdate-to-latest++

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

Successfully merging this pull request may close these issues.

9 participants