diff --git a/ports/sfml/fix-dep-openal.patch b/ports/sfml/fix-dep-openal.patch deleted file mode 100644 index 9cb4369d2c3080..00000000000000 --- a/ports/sfml/fix-dep-openal.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/cmake/SFMLConfigDependencies.cmake.in b/cmake/SFMLConfigDependencies.cmake.in -index ef96827..864b32e 100644 ---- a/cmake/SFMLConfigDependencies.cmake.in -+++ b/cmake/SFMLConfigDependencies.cmake.in -@@ -75,6 +75,8 @@ if(SFML_STATIC_LIBRARIES) - # sfml-audio - list(FIND SFML_FIND_COMPONENTS "audio" FIND_SFML_AUDIO_COMPONENT_INDEX) - if(FIND_SFML_AUDIO_COMPONENT_INDEX GREATER -1) -+ find_dependency(OpenAL) -+ set(OpenAL_LIB OpenAL::OpenAL) - sfml_bind_dependency(TARGET OpenAL FRIENDLY_NAME "OpenAL" SEARCH_NAMES "OpenAL" "openal" "openal32") - if (NOT FIND_SFML_OS_IOS) - sfml_bind_dependency(TARGET VORBIS FRIENDLY_NAME "VorbisFile" SEARCH_NAMES "vorbisfile") -diff --git a/src/SFML/Audio/CMakeLists.txt b/src/SFML/Audio/CMakeLists.txt -index 8158365..3ebaf90 100644 ---- a/src/SFML/Audio/CMakeLists.txt -+++ b/src/SFML/Audio/CMakeLists.txt -@@ -68,7 +68,9 @@ elseif(SFML_OS_ANDROID) - endif() - - # find external libraries --find_package(OpenAL REQUIRED) -+find_package(OpenAL CONFIG REQUIRED) -+set(OpenAL_LIB OpenAL::OpenAL) -+sfml_find_package(OpenAL LINK OpenAL_LIB) - sfml_find_package(VORBIS INCLUDE "VORBIS_INCLUDE_DIRS" LINK "VORBIS_LIBRARIES") - sfml_find_package(FLAC INCLUDE "FLAC_INCLUDE_DIR" LINK "FLAC_LIBRARY") - diff --git a/ports/sfml/fix-dependencies.patch b/ports/sfml/fix-dependencies.patch deleted file mode 100644 index eb3a8dc68f911d..00000000000000 --- a/ports/sfml/fix-dependencies.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff --git a/cmake/SFMLConfig.cmake.in b/cmake/SFMLConfig.cmake.in -index 30194c5f..40b72309 100644 ---- a/cmake/SFMLConfig.cmake.in -+++ b/cmake/SFMLConfig.cmake.in -@@ -1,3 +1,8 @@ -+set(SFML_STATIC_LIBRARIES false) -+if(NOT "@BUILD_SHARED_LIBS@") -+ set(SFML_STATIC_LIBRARIES true) -+endif() -+include(CMakeFindDependencyMacro) - # This script provides the SFML libraries as imported targets - # ------------------------------------ - # -diff --git a/cmake/SFMLConfigDependencies.cmake.in b/cmake/SFMLConfigDependencies.cmake.in -index 0737ec5d..05bf9a8f 100644 ---- a/cmake/SFMLConfigDependencies.cmake.in -+++ b/cmake/SFMLConfigDependencies.cmake.in -@@ -35,9 +35,11 @@ if(SFML_STATIC_LIBRARIES) - endif() - - # No lookup in environment variables (PATH on Windows), as they may contain wrong library versions -+ if(NOT ${THIS_FRIENDLY_NAME}_LIB) - find_library(${THIS_FRIENDLY_NAME}_LIB NAMES ${THIS_SEARCH_NAMES} - PATHS ${FIND_SFML_PATHS} PATH_SUFFIXES lib NO_SYSTEM_ENVIRONMENT_PATH) - mark_as_advanced(${THIS_FRIENDLY_NAME}_LIB) -+ endif() - if(${THIS_FRIENDLY_NAME}_LIB) - set_property(TARGET ${THIS_TARGET} APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${${THIS_FRIENDLY_NAME}_LIB}") - else() -@@ -64,6 +66,9 @@ if(SFML_STATIC_LIBRARIES) - if (FIND_SFML_OS_WINDOWS) - set_property(TARGET OpenGL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "OpenGL32") - elseif(NOT FIND_SFML_OS_IOS) -+ set(OpenGL_GL_PREFERENCE "@EXPORT_OpenGL_GL_PREFERENCE@") -+ find_dependency(OpenGL) -+ set(OpenGL_LIB OpenGL::GL) - sfml_bind_dependency(TARGET OpenGL FRIENDLY_NAME "OpenGL" SEARCH_NAMES "OpenGL" "GL") - endif() - endif() -@@ -71,6 +76,8 @@ if(SFML_STATIC_LIBRARIES) - # sfml-graphics - list(FIND SFML_FIND_COMPONENTS "graphics" FIND_SFML_GRAPHICS_COMPONENT_INDEX) - if(FIND_SFML_GRAPHICS_COMPONENT_INDEX GREATER -1) -+ find_dependency(Freetype) -+ set(FreeType_LIB Freetype::Freetype) - sfml_bind_dependency(TARGET Freetype FRIENDLY_NAME "FreeType" SEARCH_NAMES "freetype") - endif() - -diff --git a/src/SFML/Graphics/CMakeLists.txt b/src/SFML/Graphics/CMakeLists.txt -index a939a988..259835f7 100644 ---- a/src/SFML/Graphics/CMakeLists.txt -+++ b/src/SFML/Graphics/CMakeLists.txt -@@ -93,7 +93,8 @@ sfml_add_library(sfml-graphics - target_link_libraries(sfml-graphics PUBLIC sfml-window) - - # stb_image sources --target_include_directories(sfml-graphics SYSTEM PRIVATE "${PROJECT_SOURCE_DIR}/extlibs/headers/stb_image") -+find_path(STB_INCLUDE_DIR stb_image.h REQUIRED) -+target_include_directories(sfml-graphics PRIVATE "${STB_INCLUDE_DIR}") - - # glad sources - target_include_directories(sfml-graphics SYSTEM PRIVATE "${PROJECT_SOURCE_DIR}/extlibs/headers/glad/include") -@@ -123,7 +124,8 @@ if((SFML_COMPILER_MSVC AND SFML_MSVC_VERSION GREATER_EQUAL 14) OR (SFML_COMPILER - target_link_libraries(sfml-graphics PRIVATE legacy_stdio_definitions.lib) - endif() - --sfml_find_package(Freetype INCLUDE "FREETYPE_INCLUDE_DIRS" LINK "FREETYPE_LIBRARY") -+set(FreeType_LIB Freetype::Freetype) -+sfml_find_package(Freetype LINK FreeType_LIB) - target_link_libraries(sfml-graphics PRIVATE Freetype) - - # add preprocessor symbols -diff --git a/src/SFML/Window/CMakeLists.txt b/src/SFML/Window/CMakeLists.txt -index d2bdd5aa..2a9937f1 100644 ---- a/src/SFML/Window/CMakeLists.txt -+++ b/src/SFML/Window/CMakeLists.txt -@@ -325,7 +325,9 @@ elseif(SFML_OS_ANDROID) - target_link_libraries(sfml-window PRIVATE EGL) - target_link_libraries(sfml-window PRIVATE GLES) - else() -- sfml_find_package(OpenGL INCLUDE "OPENGL_INCLUDE_DIR" LINK "OPENGL_gl_LIBRARY") -+ set(EXPORT_OpenGL_GL_PREFERENCE "${OpenGL_GL_PREFERENCE}" CACHE INTERNAL "") -+ set(OpenGL_LIB OpenGL::GL) -+ sfml_find_package(OpenGL LINK OpenGL_LIB) - target_link_libraries(sfml-window PRIVATE OpenGL) - endif() - diff --git a/ports/sfml/portfile.cmake b/ports/sfml/portfile.cmake index e8034032cf981f..62aff33b87ed2a 100644 --- a/ports/sfml/portfile.cmake +++ b/ports/sfml/portfile.cmake @@ -2,17 +2,11 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REPO SFML/SFML REF "${VERSION}" HEAD_REF master - SHA512 d8a8bee3aa9acda4609104c2a9d4a2512e4be6d6e85fd4b24c287c03f60cfb888e669e61bfac4113dae35f0c3492559b65b3453baf38766d8c0223d9ab77aada - PATCHES - fix-dependencies.patch - fix-dep-openal.patch + SHA512 116b934950b02639aa0924cdf6ceaf34518be7f94037e77e52f374aa0a03403487ef58384137569d930961c7d65291a7f0bbddcf1eaf4260086f49afbfae1f27 ) -# The embedded FindFreetype doesn't properly handle debug libraries -file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/Modules/FindFreetype.cmake") - if(VCPKG_TARGET_IS_LINUX) - message(STATUS "SFML currently requires the following libraries from the system package manager:\n libudev\n libx11\n libxrandr\n libxcursor\n opengl\n\nThese can be installed on Ubuntu systems via apt-get install libx11-dev libxrandr-dev libxcursor-dev libxi-dev libudev-dev libgl1-mesa-dev") + message(STATUS "SFML currently requires the following libraries from the system package manager:\n libudev\n libx11\n libxi\n libxrandr\n libxcursor\n opengl\n\nThese can be installed on Ubuntu systems via apt-get install libx11-dev libxi-dev libxrandr-dev libxcursor-dev libxi-dev libudev-dev libgl1-mesa-dev") endif() vcpkg_check_features( @@ -31,11 +25,10 @@ vcpkg_cmake_configure( -DSFML_USE_SYSTEM_DEPS=ON -DSFML_MISC_INSTALL_PREFIX=share/sfml -DSFML_GENERATE_PDB=OFF - -DSFML_WARNINGS_AS_ERRORS=OFF #Remove in the next version + -DSFML_INSTALL_PKGCONFIG_FILES=OFF ${FEATURE_OPTIONS} MAYBE_UNUSED_VARIABLES SFML_MISC_INSTALL_PREFIX - SFML_WARNINGS_AS_ERRORS ) vcpkg_cmake_install() @@ -58,27 +51,6 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -set(SHOULD_REMOVE_SFML_ALL 0) -if(NOT "audio" IN_LIST FEATURES) - file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/sfml-audio.pc") - set(SHOULD_REMOVE_SFML_ALL 1) -endif() -if(NOT "graphics" IN_LIST FEATURES) - file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/sfml-graphics.pc") - set(SHOULD_REMOVE_SFML_ALL 1) -endif() -if(NOT "network" IN_LIST FEATURES) - file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/sfml-network.pc") - set(SHOULD_REMOVE_SFML_ALL 1) -endif() -if(NOT "window" IN_LIST FEATURES) - file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/sfml-window.pc") - set(SHOULD_REMOVE_SFML_ALL 1) -endif() -if(SHOULD_REMOVE_SFML_ALL) - file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/sfml-all.pc") -endif() - vcpkg_fixup_pkgconfig() file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/sfml/usage b/ports/sfml/usage index 39d986d2ff6861..79c19c3e9ac758 100644 --- a/ports/sfml/usage +++ b/ports/sfml/usage @@ -1,7 +1,7 @@ The package sfml provides CMake targets: - find_package(SFML COMPONENTS system window graphics audio CONFIG REQUIRED) - target_link_libraries(main PRIVATE sfml-system sfml-network sfml-graphics sfml-window sfml-audio) + find_package(SFML COMPONENTS Network Graphics Window Audio System CONFIG REQUIRED) + target_link_libraries(main PRIVATE SFML::Network SFML::Graphics SFML::Window SFML::Audio SFML::System) # If you want SFML to provide an implementation of main(): - target_link_libraries(main PRIVATE sfml-main) + target_link_libraries(main PRIVATE SFML::Main) diff --git a/ports/sfml/vcpkg.json b/ports/sfml/vcpkg.json index f7d0d03692590d..76eb8895d26177 100644 --- a/ports/sfml/vcpkg.json +++ b/ports/sfml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sfml", - "version": "2.6.2", + "version": "3.0.0", "description": "Simple and fast multimedia library", "homepage": "https://github.com/SFML/SFML", "license": "Zlib", @@ -27,7 +27,7 @@ "libflac", "libogg", "libvorbis", - "openal-soft" + "miniaudio" ] }, "graphics": { diff --git a/versions/baseline.json b/versions/baseline.json index 3da5c1c3b768fe..2eade2ab3c06cc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8337,7 +8337,7 @@ "port-version": 6 }, "sfml": { - "baseline": "2.6.2", + "baseline": "3.0.0", "port-version": 0 }, "sfsexp": { diff --git a/versions/s-/sfml.json b/versions/s-/sfml.json index 00bfcc43247b3b..1913170e6d3856 100644 --- a/versions/s-/sfml.json +++ b/versions/s-/sfml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "72dfe19299a1cb204b62e657e6312e628fcb0b6a", + "version": "3.0.0", + "port-version": 0 + }, { "git-tree": "16580cf264c6a8933fb657e425a5866568d4c394", "version": "2.6.2",