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

devilutionX: update to 1.4.1. #41658

Merged
merged 1 commit into from Jan 15, 2023
Merged

devilutionX: update to 1.4.1. #41658

merged 1 commit into from Jan 15, 2023

Conversation

ghost
Copy link

@ghost ghost commented Jan 15, 2023

Testing the changes

  • I tested the changes in this PR: YES

Local build testing

  • I built this PR locally for my native architecture, x86_64-musl
  • I built this PR locally for these architectures (if supported. mark crossbuilds):
    • aarch64-musl (cross)
    • armv6l-musl (cross)

About mpqtool

Apparently upstream needs some tool to pack assets into one file.

If such a tool is not used within CMake, do_install() will not install the binary, icons, etc to $DESTDIR.

Pull request #39184 had encountered this behaviour and placed needed files manually as a result.

Packaging smpq is a little too much, hence mpqtool is used with little patching to address all issues listed above.

srcpkgs/devilutionX/patches/smpq.patch Outdated Show resolved Hide resolved
srcpkgs/devilutionX/template Outdated Show resolved Hide resolved
srcpkgs/devilutionX/template Outdated Show resolved Hide resolved
srcpkgs/devilutionX/template Outdated Show resolved Hide resolved
srcpkgs/devilutionX/template Outdated Show resolved Hide resolved
@Vaelatern
Copy link
Member

Is there a source for smpq upstream?

@ghost
Copy link
Author

ghost commented Jan 15, 2023

Is there a source for smpq upstream?

There is, but my main concern is that its last release was in 2016, last change to the code in 2018. If it is alright, I will package it for you properly.

@Vaelatern
Copy link
Member

As discussed on IRC, @kruceter will try to ask upstream to change tools from smpq to mpqtool

* External (3rd party) dependencies normally are fetched with git,
  which is undesirable for packaging; hence they are fetched manually
  with xbps-src. "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" prevents
  cmake's FetchContent module from attempting to download or update any
  external dependencies.

* BINARY_RELEASE option is gone.

* CharisSILB is absent with TTF_FONT_PATH from the release tarball.
@ghost
Copy link
Author

ghost commented Jan 15, 2023

Apparently upstream ships tarball with all external dependencies bundled. Not only that, they also have pre-archived devilutionx.mpq which relieves packagers from using smpq/mpqtool to make it.

@Vaelatern has my sincere gratitude for pointing it out.

@Vaelatern Vaelatern merged commit 9ec9d43 into void-linux:master Jan 15, 2023
@ghost ghost deleted the devilutionx branch January 16, 2023 03:05
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

1 participant