diff options
| author | JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> | 2021-02-25 05:58:56 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-24 13:58:56 -0800 |
| commit | c8116498e44b0b4838646f24af845d236132014a (patch) | |
| tree | e182e2ea6ed6486fd5d3236b6856e60ed2d94474 | |
| parent | 9c16956fb14c37c8e9bb8073ccc4faf60c054306 (diff) | |
| download | vcpkg-c8116498e44b0b4838646f24af845d236132014a.tar.gz vcpkg-c8116498e44b0b4838646f24af845d236132014a.zip | |
[box2d] update to 2.4.1 (#16322)
* [box2d] update to 2.4.1
* update version
* delete patch file
* update version
* update json
* update version
| -rw-r--r-- | ports/box2d/CONTROL | 5 | ||||
| -rw-r--r-- | ports/box2d/export-targets.patch | 36 | ||||
| -rw-r--r-- | ports/box2d/portfile.cmake | 8 | ||||
| -rw-r--r-- | ports/box2d/vcpkg.json | 7 | ||||
| -rw-r--r-- | versions/b-/box2d.json | 5 | ||||
| -rw-r--r-- | versions/baseline.json | 2 |
6 files changed, 16 insertions, 47 deletions
diff --git a/ports/box2d/CONTROL b/ports/box2d/CONTROL deleted file mode 100644 index 909dc4c1a..000000000 --- a/ports/box2d/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: box2d
-Version: 2.4.0
-Description: An open source C++ engine for simulating rigid bodies in 2D.
-Homepage: https://box2d.org
-Supports: !uwp
diff --git a/ports/box2d/export-targets.patch b/ports/box2d/export-targets.patch deleted file mode 100644 index 636f1086b..000000000 --- a/ports/box2d/export-targets.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 6ef515f..6975f91 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -95,8 +95,8 @@ set(BOX2D_HEADER_FILES
- ../include/box2d/b2_world_callbacks.h
- ../include/box2d/box2d.h)
-
--add_library(box2d STATIC ${BOX2D_SOURCE_FILES} ${BOX2D_HEADER_FILES})
--target_include_directories(box2d PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../include)
-+add_library(box2d STATIC ${BOX2D_SOURCE_FILES})
-+target_include_directories(box2d PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include> $<INSTALL_INTERFACE:include>)
- target_include_directories(box2d PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
- set_target_properties(box2d PROPERTIES
- CXX_STANDARD 11
-@@ -104,5 +104,18 @@ set_target_properties(box2d PROPERTIES
- CXX_EXTENSIONS NO
- )
-
--source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" PREFIX "src" FILES ${BOX2D_SOURCE_FILES})
--source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}/../include" PREFIX "include" FILES ${BOX2D_HEADER_FILES})
-+install(FILES ${BOX2D_HEADER_FILES} DESTINATION include/box2d)
-+
-+install(TARGETS box2d
-+ EXPORT unofficial-box2d-targets
-+ RUNTIME DESTINATION bin
-+ ARCHIVE DESTINATION lib
-+ LIBRARY DESTINATION lib
-+)
-+
-+install(
-+ EXPORT unofficial-box2d-targets
-+ FILE unofficial-box2d-config.cmake
-+ NAMESPACE unofficial::box2d::
-+ DESTINATION share/unofficial-box2d
-+)
diff --git a/ports/box2d/portfile.cmake b/ports/box2d/portfile.cmake index 3b931cb3f..1e414e72a 100644 --- a/ports/box2d/portfile.cmake +++ b/ports/box2d/portfile.cmake @@ -5,11 +5,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO erincatto/Box2D - REF 4d7757feedc9dd36f64393ae08acfd3b9600ac17 #v2.4.0 - SHA512 197f701016c91fda944328e7d867f0a5baa152cce53fa35826986923456af593595bad884008944e041d9ac2e1d769a54eaad4142e19b42a3bb2a2010d814cc9 + REF 9ebbbcd960ad424e03e5de6e66a40764c16f51bc #v2.4.1 + SHA512 d9fa387ce893ed1fb73f80006491202f2624ef6d0fb37daf92fbd1a7f9071c84da45e4b418b333566435bbbdfd3d5f68a42dfca02416e9a3a2b4db039f1c6151 HEAD_REF master - PATCHES - export-targets.patch ) vcpkg_configure_cmake( @@ -23,7 +21,7 @@ vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-box2d TARGET_PATH share/unofficial-box2d) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/box2d) vcpkg_copy_pdbs() diff --git a/ports/box2d/vcpkg.json b/ports/box2d/vcpkg.json new file mode 100644 index 000000000..eff301909 --- /dev/null +++ b/ports/box2d/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "box2d", + "version-semver": "2.4.1", + "description": "An open source C++ engine for simulating rigid bodies in 2D", + "homepage": "https://box2d.org", + "supports": "!uwp" +} diff --git a/versions/b-/box2d.json b/versions/b-/box2d.json index 8999b7937..419e840df 100644 --- a/versions/b-/box2d.json +++ b/versions/b-/box2d.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "fc279cfa6011af543c0b1ebb043767acd13a7930", + "version-semver": "2.4.1", + "port-version": 0 + }, + { "git-tree": "61a9394741ba7f08404d1c7f2b77a9d8b9456bc2", "version-string": "2.4.0", "port-version": 0 diff --git a/versions/baseline.json b/versions/baseline.json index ccc9e59e9..2b4be9c17 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1001,7 +1001,7 @@ "port-version": 0 }, "box2d": { - "baseline": "2.4.0", + "baseline": "2.4.1", "port-version": 0 }, "breakpad": { |