Bug 277617 - devel/csfml: Update to 2.6.1
Summary: devel/csfml: Update to 2.6.1
Status: Open
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: freebsd-ports-bugs (Nobody)
URL: https://github.com/SFML/CSFML/release...
Keywords:
Depends on: 277491
Blocks: 277643
  Show dependency treegraph
 
Reported: 2024-03-10 22:56 UTC by Alastair Hogge
Modified: 2024-10-12 09:10 UTC (History)
5 users (show)

See Also:


Attachments
Update to 2.6.0 (19.11 KB, text/plain)
2024-03-10 23:08 UTC, Alastair Hogge
no flags Details

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

    
Comment 1 Alastair Hogge 2024-03-10 23:08:50 UTC
Created attachment 249079 [details]
Update to 2.6.0

Update to 2.6.0
- Add DOXYGEN, and EXAMPLE options
- Use upstream name for ${PORTNAME}

https://github.com/SFML/CSFML/releases/tag/2.6.0

poudriere-testport:
> 13.2-{amd64,i386}-release: OK
> 14.0-{amd64,i386}-release: OK
> main-{amd64,i386}:         OK
Comment 2 Gabriel M. Dutra freebsd_committer freebsd_triage 2024-03-12 13:35:17 UTC
Hi!

Can you fix this patch? I applied the patch on the bug 277643, but, the build failed.

===>   CSFML-2.6.0 depends on package: SFML>0 - not found
===>   CSFML-2.6.0 depends on package: SFML>0 - not found
*** Error code 1

I fixed this error changing the LIB_DEPENDS to:

-BUILD_DEPENDS= sfml>0:devel/sfml
-LIB_DEPENDS=   libsfml-audio.so:devel/sfml \
-               libsfml-graphics.so:devel/sfml \
-               libsfml-network.so:devel/sfml \
-               libsfml-system.so:devel/sfml \
-               libsfml-window.so:devel/sfml
+BUILD_DEPENDS= SFML>0:devel/asfml
+LIB_DEPENDS=   libasfml-audio.so:devel/asfml \
+               libasfml-graphics.so:devel/asfml \
+               libasfml-network.so:devel/asfml \
+               libasfml-system.so:devel/asfml \
+               libasfml-window.so:devel/asfml


Does this make sense to you?
Comment 3 Alastair Hogge 2024-03-12 14:08:09 UTC
(In reply to Gabriel M. Dutra from comment #2)
Hello,

I fixed this error changing the LIB_DEPENDS to:

> -BUILD_DEPENDS= sfml>0:devel/sfml

The uploaded patch already has:
> +BUILD_DEPENDS=	SFML>0:devel/sfml

> -LIB_DEPENDS=   libsfml-audio.so:devel/sfml \
> -               libsfml-graphics.so:devel/sfml \
> -               libsfml-network.so:devel/sfml \
> -               libsfml-system.so:devel/sfml \
> -              libsfml-window.so:devel/sfml

[...]

> +LIB_DEPENDS=   libasfml-audio.so:devel/asfml \
> +               libasfml-graphics.so:devel/asfml \
> +               libasfml-network.so:devel/asfml \
> +               libasfml-system.so:devel/asfml \
> +               libasfml-window.so:devel/asfml

This currently does not make sense to me (incidentally, neither does the world, or any of it's composition), asfml depends on csfml, which depends on sfml. I am retesting the patch, and going to bed, I will report back later.

Thanks.
Comment 4 Alastair Hogge 2024-03-12 22:43:21 UTC
(In reply to Gabriel M. Dutra from comment #2)

Hey Gabriel,

I am not able to reproduce the build failure. I have checked out latest and clean Ports tree, and applied the patch, build passed. I used git apply, found not problems, started again and tried patch < /var/tmp/${foo}, the build also passed.

I do not know how the patched devel/csfml Port could have:
> BUILD_DEPENDS= sfml>0:devel/sfml
instead of
BUILD_DEPENDS= SFML>0:devel/asfml

Thanks.
Comment 5 Gabriel M. Dutra freebsd_committer freebsd_triage 2024-04-07 02:52:51 UTC
Hi,

The build had many errors, see:

CMake Error at src/SFML/CMakeLists.txt:24 (find_package):
  Could not find a configuration file for package "SFML" that is compatible
  with requested version "2.6".

  The following configuration files were considered but not accepted:

    /usr/local/lib/cmake/SFML/SFMLConfig.cmake, version: 2.5.1



-- Configuring incomplete, errors occurred!
*** Error code 1

-----------

The controllable properties are listed in the section "Controlling FreeType
Modules" in the reference's table of contents
(/usr/local/share/doc/freetype2/reference/index.html, if documentation was installed).
===>   CSFML-2.6.0 depends on package: SFML>0 - not found
*** Error code 1
Comment 6 Alastair Hogge 2024-04-07 03:18:16 UTC
PR requires updates to SFML
Comment 7 Alastair Hogge 2024-04-07 03:21:57 UTC
(In reply to Gabriel M. Dutra from comment #5)
> The build had many errors, see:
> 
> CMake Error at src/SFML/CMakeLists.txt:24 (find_package):
>   Could not find a configuration file for package "SFML" that is compatible
>   with requested version "2.6".
>
>   The following configuration files were considered but not accepted:
>
>     /usr/local/lib/cmake/SFML/SFMLConfig.cmake, version: 2.5.1
>
>
>
> -- Configuring incomplete, errors occurred!
> *** Error code 1

Is SFML-2.6.x installed. From the log fragment, it looks like SFML-2.5.x is still installed?
Comment 8 Alastair Hogge 2024-07-02 10:50:45 UTC
Comment on attachment 249079 [details]
Update to 2.6.0

Patch is obsoleted by 2.6.1 release.
Comment 9 Joel Bodenmann freebsd_committer freebsd_triage 2024-10-06 20:23:58 UTC
Update to 2.6.1 was committed already: https://cgit.freebsd.org/ports/commit/?id=7125faf26f5bfbd3c0401987a55b3d80436bda95
Comment 10 Alastair Hogge 2024-10-07 08:30:29 UTC
CSFML ≠ SFML
Comment 11 Joel Bodenmann freebsd_committer freebsd_triage 2024-10-07 10:51:07 UTC
Bwaah... I was baited by devel/csfml/Makefile being the first file modified in the patch...

My bad - apologies!
Comment 12 Alastair Hogge 2024-10-07 11:36:57 UTC
(In reply to Joel Bodenmann from comment #11)

All good, it tripped me too, and required a number of double takes.
Comment 13 Alastair Hogge 2024-10-07 11:38:52 UTC
Paychecks and hardware are slowly trickling in, so I hopefully will be able to return to my duties soon.
Comment 14 Zsolt Udvari freebsd_committer freebsd_triage 2024-10-11 09:45:50 UTC
(In reply to Alastair Hogge from comment #8)
Your patch doesn't apply! Could you please check it?
Why do you want change PORTNAME?
Comment 15 Alastair Hogge 2024-10-12 00:39:27 UTC
(In reply to Zsolt Udvari from comment #14)

There is no patch for 2.6.1 yet, as per my explanation to you in bug #276210, comment #10.

As for the name change (going by the previous patch, which I no longer mark as maintainer  approved), upstream uses it, and allows removal of:
> GH_PROJECT=	${PORTNAME:tu}
from the Makefile.
Comment 16 Alastair Hogge 2024-10-12 00:40:46 UTC
Comment on attachment 249079 [details]
Update to 2.6.0

This patch seems to be causing more confusion than it is worth the time.
Comment 17 Alastair Hogge 2024-10-12 00:43:13 UTC
(In reply to Zsolt Udvari from comment #14)
> Why do you want change PORTNAME?

The reason for this is also explained in the obsoleted patch comment, and comment #1 of this bug report.
Comment 18 Zsolt Udvari freebsd_committer freebsd_triage 2024-10-12 07:28:08 UTC
(In reply to Alastair Hogge from comment #17)
There are only some ports which contain uppercase letters - but not every letter! See the "Table 2.Package Naming Examples" (https://docs.freebsd.org/en/books/porters-handbook/book/#porting-pkgname), third row: EmiClock -> emiclock (No uppercase names for single programs).
Comment 19 Alastair Hogge 2024-10-12 09:10:43 UTC
(In reply to Zsolt Udvari from comment #18)
OK, fair enuf. So the next patch will restore the lowercase name of the distribution name. Thanks for clearing that up.