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

wesnoth: update to 1.18.0. #49545

Merged
merged 2 commits into from
May 31, 2024

Conversation

iFoundSilentHouse
Copy link
Contributor

  • I tested the changes in this PR: YES
    Checked out new compaign.

  • I built this PR locally for my native architecture, (x86_64-glibc)

Patch for boost is no longer needed as it was commited to 1.17 version.
Added libcurl as changelog says wesnoth now needs it for compiling.

@iFoundSilentHouse
Copy link
Contributor Author

For x86_64 build is fine locally (I've checked it multiple times). Though for musl some extra patching needs to be done. Working on it.

@iFoundSilentHouse
Copy link
Contributor Author

I built template successfully on: x86_64, i686, x86_64-musl, aarch64-musl. Will add proofs if CI checks will fail

@iFoundSilentHouse iFoundSilentHouse marked this pull request as ready for review March 26, 2024 10:30
@iFoundSilentHouse iFoundSilentHouse marked this pull request as draft March 26, 2024 10:44
@iFoundSilentHouse iFoundSilentHouse force-pushed the wesnoth-1.18.0 branch 5 times, most recently from 1b625fb to 7589dbf Compare March 26, 2024 11:13
@iFoundSilentHouse iFoundSilentHouse marked this pull request as ready for review March 26, 2024 11:19
@iFoundSilentHouse iFoundSilentHouse force-pushed the wesnoth-1.18.0 branch 2 times, most recently from d9dfb59 to fec9947 Compare March 26, 2024 18:23
@iFoundSilentHouse
Copy link
Contributor Author

iFoundSilentHouse commented Mar 26, 2024

Added pull request on wesnoth to fix musl build bug: wesnoth/wesnoth#8628
Patch from https://patch-diff.githubusercontent.com/raw/wesnoth/wesnoth/pull/8628.patch doesn't work, though patch made locally works fine.

@iFoundSilentHouse
Copy link
Contributor Author

Start 6: SDL2_WEBP_SUPPORT
6/7 Test #6: SDL2_WEBP_SUPPORT ................***Failed    0.00 sec

I don't know what to do. Old SDL2_image version doesn't seem to be a thing

@iFoundSilentHouse iFoundSilentHouse force-pushed the wesnoth-1.18.0 branch 2 times, most recently from 2008833 to f9bac9f Compare March 27, 2024 11:17
@iFoundSilentHouse
Copy link
Contributor Author

Changes:

  • SDL2_image: for webp support added patch to SDL2_image as there's no command that worked for build using dynamic linking.
  • wesnoth: 1) Added patch that allows musl to build; this code doesn't change functionality 2) Disabled audio test - obviously, virtual environment doesn't have sound card.
    Everything works. @classabbyamp

@Jjp137
Copy link
Contributor

Jjp137 commented Mar 28, 2024

  • SDL2_image: for webp support added patch to SDL2_image as there's no command that worked for build using dynamic linking.

Instead of adding a patch, add configure_args="-DSDL2IMAGE_WEBP=ON" to SDL2_image's template.

If done correctly, this should be part of the configure step's output for SDL2_image:

-- SDL2_image: Using system libwebp
-- Found webp: /usr/lib/libwebp.so  
-- Dynamic libwebpdemux: libwebpdemux.so.2
-- Dynamic libwebp: libwebp.so.7

@iFoundSilentHouse
Copy link
Contributor Author

  • SDL2_image: for webp support added patch to SDL2_image as there's no command that worked for build using dynamic linking.

Instead of adding a patch, add configure_args="-DSDL2IMAGE_WEBP=ON" to SDL2_image's template.

If done correctly, this should be part of the configure step's output for SDL2_image:

-- SDL2_image: Using system libwebp
-- Found webp: /usr/lib/libwebp.so  
-- Dynamic libwebpdemux: libwebpdemux.so.2
-- Dynamic libwebp: libwebp.so.7

I tried it. Didn't work. Maybe I was too tired bruteforcing the answer and did something wrong. I'll try it againg

srcpkgs/wesnoth/template Outdated Show resolved Hide resolved
@Jjp137
Copy link
Contributor

Jjp137 commented Mar 28, 2024

I tried it. Didn't work. Maybe I was too tired bruteforcing the answer and did something wrong. I'll try it againg

You might need to ./xbps-src clean SDL2_image first for some reason.

Thanks for working on the update, by the way. I do want to play Wesnoth 1.18 at some point.

@iFoundSilentHouse
Copy link
Contributor Author

iFoundSilentHouse commented Mar 28, 2024

I tried it. Didn't work. Maybe I was too tired bruteforcing the answer and did something wrong. I'll try it againg

You might need to ./xbps-src clean SDL2_image first for some reason.

Thanks for working on the update, by the way. I do want to play Wesnoth 1.18 at some point.

Thanks a lot for your reviews! :)

@iFoundSilentHouse iFoundSilentHouse force-pushed the wesnoth-1.18.0 branch 4 times, most recently from 1e62cea to 357ced3 Compare March 28, 2024 02:51
@iFoundSilentHouse
Copy link
Contributor Author

Added wesnoth developers' patch to fix musl instead of mine: wesnoth/wesnoth#8649
This one is more accurate

@classabbyamp classabbyamp merged commit 07904d4 into void-linux:master May 31, 2024
8 checks passed
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.

None yet

3 participants