diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2020-12-01 01:48:57 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-30 09:48:57 -0800 |
| commit | 666589a27d486240f72527754e133e0e2989e31d (patch) | |
| tree | 032df5da3fa211918de9354892fc868a5bd9e58a | |
| parent | 9d72e33d518772c464f7d30b989071907a6acbd7 (diff) | |
| download | vcpkg-666589a27d486240f72527754e133e0e2989e31d.tar.gz vcpkg-666589a27d486240f72527754e133e0e2989e31d.zip | |
[vcpkg baseline] [libass] Fix dependency issue in Linux (#14843)
* [libass] Fix dependency issue
* format vcpkg.json
| -rw-r--r-- | ports/libass/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | ports/libass/vcpkg.json | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/ports/libass/CMakeLists.txt b/ports/libass/CMakeLists.txt index aacf89d86..b91a6aab2 100644 --- a/ports/libass/CMakeLists.txt +++ b/ports/libass/CMakeLists.txt @@ -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)
if(WIN32)
list(FILTER SOURCES EXCLUDE REGEX ".*ass_coretext.c$")
list(FILTER SOURCES EXCLUDE REGEX ".*ass_fontconfig.c$")
@@ -30,6 +30,9 @@ elseif(APPLE) else()
list(FILTER SOURCES EXCLUDE REGEX ".*ass_coretext.c$")
list(FILTER SOURCES EXCLUDE REGEX ".*ass_directwrite.c$")
+
+ find_package(Fontconfig REQUIRED)
+ set(FONTCONFIG_LIBRARAY Fontconfig::Fontconfig)
endif()
find_package(Freetype REQUIRED)
@@ -60,7 +63,8 @@ endif() target_link_libraries(ass PRIVATE
Freetype::Freetype
${FRIBIDI_LIBRARY}
- ${HARFBUZZ_LIBRARY})
+ ${HARFBUZZ_LIBRARY}
+ ${FONTCONFIG_LIBRARY})
install(TARGETS ass
RUNTIME DESTINATION bin
diff --git a/ports/libass/vcpkg.json b/ports/libass/vcpkg.json index 151d87cdd..f3532dcfc 100644 --- a/ports/libass/vcpkg.json +++ b/ports/libass/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libass", "version-string": "0.14.0", - "port-version": 3, + "port-version": 4, "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": [ @@ -9,6 +9,10 @@ "name": "dirent", "platform": "windows" }, + { + "name": "fontconfig", + "platform": "linux" + }, "freetype", "fribidi", "harfbuzz" |