diff --git a/ports/sdl2-ttf/fix-pkgconfig.patch b/ports/sdl2-ttf/fix-pkgconfig.patch deleted file mode 100644 index 590eaf51ea..0000000000 --- a/ports/sdl2-ttf/fix-pkgconfig.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4ea903d..35be59d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -325,7 +325,7 @@ if(SDL2TTF_INSTALL) - COMPONENT devel - ) - -- if(SDL2TTF_BUILD_SHARED_LIBS) -+ if(1) - # Only create a .pc file for a shared SDL2_ttf - set(prefix "${CMAKE_INSTALL_PREFIX}") - set(exec_prefix "\${prefix}") -@@ -353,7 +353,7 @@ if(SDL2TTF_INSTALL) - \"${CMAKE_CURRENT_BINARY_DIR}/SDL2_ttf.pc\") - file(INSTALL DESTINATION \"\${CMAKE_INSTALL_PREFIX}/${PC_DESTDIR}\" - TYPE FILE -- FILES \"${CMAKE_CURRENT_BINARY_DIR}/SDL2_ttf.pc\")" CONFIG Release) -+ FILES \"${CMAKE_CURRENT_BINARY_DIR}/SDL2_ttf.pc\")") - endif() - - if(SDL2TTF_BUILD_SHARED_LIBS AND (APPLE OR (UNIX AND NOT ANDROID))) diff --git a/ports/sdl2-ttf/portfile.cmake b/ports/sdl2-ttf/portfile.cmake index c21b1218c5..a1d47276f8 100644 --- a/ports/sdl2-ttf/portfile.cmake +++ b/ports/sdl2-ttf/portfile.cmake @@ -2,10 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libsdl-org/SDL_ttf REF "release-${VERSION}" - SHA512 ea059fce879f8ddb3b36f8364d65ef922c389db67383d8a5c42c0ebf8a407d55adce42620b4d04caa0b297847362cc733a9d3d9acb843897a535c875fd0c471f + SHA512 2e5dd54633c92329195370953ccf396dd4a12be30f432f46dc1c7023b3c871b8a99f5d2ca5b066ebc41fab02a070976911caeab18b08e6e4c5ab5cc3ad17be23 HEAD_REF main - PATCHES - fix-pkgconfig.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -35,4 +33,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/licenses") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/sdl2-ttf/vcpkg.json b/ports/sdl2-ttf/vcpkg.json index 7594a5d818..0d8a49caa1 100644 --- a/ports/sdl2-ttf/vcpkg.json +++ b/ports/sdl2-ttf/vcpkg.json @@ -1,7 +1,6 @@ { "name": "sdl2-ttf", - "version": "2.20.2", - "port-version": 1, + "version": "2.22.0", "description": "A library for rendering TrueType fonts with SDL", "homepage": "https://www.libsdl.org/projects/SDL_ttf/", "license": "Zlib", diff --git a/versions/baseline.json b/versions/baseline.json index f1b42ad9bb..46eacb6dfd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7861,8 +7861,8 @@ "port-version": 3 }, "sdl2-ttf": { - "baseline": "2.20.2", - "port-version": 1 + "baseline": "2.22.0", + "port-version": 0 }, "sdl2pp": { "baseline": "0.16.1", diff --git a/versions/s-/sdl2-ttf.json b/versions/s-/sdl2-ttf.json index 7d1a1116a4..3c75ee4daa 100644 --- a/versions/s-/sdl2-ttf.json +++ b/versions/s-/sdl2-ttf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "51a85aefcfb3e578904f1cbd72a9f49ff836b928", + "version": "2.22.0", + "port-version": 0 + }, { "git-tree": "5727e1037aeb6698eda35ad791157d78d22b1a93", "version": "2.20.2",