aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author菜姬 <mydarer@gmail.com>2021-09-29 23:44:05 +0800
committerGitHub <noreply@github.com>2021-09-29 08:44:05 -0700
commit8cbe67980631029e79fd5ffaba0cb8adff240503 (patch)
treeb7b563e973bb234f80f15e548788509b8f7cd5ca
parentfcb97e3d9b3d6ce869f96e84461b6645f6dccd27 (diff)
downloadvcpkg-8cbe67980631029e79fd5ffaba0cb8adff240503.tar.gz
vcpkg-8cbe67980631029e79fd5ffaba0cb8adff240503.zip
[libass] update to 0.15.2 and fix .pc file (#20410)
* [libass] update to 0.15.2 and fix .pc file on windows * [libass] Add to versions file
-rw-r--r--ports/libass/CMakeLists.txt4
-rw-r--r--ports/libass/portfile.cmake4
-rw-r--r--ports/libass/vcpkg.json3
-rw-r--r--versions/baseline.json4
-rw-r--r--versions/l-/libass.json5
5 files changed, 13 insertions, 7 deletions
diff --git a/ports/libass/CMakeLists.txt b/ports/libass/CMakeLists.txt
index eaaa80b13..b2331d325 100644
--- a/ports/libass/CMakeLists.txt
+++ b/ports/libass/CMakeLists.txt
@@ -82,7 +82,9 @@ if(WIN32 OR APPLE)
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)
+if (NOT WIN32)
+ set(PKG_LIBS_PRIVATE -lm)
+endif()
configure_file(libass.pc.in libass.pc @ONLY)
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/libass.pc
diff --git a/ports/libass/portfile.cmake b/ports/libass/portfile.cmake
index 7207b9e05..e1a185a38 100644
--- a/ports/libass/portfile.cmake
+++ b/ports/libass/portfile.cmake
@@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libass/libass
- REF 0.15.1
- SHA512 eadda1dcdeb15be8cecbb14ad922eb3f366a780d82376d257c799424a0296b4d7539e86f12234e8c1480bdea423d9dbb78644b18970f65b8f5af5d0ef49c5fc9
+ REF 0.15.2
+ SHA512 ae3ea533e57ab3c386ce457dbaa39a256801b7340649d5ff80a51410481e73ab194724744b97d85cb6d111798e45eee594bb22da2f1f3c547fe8e331e0690127
HEAD_REF master
)
diff --git a/ports/libass/vcpkg.json b/ports/libass/vcpkg.json
index 9abf0a1f1..f4b282167 100644
--- a/ports/libass/vcpkg.json
+++ b/ports/libass/vcpkg.json
@@ -1,7 +1,6 @@
{
"name": "libass",
- "version": "0.15.1",
- "port-version": 1,
+ "version": "0.15.2",
"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 89e26944d..655a059db 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3221,8 +3221,8 @@
"port-version": 1
},
"libass": {
- "baseline": "0.15.1",
- "port-version": 1
+ "baseline": "0.15.2",
+ "port-version": 0
},
"libassuan": {
"baseline": "2.5.3",
diff --git a/versions/l-/libass.json b/versions/l-/libass.json
index 389e1aa44..ba8620656 100644
--- a/versions/l-/libass.json
+++ b/versions/l-/libass.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "358f5ebe2b07d2c3043f1397a7caa51fcf7ebdce",
+ "version": "0.15.2",
+ "port-version": 0
+ },
+ {
"git-tree": "7c9d2203cb8e0f912847cdd70a9ba1142b1ab32f",
"version": "0.15.1",
"port-version": 1