Bug 277491 - devel/sfml: Update to 2.6.1
Summary: devel/sfml: Update to 2.6.1
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Dmitry Marakasov
URL: https://www.sfml-dev.org/changelog.ph...
Keywords:
Depends on:
Blocks: 277617
  Show dependency treegraph
 
Reported: 2024-03-04 23:47 UTC by Alastair Hogge
Modified: 2024-07-24 19:06 UTC (History)
2 users (show)

See Also:
bugzilla: maintainer-feedback? (amdmi3)


Attachments
devel/sfml: Update to 2.6.1 (6.45 KB, patch)
2024-03-04 23:49 UTC, Alastair Hogge
no flags Details | Diff
Update to 2.6.1 (18.94 KB, patch)
2024-03-10 05:33 UTC, Alastair Hogge
no flags Details | Diff
Update to 2.6.1 (18.96 KB, patch)
2024-03-11 23:09 UTC, Alastair Hogge
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Alastair Hogge 2024-03-04 23:47:10 UTC

    
Comment 1 Alastair Hogge 2024-03-04 23:49:34 UTC
Created attachment 248938 [details]
devel/sfml: Update to 2.6.1

Update to 2.6.1:
- Makefile maintenance
- Drop local patch

https://www.sfml-dev.org/changelog.php#sfml-2.6.1
Comment 2 Alastair Hogge 2024-03-04 23:52:31 UTC
poudriere-testport:
> 13.2-{amd64,i386}-release: OK
> 14.0-{amd64,i386}-release: OK
> main-{amd64,i386}:         OK
Comment 3 Alastair Hogge 2024-03-10 05:33:10 UTC
Created attachment 249062 [details]
Update to 2.6.1

Complete integration of examples.
Update commit log.

poudriere-testport:
> 13.2-{amd64,i386}-release: OK
> 14.0-{amd64,i386}-release: OK
> main-{amd64,i386}:         OK
Comment 4 Alastair Hogge 2024-03-11 00:35:38 UTC
poudriere-testport main-amd64:
> games/slade         : OK
> games/marblemarcher : OK
> graphics/lux        : OK
> games/etracer       : OK

games/emptyepsilon fails, and is somewhat behind upstream, which has since moved to SDL-2.
Comment 5 Alastair Hogge 2024-03-11 23:09:02 UTC
Created attachment 249104 [details]
Update to 2.6.1

Fix ${FIND}-fu ${_EXAMPLES_ASSETS}

poudriere-testport:
> 13.2-{amd64,i386}-release: OK
> 14.0-{amd64,i386}-release: OK
> main-{amd64,i386}:         OK
Comment 6 Dmitry Marakasov freebsd_committer freebsd_triage 2024-03-29 21:13:53 UTC
Note that you can't just update it as it would break consumers ports and I thus do not approve this change for merging. We would probably need to add it as another port.
Comment 7 Alastair Hogge 2024-03-29 21:46:53 UTC
(In reply to Dmitry Marakasov from comment #6)
Hi Dmitry,

What consumers are you worried about? How have you concluded that I have apparently "just updated" the Port, completely ignoring the consumers of it?
Comment 8 Alastair Hogge 2024-03-31 01:44:37 UTC
(In reply to Dmitry Marakasov from comment #6)
> We would probably need to add it as another port.

I believe you are suggesting moving the update in this PR, to a new, separate Port? I would be guessing here, but devel/sfml26? If this is correct, I do not understand why, and would appreciate some clarity, and insight.

The logic appears inverted here, why make a separate Port when only 1 out 7 consumers fail?

I propose, we create a new Port of the current SFML version 2.5.1. My reasoning for this is, only one consumer of SFML in Ports, games/emptyepsilon, fails to build with SFML-2.6.1, the remaining 6[1] consumers build fine, and we can keep devel/sfml tracking upstream releases. 

Would love some direction, with reason.

1: https://www.freshports.org/devel/sfml
Comment 9 Dmitry Marakasov freebsd_committer freebsd_triage 2024-04-09 19:14:53 UTC
This does not really matter, but yes preserving current port as sfml25 and updating sfml to 2.6 is also fine. Have you checked whether emptyepsilon can be fixed with 2.6?
Comment 10 Alastair Hogge 2024-04-09 22:44:15 UTC
(In reply to Dmitry Marakasov from comment #9)
> Have you checked whether emptyepsilon can be fixed with 2.6?

I investigated updating games/emptyepsilon, found that the project moved to SDL[1], and requires a new external engine, Serious Proton[2], which is an SDL2 stack. I did not investigate patching the current Empty Epsilon to work with an updated SFML.

I am thinking, if I have time, I might create a new Port for Serious Proton, which would facilitate updating Empty Epsilon, and nullifying it's dependency on SFML. This way, all Ports suffering on devel/sfml, will be updated.

1: https://github.com/daid/EmptyEpsilon/wiki/Build-%E2%80%90-Linux-%E2%80%90-Debian
2: https://github.com/daid/SeriousProton
Comment 11 Dmitry Marakasov freebsd_committer freebsd_triage 2024-06-11 13:29:21 UTC
Staging branch for sfml update: https://github.com/AMDmi3/freebsd-ports/tree/sfml

Note that I don't plan to include examples changes, as it's overcomplication for no particular purpose. I also don't see where CC0-1.0 comes from.
Comment 12 Alastair Hogge 2024-06-11 23:18:41 UTC
(In reply to Dmitry Marakasov from comment #11)

> Note that I don't plan to include examples changes, as it's overcomplication for no particular purpose.

I am not at all surprised this the position you take; most unfortunate. I cannot be fucked debating this with you.

> I also don't see where CC0-1.0 comes from.

https://github.com/SFML/SFML/blob/master/examples/asset_licenses.md

Thanks for working on the update, and creating the legacy 2.5.1 Port. Sucks that I am still incapacitated to volunteer.
Comment 13 commit-hook freebsd_committer freebsd_triage 2024-07-22 23:19:03 UTC
A commit in branch main references this bug:

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

commit 7125faf26f5bfbd3c0401987a55b3d80436bda95
Author:     Dmitry Marakasov <amdmi3@FreeBSD.org>
AuthorDate: 2024-06-10 14:38:10 +0000
Commit:     Dmitry Marakasov <amdmi3@FreeBSD.org>
CommitDate: 2024-07-22 23:13:29 +0000

    devel/sfml: update 2.5.1 → 2.6.1

    PR:             277491

 devel/csfml/Makefile                               |  1 -
 devel/sfml/Makefile                                | 71 +++++++++-------------
 devel/sfml/distinfo                                |  6 +-
 ...h-src_SFML_Window_Unix_WindowImplX11.cpp (gone) | 15 -----
 devel/sfml/pkg-plist                               | 22 ++++---
 games/emptyepsilon/Makefile                        |  2 +-
 6 files changed, 45 insertions(+), 72 deletions(-)