mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 00:08:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[fontconfig/freetype/fribidi] Update versions (#40668)

Browse Source
This commit is contained in:
Osyotr 2024-09-03 22:38:18 +03:00 committed by GitHub
parent ec6869ac22
commit fd4c30b55e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
25 changed files with 218 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ports/fontconfig/fix-preprocessor-clang-cl.patch
View File

@ -1,13 +0,0 @@
diff --git a/src/meson.build b/src/meson.build
index 9a6ba2021..5d04f7360 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -33,7 +33,7 @@ fc_sources = [
cpp = cc.cmd_array()
if cc.get_id() == 'gcc'
cpp += ['-E', '-P']
-elif cc.get_id() == 'msvc'
+elif cc.get_argument_syntax() == 'msvc'
cpp += ['/EP']
elif cc.get_id() == 'clang'
cpp += ['-E', '-P']

4
ports/fontconfig/libgetopt.patch
View File

@ -126,5 +126,5 @@ index f616600..6d82a16 100644
+endif
+
prefix = get_option('prefix')
# Check iconv support
iconv_dep = []

2
ports/fontconfig/no-etc-symlinks.patch
View File

@ -12,7 +12,7 @@
except FileNotFoundError:
pass
try:
- os.symlink(src, dst)
- os.symlink(os.path.relpath(src, start=args.confpath), dst)
+ shutil.copyfile(src, dst)
except NotImplementedError:
# Not supported on this version of Windows

4
ports/fontconfig/portfile.cmake
View File

@ -3,12 +3,11 @@ vcpkg_from_gitlab(
OUT_SOURCE_PATH SOURCE_PATH
REPO fontconfig/fontconfig
REF ${VERSION}
SHA512 b6cbb4ad7db224dabfb8a96c1d0743bab5bbe8f403e49d9b9a44effd161fd97062a2f7205a700308a1f805655038538ba2fb1b65169faa2d69ea88e477230849
SHA512 daa6d1e6058e12c694d9e1512e09be957ff7f3fa375246b9d13eb0a8cf2f21e1512a5cabe93f270e96790e2c20420bf7422d213e43ab9749da3255286ea65a7c
HEAD_REF master
PATCHES
no-etc-symlinks.patch
libgetopt.patch
fix-preprocessor-clang-cl.patch
)
vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf")
@ -18,6 +17,7 @@ vcpkg_configure_meson(
OPTIONS
-Ddoc=disabled
-Dcache-build=disabled
-Diconv=enabled
-Dtests=disabled
)

8
ports/fontconfig/vcpkg.json
View File

@ -1,7 +1,6 @@
{
"name": "fontconfig",
"version": "2.14.2",
"port-version": 2,
"version": "2.15.0",
"description": "Library for configuring and customizing font access.",
"homepage": "https://www.freedesktop.org/wiki/Software/fontconfig",
"license": "MIT",
@ -15,7 +14,10 @@
"name": "gperf",
"host": true
},
"libiconv",
{
"name": "libiconv",
"platform": "!windows"
},
{
"name": "libuuid",
"platform": "!windows & !osx & !mingw"

13
ports/freetype/portfile.cmake
View File

@ -2,12 +2,15 @@ if("subpixel-rendering" IN_LIST FEATURES)
set(SUBPIXEL_RENDERING_PATCH "subpixel-rendering.patch")
endif()
vcpkg_from_sourceforge(
string(REPLACE "." "-" VERSION_HYPHEN "${VERSION}")
vcpkg_from_gitlab(
GITLAB_URL https://gitlab.freedesktop.org/
OUT_SOURCE_PATH SOURCE_PATH
REPO freetype/freetype2
REF "${VERSION}"
FILENAME freetype-${VERSION}.tar.xz
SHA512 a5917edaa45cb9f75786f8a4f9d12fdf07529247e09dfdb6c0cf7feb08f7588bb24f7b5b11425fb47f8fd62fcb426e731c944658f6d5a59ce4458ad5b0a50194
REPO freetype/freetype
REF "VER-${VERSION_HYPHEN}"
SHA512 fccfaa15eb79a105981bf634df34ac9ddf1c53550ec0b334903a1b21f9f8bf5eb2b3f9476e554afa112a0fca58ec85ab212d674dfd853670efec876bacbe8a53
HEAD_REF master
PATCHES
0003-Fix-UWP.patch
brotli-static.patch

3
ports/freetype/vcpkg.json
View File

@ -1,7 +1,6 @@
{
"name": "freetype",
"version": "2.13.2",
"port-version": 1,
"version": "2.13.3",
"description": "A library to render fonts.",
"homepage": "https://www.freetype.org/",
"license": "FTL OR GPL-2.0-or-later",

2
ports/fribidi/portfile.cmake
View File

@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO fribidi/fribidi
REF v${VERSION}
SHA512 246c904f8e6cc7eee61c03162b42dd0e0ed2163ef02d9d15b8168f0084ccdd9b625b83092915fa42f301106247e3159ad6aee0af42c37643253f7c47d0a520ef
SHA512 b42830047b5014e45cd2deb29e3caa169abe6b5dd117f0c877eeb81326b2511979c7bbf49d52300e16431ed9cb2422e21b3524ffb1a22be17bad161166c3fa74
HEAD_REF master
PATCHES meson-crosscompile.patch
)

3
ports/fribidi/vcpkg.json
View File

@ -1,7 +1,8 @@
{
"name": "fribidi",
"version": "1.0.13",
"version": "1.0.15",
"description": "GNU FriBidi is an implementation of the Unicode Bidirectional Algorithm (bidi)",
"homepage": "https://www.gnu.org/software/fribidi",
"license": "LGPL-2.1-or-later",
"supports": "!uwp",
"dependencies": [

30
ports/ftgl/01_disable_doxygen.patch
View File

@ -1,30 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 303fcae..718ae88 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,15 +35,16 @@ ENDIF(BUILD_SHARED_LIBS)
ADD_CUSTOM_TARGET(doc)
-FIND_PACKAGE(Doxygen)
-IF(DOXYGEN_FOUND)
- ADD_CUSTOM_TARGET(doxygen
- ${DOXYGEN_EXECUTABLE}
- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
- COMMENT "Doxygen ...")
- ADD_DEPENDENCIES(doc doxygen)
-
-ENDIF(DOXYGEN_FOUND)
+IF (WIN32) # doxygen only have windows package in vcpkg now.
+ FIND_PACKAGE(Doxygen)
+ IF(DOXYGEN_FOUND)
+ ADD_CUSTOM_TARGET(doxygen
+ ${DOXYGEN_EXECUTABLE}
+ WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+ COMMENT "Doxygen ...")
+ ADD_DEPENDENCIES(doc doxygen)
+ ENDIF(DOXYGEN_FOUND)
+ENDIF()
SUBDIRS(src)

12
ports/ftgl/fix-cmake.diff Normal file
View File

@ -0,0 +1,12 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 693e49f..b0f26f6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -26,7 +26,6 @@ SET(libftgl_la_SOURCES
FTGlyphContainer.h
FTInternals.h
FTLibrary.cpp
- FTLibrary.h
FTList.h
FTPoint.cpp
FTSize.cpp

26
ports/ftgl/fix-gl-flags.diff Normal file
View File

@ -0,0 +1,26 @@
diff --git a/src/FTFont/FTBufferFont.cpp b/src/FTFont/FTBufferFont.cpp
index ce04cf5..b330a3b 100644
--- a/src/FTFont/FTBufferFont.cpp
+++ b/src/FTFont/FTBufferFont.cpp
@@ -232,7 +232,7 @@ inline FTPoint FTBufferFontImpl::RenderI(const T* string, const int len,
bool inCache = false;
// Protect blending functions, GL_TEXTURE_2D and optionally GL_BLEND
- glPushAttrib(GL_COLOR_BUFFER_BIT | GL_ENABLE_BIT | GL_TEXTURE_ENV_MODE);
+ glPushAttrib(GL_COLOR_BUFFER_BIT | GL_ENABLE_BIT | GL_TEXTURE_BIT);
// Protect glPixelStorei() calls
glPushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);
diff --git a/src/FTFont/FTTextureFont.cpp b/src/FTFont/FTTextureFont.cpp
index 97e8768..a5145cf 100644
--- a/src/FTFont/FTTextureFont.cpp
+++ b/src/FTFont/FTTextureFont.cpp
@@ -241,7 +241,7 @@ inline FTPoint FTTextureFontImpl::RenderI(const T* string, const int len,
int renderMode)
{
// Protect GL_TEXTURE_2D and optionally GL_BLEND
- glPushAttrib(GL_ENABLE_BIT | GL_COLOR_BUFFER_BIT | GL_TEXTURE_ENV_MODE);
+ glPushAttrib(GL_ENABLE_BIT | GL_COLOR_BUFFER_BIT | GL_TEXTURE_BIT);
if(FTLibrary::Instance().GetLegacyOpenGLStateSet())
{

56
ports/ftgl/freetype-usage.diff Normal file
View File

@ -0,0 +1,56 @@
--- a/src/FTVectoriser.h
+++ b/src/FTVectoriser.h
@@ -296,7 +296,7 @@
/**
* The number of contours reported by Freetype
*/
- short ftContourCount;
+ unsigned short ftContourCount;
/**
* A flag indicating the tesselation rule for the glyph
--- a/src/FTVectoriser.cpp
+++ b/src/FTVectoriser.cpp
@@ -159,16 +159,16 @@
void FTVectoriser::ProcessContours()
{
- short contourLength = 0;
- short startIndex = 0;
- short endIndex = 0;
+ unsigned short contourLength = 0;
+ unsigned short startIndex = 0;
+ unsigned short endIndex = 0;
contourList = new FTContour*[ftContourCount];
for(int i = 0; i < ftContourCount; ++i)
{
FT_Vector* pointList = &outline.points[startIndex];
- char* tagList = &outline.tags[startIndex];
+ unsigned char* tagList = &outline.tags[startIndex];
endIndex = outline.contours[i];
contourLength = (endIndex - startIndex) + 1;
--- a/src/FTContour.h
+++ b/src/FTContour.h
@@ -52,7 +52,7 @@
* @param pointTags
* @param numberOfPoints
*/
- FTContour(FT_Vector* contour, char* pointTags, unsigned int numberOfPoints);
+ FTContour(FT_Vector* contour, unsigned char* pointTags, unsigned int numberOfPoints);
/**
* Destructor
--- a/src/FTContour.cpp
+++ b/src/FTContour.cpp
@@ -174,7 +174,7 @@
}
-FTContour::FTContour(FT_Vector* contour, char* tags, unsigned int n)
+FTContour::FTContour(FT_Vector* contour, unsigned char* tags, unsigned int n)
{
FTPoint prev, cur(contour[(n - 1) % n]), next(contour[0]);
double olddir, dir = atan2((next - cur).Y(), (next - cur).X());

30
ports/ftgl/install-pkgconfig.diff Normal file
View File

@ -0,0 +1,30 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 303fcae..cdcf2c9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,3 +74,12 @@ install(EXPORT FTGL-targets DESTINATION "${cmakedir}")
install(
FILES "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/FTGLConfig.cmake"
DESTINATION "${cmakedir}")
+
+SET(PKGCONFIG_INSTALL_PREFIX "lib${LIB_SUFFIX}/pkgconfig/" CACHE STRING "Base directory for pkgconfig files")
+CONFIGURE_FILE(
+ ${CMAKE_CURRENT_SOURCE_DIR}/ftgl.pc.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/ftgl.pc
+ @ONLY)
+INSTALL(
+ FILES ${CMAKE_CURRENT_BINARY_DIR}/ftgl.pc
+ DESTINATION ${PKGCONFIG_INSTALL_PREFIX})
diff --git a/ftgl.pc.cmake b/ftgl.pc.cmake
new file mode 100644
index 0000000..d242667
--- /dev/null
+++ b/ftgl.pc.cmake
@@ -0,0 +1,6 @@
+Name: ftgl
+Description: OpenGL frontend to Freetype 2
+Requires.private: freetype2
+Version: @VERSION_SERIES@.@VERSION_MAJOR@.@VERSION_MINOR@
+Libs: -L@CMAKE_INSTALL_PREFIX@/lib -lftgl
+Cflags: -I@CMAKE_INSTALL_PREFIX@/include
\ No newline at end of file

27
ports/ftgl/portfile.cmake
View File

@ -1,21 +1,22 @@
if (VCPKG_TARGET_IS_WINDOWS)
# doxygen only have windows package in vcpkg now.
vcpkg_find_acquire_program(DOXYGEN)
endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO frankheckenbach/ftgl
REF 36e8cd683492456def3b6a54c6dcb56cd6ee4bb4 #commmit-data 2022-05-18
SHA512 b357cf18890664d437f41d7bf18f39c894743e76e2e0b2296254b27e5675866956473e7b78139d0e6cdd7e8310bf8d2943ba0ddeea494ee67857d6083c490dc2
REF v${VERSION}
SHA512 5a0d05dbb32952e5aa81d2537d604192ca19710cd57289ae056acc5e3ae6d403d7f0ffc8cf6c1aada6c3c23a8df4a8d0eabb81433036ade810bca1894fdfde54
HEAD_REF master
PATCHES
01_disable_doxygen.patch
fix-cmake.diff # https://github.com/frankheckenbach/ftgl/commit/835f2ba7911a6c15a1a314d5e3267fa089b5a319
fix-gl-flags.diff # https://github.com/frankheckenbach/ftgl/commit/778b8f21ba0b71289aef37e3422d008456445971
install-pkgconfig.diff # https://github.com/frankheckenbach/ftgl/commit/8763fa4e413e015e46376697fb8ab59ed31c2ff5
02_enable-cpp11-std.patch
freetype-usage.diff
)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DCMAKE_DISABLE_FIND_PACKAGE_CxxTest=ON
-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
)
vcpkg_cmake_install()
@ -25,8 +26,16 @@ else ()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake)
endif()
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
vcpkg_replace_string(
"${CURRENT_PACKAGES_DIR}/include/FTGL/ftgl.h"
"ifdef FTGL_LIBRARY_STATIC"
"if 1//ifdef FTGL_LIBRARY_STATIC"
)
endif()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
vcpkg_fixup_pkgconfig()
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")

9
ports/ftgl/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "ftgl",
"version-date": "2022-05-18",
"port-version": 1,
"version": "2.4.0",
"port-version": 5,
"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.",
@ -10,7 +10,10 @@
"homepage": "https://github.com/frankheckenbach/ftgl",
"license": "MIT",
"dependencies": [
"freetype",
{
"name": "freetype",
"default-features": false
},
"opengl",
{
"name": "vcpkg-cmake",

13
ports/opencascade/fix-freetype.diff Normal file
View File

@ -0,0 +1,13 @@
diff --git a/src/StdPrs/StdPrs_BRepFont.cxx b/src/StdPrs/StdPrs_BRepFont.cxx
index ab2d9b3c9f..cd701879b1 100644
--- a/src/StdPrs/StdPrs_BRepFont.cxx
+++ b/src/StdPrs/StdPrs_BRepFont.cxx
@@ -457,7 +457,7 @@ Standard_Boolean StdPrs_BRepFont::renderGlyph (const Standard_Utf32Char theChar,
for (short aContour = 0, aStartIndex = 0; aContour < anOutline->n_contours; ++aContour)
{
const FT_Vector* aPntList = &anOutline->points[aStartIndex];
- const char* aTags = &anOutline->tags[aStartIndex];
+ const auto* aTags = &anOutline->tags[aStartIndex];
const short anEndIndex = anOutline->contours[aContour];
const short aPntsNb = (anEndIndex - aStartIndex) + 1;
aStartIndex = anEndIndex + 1;

1
ports/opencascade/portfile.cmake
View File

@ -11,6 +11,7 @@ vcpkg_from_github(
fix-pdb-find.patch
fix-install-prefix-path.patch
install-include-dir.patch
fix-freetype.diff # https://github.com/Open-Cascade-SAS/OCCT/pull/49
)
if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")

1
ports/opencascade/vcpkg.json
View File

@ -1,6 +1,7 @@
{
"name": "opencascade",
"version": "7.8.1",
"port-version": 1,
"description": "Open CASCADE Technology (OCCT) is an open-source software development platform for 3D CAD, CAM, CAE.",
"homepage": "https://github.com/Open-Cascade-SAS/OCCT",
"license": "LGPL-2.1-only",

16
versions/baseline.json
View File

@ -2837,8 +2837,8 @@
"port-version": 0
},
"fontconfig": {
"baseline": "2.14.2",
"port-version": 2
"baseline": "2.15.0",
"port-version": 0
},
"foonathan-lexy": {
"baseline": "2022.12.1",
@ -2885,8 +2885,8 @@
"port-version": 2
},
"freetype": {
"baseline": "2.13.2",
"port-version": 1
"baseline": "2.13.3",
"port-version": 0
},
"freetype-gl": {
"baseline": "2022-01-17",
@ -2897,7 +2897,7 @@
"port-version": 0
},
"fribidi": {
"baseline": "1.0.13",
"baseline": "1.0.15",
"port-version": 0
},
"frozen": {
@ -2913,8 +2913,8 @@
"port-version": 0
},
"ftgl": {
"baseline": "2022-05-18",
"port-version": 1
"baseline": "2.4.0",
"port-version": 5
},
"ftxui": {
"baseline": "5.0.0",
@ -6518,7 +6518,7 @@
},
"opencascade": {
"baseline": "7.8.1",
"port-version": 0
"port-version": 1
},
"opencc": {
"baseline": "1.1.6",

5
versions/f-/fontconfig.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2a11e54fe49673d52f0c4d2df73870f36a228990",
"version": "2.15.0",
"port-version": 0
},
{
"git-tree": "9e6ee3f930f4426d8b2dd399318658614e296a85",
"version": "2.14.2",

5
versions/f-/freetype.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8a2c633dcc14eaabdb31cf4637242f4e3c2f3fa2",
"version": "2.13.3",
"port-version": 0
},
{
"git-tree": "60a5a2596ec865db746a7ea741458322cf0cc2bc",
"version": "2.13.2",

5
versions/f-/fribidi.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c5627e2719205c319648e2f4f58f7deb0e9eecb4",
"version": "1.0.15",
"port-version": 0
},
{
"git-tree": "a946b16fa88c02cd11e2e3011fe9ca61e31214b6",
"version": "1.0.13",

5
versions/f-/ftgl.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "6b9fee52a7db38c8ceab55d156abf5d6a90ff656",
"version": "2.4.0",
"port-version": 5
},
{
"git-tree": "42f6d4d37641856fc516bd9df7775c448434e94a",
"version-date": "2022-05-18",

5
versions/o-/opencascade.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9395dfd0da8336f969336e3b21d46088867ab1d0",
"version": "7.8.1",
"port-version": 1
},
{
"git-tree": "3788e11facf70c485e7f3efa240a082c99b3c1b1",
"version": "7.8.1",