From bbb668080287c62f1320435405b4e4cb55c35e5c Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 18 May 2022 17:28:28 +0800 Subject: [PATCH] [ftgl] Update to the latest commit (#24770) * [ftgl] Update to the latest commit * update version --- ports/ftgl/Fix-headersFilePath.patch | 23 ----------------------- ports/ftgl/portfile.cmake | 5 ++--- ports/ftgl/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/f-/ftgl.json | 5 +++++ 5 files changed, 11 insertions(+), 30 deletions(-) delete mode 100644 ports/ftgl/Fix-headersFilePath.patch diff --git a/ports/ftgl/Fix-headersFilePath.patch b/ports/ftgl/Fix-headersFilePath.patch deleted file mode 100644 index f3459352a3..0000000000 --- a/ports/ftgl/Fix-headersFilePath.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 693e49f..c47ff3c 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -1,9 +1,5 @@ -- -- -- - INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/cmake) - -- - ADD_DEFINITIONS(-DPACKAGE_VERSION="${VERSION_SERIES}.${VERSION_MAJOR}.${VERSION_MINOR}") - - IF(WIN32) -@@ -26,7 +22,7 @@ SET(libftgl_la_SOURCES - FTGlyphContainer.h - FTInternals.h - FTLibrary.cpp -- FTLibrary.h -+ FTGL/FTLibrary.h - FTList.h - FTPoint.cpp - FTSize.cpp diff --git a/ports/ftgl/portfile.cmake b/ports/ftgl/portfile.cmake index 0c98215fa2..2d41003072 100644 --- a/ports/ftgl/portfile.cmake +++ b/ports/ftgl/portfile.cmake @@ -6,11 +6,10 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO frankheckenbach/ftgl - REF 483639219095ad080538e07ceb5996de901d4e74 - SHA512 d5bf95db8db6a5c9f710bd274cb9bb82e3e67569e8f3ec55b36e068636a09252e6f191e36d8279e61b5d12408c065ce51829fc38d4d7afe5bda724752d2f084f + REF 36e8cd683492456def3b6a54c6dcb56cd6ee4bb4 #commmit-data 2022-05-18 + SHA512 b357cf18890664d437f41d7bf18f39c894743e76e2e0b2296254b27e5675866956473e7b78139d0e6cdd7e8310bf8d2943ba0ddeea494ee67857d6083c490dc2 HEAD_REF master PATCHES - Fix-headersFilePath.patch 01_disable_doxygen.patch 02_enable-cpp11-std.patch ) diff --git a/ports/ftgl/vcpkg.json b/ports/ftgl/vcpkg.json index d1f92b1874..326c2a681c 100644 --- a/ports/ftgl/vcpkg.json +++ b/ports/ftgl/vcpkg.json @@ -1,13 +1,13 @@ { "name": "ftgl", - "version-string": "2.4.0", - "port-version": 4, + "version-date": "2022-05-18", "description": [ "FTGL is a free open source library to enable developers to use arbitrary fonts in their OpenGL (www.opengl.org) applications.", "Unlike other OpenGL font libraries FTGL uses standard font file formats so doesn't need a preprocessing step to convert the high quality font data into a lesser quality, proprietary format.", "FTGL uses the Freetype (www.freetype.org) font library to open and 'decode' the fonts. It then takes that output and stores it in a format most efficient for OpenGL rendering." ], "homepage": "https://github.com/frankheckenbach/ftgl", + "license": "MIT", "dependencies": [ "freetype", "opengl", diff --git a/versions/baseline.json b/versions/baseline.json index aa959c4adf..c782183845 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2369,8 +2369,8 @@ "port-version": 1 }, "ftgl": { - "baseline": "2.4.0", - "port-version": 4 + "baseline": "2022-05-18", + "port-version": 0 }, "ftxui": { "baseline": "2.0.0", diff --git a/versions/f-/ftgl.json b/versions/f-/ftgl.json index 3a4533b9c0..2dd4e90f20 100644 --- a/versions/f-/ftgl.json +++ b/versions/f-/ftgl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5f8871169a409d3eff23c83391564108912a6a97", + "version-date": "2022-05-18", + "port-version": 0 + }, { "git-tree": "5642730406fc248cae1eaefc9e739b9bf1c13fbf", "version-string": "2.4.0",