Comment 1 Po-Chuan Hsieh 2023-12-22 06:08:02 UTC

Marked as BROKEN in ports ee4003caec590f4ddb841615eee63406847912b8.

Created attachment 247668 [details]
Update to 1.5.1 and restore build

games/devilutionX: Update to 1.5.1

Update to 1.5.1 and restore build on FreeBSD.

https://github.com/diasurgical/devilutionX/releases/tag/1.5.1

I am not sure on the new ${LICENSE}'s, the switch to Sustainable Use License (SUS):

> LICENSE=	CC-BY-NC-SA-4.0 OFL11 SUL
> LICENSE_NAME_SUL=	Sustainable Use License
> LICENSE_FILE_SUL=	${WRKSRC}/LICENSE.md
> LICENSE_PERMS_SUL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

Specifically ${LICENSE_PERMS_SUL}. I started this update back when 1.5.0 was released, and I cannot recall much the SUS, and only returned to this Port after noticing the ${B0RKEN} addition to the Makefile. I added the *-sell declarations, tho, I am not sure if that is correct. I believe that SUS software is allowed to be distributed for free, however, I do not know how that is expressed in legal magic, or via the ${LICENSE_PERMS}.

Thanks.

Regarding files/patch-3rdParty_asio_CMakeLists.txt, that fix came from, https://github.com/diasurgical/devilutionX/issues/6074.

poudriere-testport:
13_2-{amd64,i386}-release : OK
14_0-{amd64,i386}-release : OK
main-{amd64,i386}         : OK

I just attempted to play test 1.5.1, and SDL failed to initialise a renderer.

> DEBUG: Failed loading XMissingExtension: Undefined symbol "_XMissingExtension"
> DEBUG: Failed loading XFixesCreatePointerBarrier: Undefined symbol "_XFixesCreatePointerBarrier"
> DEBUG: Failed loading XFixesCreatePointerBarrier: Undefined symbol "_XFixesCreatePointerBarrier"
> DEBUG: Failed loading XFixesDestroyPointerBarrier: Undefined symbol "_XFixesDestroyPointerBarrier"
> DEBUG: Failed loading XFixesDestroyPointerBarrier: Undefined symbol "_XFixesDestroyPointerBarrier"
> DEBUG: Failed loading XIBarrierReleasePointer: Undefined symbol "_XIBarrierReleasePointer"
> DEBUG: Failed loading XIBarrierReleasePointer: Undefined symbol "_XIBarrierReleasePointer"
> DEBUG: Failed loading XIBarrierReleasePointer: Undefined symbol "_XIBarrierReleasePointer"

Could be my system, however, that is from an up-to-date poudriere-bulk build.

I updated my working copy to 1.5.2, and switched to building the assets from downloading/using what is in the tarball, this restored game play, however, it requires a new external build dependency, archivers/smpq(https://reviews.freebsd.org/D44335). It may be possible to move to more external libraries too, and I will continue working on that.

Created attachment 249173 [details]
Update to 1.5.2 and restore build on FreeBSD.

New patch with minimal changes.

poudriere-testport:
> 13_3-{amd64,i386}-release : OK
> 14_0-{amd64,i386}-release : OK
> main-{amd64,i386}         : OK

Play test: OK

Comment 9 Sergey A. Osokin 2024-03-21 22:43:02 UTC

(In reply to Alastair Hogge from comment #8)

Thanks for the update, Alastair.

Could you please create a diff against current version of the port in FreeBSD ports tree.  You've deprecated your previous patch, however that one contains necessary information to update the port from the current state to 1.5.1.  The current patch contains data to update the port from 1.5.1 to 1.5.2.

Thank you.

(In reply to Sergey A. Osokin from comment #9)

Whoops! Sorry about that, all.

I am testing a re-based patch now.

Thanks, Sergey.

Created attachment 249397 [details]
Update to 1.5.2 and restore build on FreeBSD.

Attach complete patch.

Recent patch:

poudriere-testport summary:
main-amd64-current: PASSED
main-i386-current: PASSED
13_2-amd64-release: PASSED
13_2-i386-release: PASSED
13_3-amd64-release: PASSED
13_3-i386-release: PASSED
14_0-amd64-release: PASSED
14_0-i386-release: PASSED

Comment 13 commit-hook 2024-03-22 12:51:09 UTC

A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e77537638d8e6d36d7069ed3aebf44a290245acb

commit e77537638d8e6d36d7069ed3aebf44a290245acb
Author:     Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2024-03-22 12:48:36 +0000
Commit:     Sergey A. Osokin <osa@FreeBSD.org>
CommitDate: 2024-03-22 12:48:36 +0000

    games/devilutionX: restore build with update to 1.5.2 (+)

    Approved by:    amdmi3 (maintainer, timeout > 2 weeks)
    PR:             273883

 games/devilutionX/Makefile                         | 26 +++++++++++-----------
 games/devilutionX/distinfo                         | 26 +++++++++++-----------
 .../files/patch-3rdParty_asio_CMakeLists.txt (new) | 10 +++++++++
 .../files/patch-CMake_Dependencies.cmake (gone)    | 13 -----------
 4 files changed, 36 insertions(+), 39 deletions(-)

Comment 14 Sergey A. Osokin 2024-03-22 12:52:46 UTC

Committed, thank you!

Thanks.