diff --git a/ports/sfml/02-fix-pkgconfig.patch b/ports/sfml/02-fix-pkgconfig.patch deleted file mode 100644 index f7247c8fee..0000000000 --- a/ports/sfml/02-fix-pkgconfig.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f9cdd1c20..1555b6b03 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -201,9 +201,6 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) - set_property(GLOBAL PROPERTY USE_FOLDERS ON) - set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "CMake") - --# add the subdirectories --add_subdirectory(src/SFML) -- - # on Linux and BSD-like OS, install pkg-config files by default - set(SFML_INSTALL_PKGCONFIG_DEFAULT OFF) - -@@ -248,6 +245,9 @@ if(SFML_ENABLE_PCH AND SFML_OS_MACOS) - message(FATAL_ERROR "Precompiled headers are currently not supported in macOS builds") - endif() - -+# add the subdirectories -+add_subdirectory(src/SFML) -+ - # setup the install rules - if(NOT SFML_BUILD_FRAMEWORKS) - install(DIRECTORY include/ diff --git a/ports/sfml/portfile.cmake b/ports/sfml/portfile.cmake index d071b4eb2a..67c8670b40 100644 --- a/ports/sfml/portfile.cmake +++ b/ports/sfml/portfile.cmake @@ -2,10 +2,9 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REPO SFML/SFML REF "${VERSION}" HEAD_REF master - SHA512 cee56eef93728aef9b361f8b1080572532ce5247c80a9d1be53b30dab4d67e8588316890555d4c4ba423e87b09f954327d70615e1ba72d458d8238fa84e589f9 + SHA512 7fc3f91b84ba2353b4216c0d0a71fd15f7349b8e22630dd727fc98a1f8c295a69fe21f3e1e878413966662047280ed4f195b51ee3302061c3903aea4958a6999 PATCHES 01-fix-dependency-resolve.patch - 02-fix-pkgconfig.patch 03-fix-android-install-path.patch ) diff --git a/ports/sfml/vcpkg.json b/ports/sfml/vcpkg.json index f15470d479..e1c4044fb5 100644 --- a/ports/sfml/vcpkg.json +++ b/ports/sfml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sfml", - "version": "3.0.1", + "version": "3.0.2", "description": "Simple and fast multimedia library", "homepage": "https://github.com/SFML/SFML", "license": "Zlib", diff --git a/versions/baseline.json b/versions/baseline.json index b5fcf70f17..ba8e12faf0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8841,7 +8841,7 @@ "port-version": 0 }, "sfml": { - "baseline": "3.0.1", + "baseline": "3.0.2", "port-version": 0 }, "sfsexp": { diff --git a/versions/s-/sfml.json b/versions/s-/sfml.json index 8b17acaa07..0702c3199d 100644 --- a/versions/s-/sfml.json +++ b/versions/s-/sfml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ffed70e09662f9b535761716ea9b9623a461b9df", + "version": "3.0.2", + "port-version": 0 + }, { "git-tree": "f3c328f618e297ce86f2787e9742203b891a2ac8", "version": "3.0.1",