Skip to content
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

Jump to bottom

[sdl2-net] Update to 2.2.0. #27459

Merged
merged 4 commits into from
Oct 28, 2022
Merged

[sdl2-net] Update to 2.2.0. #27459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
41a27fa
[sdl2-net] Update to 2.2.0.
FtZPetruska Oct 25, 2022
36dc4ed
[sdl2-net] Update homepage and license.
FtZPetruska Oct 26, 2022
1caab90
[sdl2-net] Replace deprecated functions.
FtZPetruska Oct 27, 2022
fd98fda
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Oct 27, 2022
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
38 changes: 0 additions & 38 deletions ports/sdl2-net/CMakeLists.txt
View file
Open in desktop

This file was deleted.

39 changes: 22 additions & 17 deletions ports/sdl2-net/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,31 @@
vcpkg_download_distfile(ARCHIVE
URLS "https://www.libsdl.org/projects/SDL_net/release/SDL2_net-2.0.1.tar.gz"
FILENAME "SDL2_net-2.0.1.tar.gz"
SHA512 d27faee3cddc3592dae38947e6c1df0cbaa95f82fde9c87db6d11f6312d868cea74f6830ad07ceeb3d0d75e9424cebf39e54fddf9a1147e8d9e664609de92b7a
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libsdl-org/SDL_net
REF 669e75b84632e2c6cc5c65974ec9e28052cb7a4e # release-2.2.0
SHA512 180c757d704c72dc7fcc392c13942214c87b90de22e32045ec9eb6cde5da2b762516e14120d8bee52f7f4a59ad8e30d4f71e313918432ae07ef71df8e9380e4b
HEAD_REF main
)

vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DSDL2NET_SAMPLES=OFF
)

file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
vcpkg_cmake_install()

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS_DEBUG
-DSDL_NET_SKIP_HEADERS=ON)
if(EXISTS "${CURRENT_PACKAGES_DIR}/cmake")
BillyONeal marked this conversation as resolved.
Show resolved Hide resolved
vcpkg_cmake_config_fixup(PACKAGE_NAME SDL2_net CONFIG_PATH cmake)
else()
vcpkg_cmake_config_fixup(PACKAGE_NAME SDL2_net CONFIG_PATH lib/cmake/SDL2_net)
endif()

vcpkg_install_cmake()
vcpkg_copy_pdbs()
vcpkg_fixup_cmake_targets()

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

file(INSTALL ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
4 changes: 4 additions & 0 deletions ports/sdl2-net/usage
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
sdl2-net provides CMake targets:

find_package(SDL2_net CONFIG REQUIRED)
target_link_libraries(main PRIVATE $<IF:$<TARGET_EXISTS:SDL2_net::SDL2_net>,SDL2_net::SDL2_net,SDL2_net::SDL2_net-static>)
16 changes: 12 additions & 4 deletions ports/sdl2-net/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
{
"name": "sdl2-net",
"version-string": "2.0.1",
"port-version": 9,
"version": "2.2.0",
"description": "Networking library for SDL",
"homepage": "https://www.libsdl.org/projects/SDL_net",
"homepage": "https://github.com/libsdl-org/SDL_net",
"license": "Zlib",
"dependencies": [
"sdl2"
"sdl2",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}
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 @@ -6765,8 +6765,8 @@
"port-version": 2
},
"sdl2-net": {
"baseline": "2.0.1",
"port-version": 9
"baseline": "2.2.0",
"port-version": 0
},
"sdl2-ttf": {
"baseline": "2.20.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/s-/sdl2-net.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "42bbc8fde95dbe42390656e720cf852e08b31b77",
"version": "2.2.0",
"port-version": 0
},
{
"git-tree": "fcebb3e918a41e08cc320cede3d15872c53ad204",
"version-string": "2.0.1",
Expand Down