Merge '2.6.x' to master

cmake/SFMLConfig.cmake.in

@@ -14,7 +14,7 @@
 # example:
 #   find_package(SFML COMPONENTS ...)     # no specific version required
 #   find_package(SFML 3 COMPONENTS ...)   # any 3.x version
-#   find_package(SFML 2.4 COMPONENTS ...) # version 2.4 or greater with the same major version
+#   find_package(SFML 2.6 COMPONENTS ...) # version 2.6 or greater with the same major version
 #
 # By default, the dynamic libraries of SFML will be found. To find the static ones instead,
 # you must set the SFML_STATIC_LIBRARIES variable to TRUE before calling find_package(SFML ...).

doc/doxyfile.in

@@ -193,7 +193,7 @@ STRIP_FROM_PATH        =
 # specify the list of include paths that are normally passed to the compiler
 # using the -I flag.
 
-STRIP_FROM_INC_PATH    =
+STRIP_FROM_INC_PATH    = "@DOXYGEN_INPUT_DIR@/include"
 
 # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
 # less readable) file names. This can be useful is your file systems doesn't

src/SFML/Audio/SoundFileReaderMp3.cpp

@@ -56,6 +56,7 @@
 
 #include <algorithm>
 
+#include <cstdint>
 #include <cstring>