sfml: add version 3.0.0 #26276

OMGtechy · 2024-12-31T00:47:26Z

Summary

Added recipe: sfml/3.0.0

Motivation

SFML 3.0 was released.

Details

Notable changes:

cmake required version 3.1 -> 3.24
added SFML 3.0.0 source zip + sha256
updated test_package.cpp to work with both SFML 3.0.02.0 days.

The cmake minimum version was changed to 3.24 because:

Linux SFML 3.0.0 requires 3.22
Windows SFML 3.0.0 requires 3.24

It was deemed simpler to just have a single version required for the sake of the test package.

More info: https://github.com/SFML/SFML/blob/7f1162dfea4969bc17417563ac55d93b72e84c1e/CMakeLists.txt#L1-L9

[ ✔️ ] Read the contributing guidelines
[ 💬 ] Checked that this PR is not a duplicate: list of PRs by recipe
- I saw some other attempts that looked out-of-date or were more complex in implementation:
  - package(sfml): Add version 3.0.0 of SFML #26266
    - since this PR started, it appears that this has now been updated
    - not sure what to do here - both got developed simultaneously 👀
  - sfml: Test suport for SFML 3 rc1 #25305
- They appear to remove the check for the sfml-main library rather than fixing it the suffix change post-3.0.0.
- This PR aims to be:
  - simpler
  - avoid patches
  - keep the check for the sfml-main build artifact
[ ✔️ ] Tested locally with at least one configuration using a recent version of Conan
- Tested on Linux 6.11.11-1-MANJARO SMP PREEMPT_DYNAMIC
  - ✔️ conan create all/conanfile.py --version 3.0.0 --build=missing
  - ✔️ conan create all/conanfile.py --version 2.6.1 --build=missing

changes: - cmake required version 3.1 -> 3.24 - added SFML 3.0.0 source zip + sha256 - updated test_package.cpp to work with both SFML 3.0.0 The cmake minimum version was changed to 3.24 because: - Linux SFML 3.0.0 requires 3.22 - Windows SFML 3.0.0 requires 3.24 It was deemed simpler to just have a single version required for the sake of the test package. More info: https://github.com/SFML/SFML/blob/7f1162dfea4969bc17417563ac55d93b72e84c1e/CMakeLists.txt#L1-L9

OMGtechy · 2025-01-05T15:10:26Z

Relevant folks I think would be interested / have useful things to say:

SFML devs: @LaurentGomila @eXpl0it3r
Other PR attempt contributors: @SpaceIm @Sil3ntStorm
Previous version contributor: @toge @AbrilRBS

[Hope that's not too spammy / OK]

OMGtechy · 2025-01-05T15:18:53Z

RE multiple being developed at the same time (see #26266) - happy to discuss the merits of each / take the judgement of maintainers or whatever.

They each appear to have their own merits. Perhaps they could be combined?

Pros of this one:

doesn't have a separate 3.0.0 directory
doesn't use any patches
less code duplication (due to lack of 3.0.0 directory)
still checks for sfml-main

Pros of alternative:

doesn't change default for SFML_USE_SYSTEM_DEPS

[ feel free to add anything I missed here - I am almost certainly bias as author ]

Sil3ntStorm · 2025-01-05T19:15:54Z

The sole reason mine exists was that I require SFML 3 for a project and it wasn't available on conan, nor did I see a PR for it. So I adjusted and added SFML 3 and figured I might as well upstream it for the benefits of others after some preliminary testing.

I didn't knowingly remove anything that didn't produce errors for me (or later anything that created linter warnings in CCI). So if I removed sfml-main then it caused errors and didn't appear to be required.
I also didn't look into the USE_SYSTEM_DEPS variable much, but it sounds like something CCI likes to do to ensure things are consumed from conan rather than something else. Which is why I kept it and went the patch approach, which is only a minor patch.

ChrisThrasher · 2025-01-05T19:48:34Z

recipes/sfml/all/conanfile.py

@@ -51,6 +52,10 @@ def configure(self):
    def layout(self):
        cmake_layout(self, src_folder="src")

+    def build_requirements(self):
+        if Version(self.version) >= "3.0.0":
+            self.tool_requires("cmake/[>=3.24]")


3.24 is only required on Windows. All other OSes only require 3.22.

Fixed in a6b8e39

ChrisThrasher · 2025-01-05T19:48:52Z

recipes/sfml/all/conanfile.py

+        if Version(self.version) >= "3.0.0":
+            return 17
+        elif Version(self.version) >= "2.6.0":
+            return 11


Version 2.6 and prior requires C++03, not C++11.

Have I misread?

The code does what you say, with the exception of being inclusive of 2.6.0. That said - the prior version did the same for 2.6.0.

ChrisThrasher · 2025-01-05T19:49:18Z

recipes/sfml/all/conanfile.py

@@ -91,10 +107,12 @@ def generate(self):
        tc.variables["SFML_BUILD_AUDIO"] = self.options.audio
        tc.variables["SFML_INSTALL_PKGCONFIG_FILES"] = False
        tc.variables["SFML_GENERATE_PDB"] = False
-        tc.variables["SFML_USE_SYSTEM_DEPS"] = True
+        tc.variables["SFML_USE_SYSTEM_DEPS"] = Version(self.version) < "3.0.0"


Why change this? A package manager probably wants to use its own dependencies instead of the dependencies bundled with the library.

It was a pain getting things to work without. One ends up having to patch how things are searched for.

Apparently, in more recent versions of the conan package build process, it's better at building dependencies like this.

This resolved all of the package finding issues, meaning the patches were no longer needed. I imagine this will be a more consistent build as a result, but that's just conjecture on my part.

ChrisThrasher · 2025-01-05T19:49:48Z

recipes/sfml/all/conanfile.py

-            tc.variables["CMAKE_CXX_STANDARD"] = 11
+
+        if self.settings.compiler.cppstd is not None:
+            tc.cache_variables["CMAKE_CXX_STANDARD"] = self._min_cppstd


There is no need to set this. The CMake script already uses target_compile_features to set the proper C++ standard version.

It does not build for MSVC without (which is what lead to adding this). Even before my change, it was setting CMAKE_CXX_STANDARD.

ChrisThrasher · 2025-01-05T19:52:13Z

recipes/sfml/all/test_package/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.24)


Building SFML requires 3.22 (or 3.24 on Windows as mentioned above). Using SFML doesn't require anything particularly new. 3.1 is probably too old but something like 3.10 or 3.16 is probably sufficient. 3.16 or 3.22 are reasonable choices since it's rare you find an OS still in use today that ships with anything older than that.

This is just the test package rather than what's shipped - or have I missed something?

But for the main package, you're right, it should help those using --build=always/missing.

Package part fixed in a6b8e39

OMGtechy added 4 commits December 31, 2024 00:45

sfml: 3.0.0 - add min cmake version to build_requirements

a2e1002

sfml: 3.0.0 test package - add min cmake version to build_requirements

82ac46e

sfml: 3.0.0 - suffix for SFML::Main changed

9fa00f5

OMGtechy force-pushed the master branch 2 times, most recently from 4598181 to 8fc6848 Compare January 5, 2025 14:16

sfml: 3.0.0 - consumer packages should use C++17 or higher

2ef23d2

OMGtechy force-pushed the master branch from 8fc6848 to 2ef23d2 Compare January 5, 2025 14:31

OMGtechy marked this pull request as ready for review January 5, 2025 15:05

ChrisThrasher suggested changes Jan 5, 2025

View reviewed changes

sfml: 3.0.0 - lower cmake min version for non-Windows

a6b8e39

OMGtechy force-pushed the master branch from 597f67e to a6b8e39 Compare January 8, 2025 20:32

OMGtechy requested a review from ChrisThrasher January 8, 2025 20:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

sfml: add version 3.0.0 #26276

sfml: add version 3.0.0 #26276

OMGtechy commented Dec 31, 2024 •

edited

Loading

OMGtechy commented Jan 5, 2025

OMGtechy commented Jan 5, 2025

Sil3ntStorm commented Jan 5, 2025

ChrisThrasher Jan 5, 2025

OMGtechy Jan 8, 2025

ChrisThrasher Jan 5, 2025

OMGtechy Jan 8, 2025

ChrisThrasher Jan 5, 2025

OMGtechy Jan 8, 2025 •

edited

Loading

ChrisThrasher Jan 5, 2025

OMGtechy Jan 8, 2025 •

edited

Loading

ChrisThrasher Jan 5, 2025

OMGtechy Jan 8, 2025 •

edited

Loading

OMGtechy Jan 8, 2025

		@@ -1,4 +1,4 @@
		cmake_minimum_required(VERSION 3.1)
		cmake_minimum_required(VERSION 3.24)

sfml: add version 3.0.0 #26276

Are you sure you want to change the base?

sfml: add version 3.0.0 #26276

Conversation

OMGtechy commented Dec 31, 2024 • edited Loading

Summary

Motivation

Details

OMGtechy commented Jan 5, 2025

OMGtechy commented Jan 5, 2025

Sil3ntStorm commented Jan 5, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

OMGtechy Jan 8, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

OMGtechy Jan 8, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

OMGtechy Jan 8, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

OMGtechy commented Dec 31, 2024 •

edited

Loading

OMGtechy Jan 8, 2025 •

edited

Loading

OMGtechy Jan 8, 2025 •

edited

Loading

OMGtechy Jan 8, 2025 •

edited

Loading