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

[libass] fix fontconfig dependency in .pc file (#18516)

Browse Source 
* [libass] fix fontconfig dependency in .pc file on x64-linux

* [libass] bump port version

* [libass] x-add-version
This commit is contained in:
Matthias C. M. Troffaes 2021-06-18 18:56:56 +01:00 committed by GitHub
parent 48b93ecb2c
commit 926daf3fc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ports/libass/CMakeLists.txt
View File

@ -20,7 +20,7 @@ add_compile_definitions(CONFIG_FRIBIDI)
add_compile_definitions(CONFIG_HARFBUZZ)
file (GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/libass/*.c)
set(FONTCONFIG_LIBRARAY)
set(FONTCONFIG_LIBRARY)
if(WIN32)
list(FILTER SOURCES EXCLUDE REGEX ".*ass_coretext.c$")
list(FILTER SOURCES EXCLUDE REGEX ".*ass_fontconfig.c$")
@ -32,7 +32,7 @@ else()
list(FILTER SOURCES EXCLUDE REGEX ".*ass_directwrite.c$")
find_package(Fontconfig REQUIRED)
set(FONTCONFIG_LIBRARAY Fontconfig::Fontconfig)
set(FONTCONFIG_LIBRARY Fontconfig::Fontconfig)
endif()
find_package(Freetype REQUIRED)
@ -77,7 +77,11 @@ set(exec_prefix ${CMAKE_INSTALL_PREFIX})
set(libdir ${CMAKE_INSTALL_PREFIX}/lib)
set(includedir ${CMAKE_INSTALL_PREFIX}/include)
set(PACKAGE_VERSION ${LIBASS_VERSION})
if(WIN32 OR APPLE)
set(PKG_REQUIRES_PRIVATE "harfbuzz >= 1.2.3, fribidi >= 0.19.0, freetype2 >= 9.10.3")
else()
set(PKG_REQUIRES_PRIVATE "fontconfig >= 2.10.92, harfbuzz >= 1.2.3, fribidi >= 0.19.0, freetype2 >= 9.10.3")
endif()
set(PKG_LIBS_PRIVATE -lm)
configure_file(libass.pc.in libass.pc @ONLY)
install(FILES

1
ports/libass/vcpkg.json
View File

@ -1,6 +1,7 @@
{
"name": "libass",
"version": "0.15.1",
"port-version": 1,
"description": "libass is a portable subtitle renderer for the ASS/SSA (Advanced Substation Alpha/Substation Alpha) subtitle format",
"homepage": "https://github.com/libass/libass",
"dependencies": [

2
versions/baseline.json
View File

@ -3010,7 +3010,7 @@
},
"libass": {
"baseline": "0.15.1",
"port-version": 0
"port-version": 1
},
"libassuan": {
"baseline": "2.5.3",

5
versions/l-/libass.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7c9d2203cb8e0f912847cdd70a9ba1142b1ab32f",
"version": "0.15.1",
"port-version": 1
},
{
"git-tree": "2512ee72e51fb02185743218ae2cd52f56ca232f",
"version": "0.15.1",