diff options
| author | Matthias C. M. Troffaes <matthias.troffaes@gmail.com> | 2021-06-18 18:56:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-18 10:56:56 -0700 |
| commit | 926daf3fc2e826827a72318052a6b5e5af9e2f24 (patch) | |
| tree | 1487cde61cf8e8b6bfa3c498a17d83b0c4776ef0 | |
| parent | 48b93ecb2c9afdec5ff2dc7f788458d58b9b7179 (diff) | |
| download | vcpkg-926daf3fc2e826827a72318052a6b5e5af9e2f24.tar.gz vcpkg-926daf3fc2e826827a72318052a6b5e5af9e2f24.zip | |
[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
| -rw-r--r-- | ports/libass/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | ports/libass/vcpkg.json | 1 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/l-/libass.json | 5 |
4 files changed, 14 insertions, 4 deletions
diff --git a/ports/libass/CMakeLists.txt b/ports/libass/CMakeLists.txt index 64e7f9303..eaaa80b13 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)
+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 index f22b91fdb..9abf0a1f1 100644 --- 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 index 00baf351c..110f9a443 100644 --- 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 index aa614c506..389e1aa44 100644 --- a/versions/l-/libass.json +++ b/versions/l-/libass.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "7c9d2203cb8e0f912847cdd70a9ba1142b1ab32f", + "version": "0.15.1", + "port-version": 1 + }, + { "git-tree": "2512ee72e51fb02185743218ae2cd52f56ca232f", "version": "0.15.1", "port-version": 0 |