Skip to content

[sdl2pp] Update to 0.18.1 #49288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
SunBlack wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

[sdl2pp] Update to 0.18.1 #49288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 0 additions & 78 deletions ports/sdl2pp/fix-dependencies.patch
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions ports/sdl2pp/fix-usage.patch
View file
Open in desktop

This file was deleted.

24 changes: 4 additions & 20 deletions ports/sdl2pp/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libSDL2pp/libSDL2pp
REF ${VERSION}
SHA512 3682281432ce9dec0dbc7c786496564c906db9933138e1f2b881f93b5602a7170e06e67e87d35a9e5944ef80f6e13b9835e33209c52869f0ea2bc224f639a749
REF "${VERSION}"
SHA512 655412c93df5e6207064a07328785add4e7700a656295f03f0f2df4898ce62bd259340de28bf2a79db4fce765d2000ce6a43312dbe524f2b2b909a2dbf324859
HEAD_REF master
PATCHES
fix-dependencies.patch
fix-usage.patch
)

vcpkg_check_features(
Expand All @@ -17,34 +14,21 @@ vcpkg_check_features(
sdl2-ttf SDL2PP_WITH_TTF
)

file(REMOVE "${SOURCE_PATH}/cmake/FindSDL2.cmake"
"${SOURCE_PATH}/cmake/FindSDL2_image.cmake"
"${SOURCE_PATH}/cmake/FindSDL2_mixer.cmake"
"${SOURCE_PATH}/cmake/FindSDL2_ttf.cmake"
)

string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SDL2PP_STATIC)

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
${FEATURE_OPTIONS}
-DCMAKEMODDIR=share/${PORT}
-DSDL2PP_WITH_EXAMPLES=OFF
-DSDL2PP_WITH_TESTS=OFF
-DSDL2PP_STATIC=${SDL2PP_STATIC}
${FEATURE_OPTIONS}
)

vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake")
vcpkg_fixup_pkgconfig()

vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/FindSDL2PP.cmake" "HINTS \"${CURRENT_PACKAGES_DIR}/include\"" "")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/FindSDL2PP.cmake" "HINTS \"${CURRENT_PACKAGES_DIR}/lib\"" "")

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
# Handle copyright
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING.txt")
5 changes: 0 additions & 5 deletions ports/sdl2pp/usage
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions ports/sdl2pp/vcpkg-cmake-wrapper.cmake
View file
Open in desktop

This file was deleted.

9 changes: 6 additions & 3 deletions ports/sdl2pp/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"name": "sdl2pp",
"version": "0.16.1",
"port-version": 12,
"version": "0.18.1",
"description": "C++11 bindings/wrapper for SDL2",
"homepage": "https://sdl2pp.amdmi3.ru",
"homepage": "https://github.com/libSDL2pp/libSDL2pp",
"license": "Zlib",
"dependencies": [
{
Expand All @@ -13,6 +12,10 @@
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
],
"features": {
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8885,8 +8885,8 @@
"port-version": 0
},
"sdl2pp": {
"baseline": "0.16.1",
"port-version": 12
"baseline": "0.18.1",
"port-version": 0
},
"sdl3": {
"baseline": "3.4.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/s-/sdl2pp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b3e424a046a992f669706362e9a13ebac624641a",
"version": "0.18.1",
"port-version": 0
},
{
"git-tree": "7d7a7ab49f374da1e64de4f3ce02611bcb598bdb",
"version": "0.16.1",
Expand Down
Loading