diff options
| author | ras0219 <533828+ras0219@users.noreply.github.com> | 2021-01-20 13:03:02 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-20 13:03:02 -0800 |
| commit | 93db9aced19c819cf0040a2d628f73b246653439 (patch) | |
| tree | 3e5991004d5678627f35f5f783e9f5b30a29d1cc | |
| parent | 8e926cc06c3b52056926697b87fc350af7e66d69 (diff) | |
| download | vcpkg-93db9aced19c819cf0040a2d628f73b246653439.tar.gz vcpkg-93db9aced19c819cf0040a2d628f73b246653439.zip | |
[sfml] Install usage and change version scheme to relaxed (#15718)
| -rw-r--r-- | port_versions/baseline.json | 2 | ||||
| -rw-r--r-- | port_versions/s-/sfml.json | 5 | ||||
| -rw-r--r-- | ports/sfml/CONTROL | 6 | ||||
| -rw-r--r-- | ports/sfml/portfile.cmake | 3 | ||||
| -rw-r--r-- | ports/sfml/usage | 8 | ||||
| -rw-r--r-- | ports/sfml/vcpkg.json | 15 |
6 files changed, 27 insertions, 12 deletions
diff --git a/port_versions/baseline.json b/port_versions/baseline.json index d5f4d1e2b..30c6d3c70 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -5262,7 +5262,7 @@ }, "sfml": { "baseline": "2.5.1", - "port-version": 9 + "port-version": 10 }, "sfsexp": { "baseline": "1.3", diff --git a/port_versions/s-/sfml.json b/port_versions/s-/sfml.json index 5481e9129..d14e2ee1a 100644 --- a/port_versions/s-/sfml.json +++ b/port_versions/s-/sfml.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "02d4e2c1c253e1ef48dd9c37d24bec0a47a716ff", + "version": "2.5.1", + "port-version": 10 + }, + { "git-tree": "abdf117d96cbb4dd259ec37277311109151bfcdb", "version-string": "2.5.1", "port-version": 9 diff --git a/ports/sfml/CONTROL b/ports/sfml/CONTROL deleted file mode 100644 index d126e395e..000000000 --- a/ports/sfml/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: sfml -Version: 2.5.1 -Port-Version: 9 -Homepage: https://github.com/sfml/sfml -Description: Simple and fast multimedia library -Build-Depends: freetype, libflac, libogg, libvorbis, openal-soft, stb diff --git a/ports/sfml/portfile.cmake b/ports/sfml/portfile.cmake index 0a028db19..f832303a7 100644 --- a/ports/sfml/portfile.cmake +++ b/ports/sfml/portfile.cmake @@ -56,4 +56,5 @@ endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) -file(INSTALL ${SOURCE_PATH}/license.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file +configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage COPYONLY) +configure_file(${SOURCE_PATH}/license.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/ports/sfml/usage b/ports/sfml/usage index 5b0f68d1a..784d1173a 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 CONFIG REQUIRED)
- # Windows
- target_link_libraries(main PRIVATE FLAC OpenAL OpenGL Vorbis)
- # Linux/MacOS
- target_link_libraries(main PRIVATE X11 FLAC UDev OpenAL)
+ target_link_libraries(main PRIVATE sfml-system sfml-network sfml-graphics sfml-window)
+
+ # If you want SFML to provide an implementation of main():
+ target_link_libraries(main PRIVATE sfml-main)
diff --git a/ports/sfml/vcpkg.json b/ports/sfml/vcpkg.json new file mode 100644 index 000000000..64c7f5358 --- /dev/null +++ b/ports/sfml/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "sfml", + "version": "2.5.1", + "port-version": 10, + "description": "Simple and fast multimedia library", + "homepage": "https://github.com/sfml/sfml", + "dependencies": [ + "freetype", + "libflac", + "libogg", + "libvorbis", + "openal-soft", + "stb" + ] +} |