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

* [libass] fix fontconfig dependency in .pc file on x64-linux * [libass] bump port version * [libass] x-add-version
microsoft · Jun 18, 2021 · 926daf3 · 926daf3
1 parent 48b93ec
commit 926daf3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git 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)
+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})
-set(PKG_REQUIRES_PRIVATE "harfbuzz >= 1.2.3, fribidi >= 0.19.0, freetype2 >= 9.10.3")
+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

diff --git a/ports/libass/vcpkg.json b/ports/libass/vcpkg.json
@@ -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": [

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -3010,7 +3010,7 @@
     },
     "libass": {
       "baseline": "0.15.1",
-      "port-version": 0
+      "port-version": 1
     },
     "libassuan": {
       "baseline": "2.5.3",

diff --git a/versions/l-/libass.json b/versions/l-/libass.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7c9d2203cb8e0f912847cdd70a9ba1142b1ab32f",
+      "version": "0.15.1",
+      "port-version": 1
+    },
     {
       "git-tree": "2512ee72e51fb02185743218ae2cd52f56ca232f",
       "version": "0.15.1",