aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>2020-12-24 06:09:00 +0800
committerGitHub <noreply@github.com>2020-12-23 14:09:00 -0800
commitcc4475d492bd1147f18e19f2c80b083a56391e18 (patch)
tree501bf9c82f2917bec9ceee555537492e99dbe3fa
parentc54abfafbe0051075952c507da1f1ec234875e05 (diff)
downloadvcpkg-cc4475d492bd1147f18e19f2c80b083a56391e18.tar.gz
vcpkg-cc4475d492bd1147f18e19f2c80b083a56391e18.zip
[libass] update to 0.15.0 (#15263)
-rw-r--r--ports/libass/ConstantValues.patch65
-rw-r--r--ports/libass/portfile.cmake4
-rw-r--r--ports/libass/vcpkg.json3
3 files changed, 25 insertions, 47 deletions
diff --git a/ports/libass/ConstantValues.patch b/ports/libass/ConstantValues.patch
index d357032d7..e666b8466 100644
--- a/ports/libass/ConstantValues.patch
+++ b/ports/libass/ConstantValues.patch
@@ -1,43 +1,22 @@
----
- libass/ass_outline.c | 4 ++--
- libass/ass_render.c | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libass/ass_outline.c b/libass/ass_outline.c
-index 1b9afe9..527403e 100644
---- a/libass/ass_outline.c
-+++ b/libass/ass_outline.c
-@@ -518,7 +518,7 @@ static bool draw_arc(StrokerState *str, ASS_Vector pt,
- ASS_DVector normal0, ASS_DVector normal1, double c, int dir)
- {
- const int max_subdiv = 15;
-- double mul[max_subdiv + 1];
-+ double mul[16];
-
- ASS_DVector center;
- bool small_angle = true;
-@@ -554,7 +554,7 @@ static bool draw_arc(StrokerState *str, ASS_Vector pt,
- static bool draw_circle(StrokerState *str, ASS_Vector pt, int dir)
- {
- const int max_subdiv = 15;
-- double mul[max_subdiv + 1], c = 0;
-+ double mul[16], c = 0;
-
- int pos = max_subdiv;
- while (c < str->split_cos && pos) {
-diff --git a/libass/ass_render.c b/libass/ass_render.c
-index 69c4439..f6fa85c 100644
---- a/libass/ass_render.c
-+++ b/libass/ass_render.c
-@@ -1235,7 +1235,7 @@ get_bitmap_glyph(ASS_Renderer *render_priv, GlyphInfo *info)
- }
-
- const int n_outlines = 3;
-- ASS_Outline outline[n_outlines];
-+ ASS_Outline outline[3];
- outline_copy(&outline[0], info->outline);
- outline_copy(&outline[1], info->border[0]);
- outline_copy(&outline[2], info->border[1]);
---
-2.18.0.windows.1
-
+diff --git a/libass/ass_outline.c b/libass/ass_outline.c
+index ae5c06a..2173508 100644
+--- a/libass/ass_outline.c
++++ b/libass/ass_outline.c
+@@ -613,7 +613,7 @@ static bool draw_arc(StrokerState *str, ASS_Vector pt,
+ ASS_DVector normal0, ASS_DVector normal1, double c, int dir)
+ {
+ enum { max_subdiv = 15 };
+- double mul[max_subdiv + 1];
++ double mul[16];
+
+ ASS_DVector center;
+ bool small_angle = true;
+@@ -649,7 +649,7 @@ static bool draw_arc(StrokerState *str, ASS_Vector pt,
+ static bool draw_circle(StrokerState *str, ASS_Vector pt, int dir)
+ {
+ enum { max_subdiv = 15 };
+- double mul[max_subdiv + 1], c = 0;
++ double mul[16], c = 0;
+
+ int pos = max_subdiv;
+ while (c < str->split_cos && pos) {
diff --git a/ports/libass/portfile.cmake b/ports/libass/portfile.cmake
index f5ab6606c..63562f06f 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 98727c3b78f44cb3bbc955fcf5d977ebd911d5ca
- SHA512 d466108180cea598b817f89aa21a1021ed2a763580d9aad51b054aa120186af48ab4264907e49ddcb38479a28d87d5431751a28afee9cb83ad7623f002d99c57
+ REF d149636f502f5774ae1a8fb4c554b122674393b2 #v 0.15.0
+ SHA512 d8b3b23e3cfa42b6f65a59a389a54a18a8470f015ca828e2a08afd9633510ebf58c74e630b086cd611629f79e68f23be47dd2f798e223330216e6b1f487afd7a
HEAD_REF master
PATCHES ConstantValues.patch
)
diff --git a/ports/libass/vcpkg.json b/ports/libass/vcpkg.json
index f3532dcfc..2eab327b8 100644
--- a/ports/libass/vcpkg.json
+++ b/ports/libass/vcpkg.json
@@ -1,7 +1,6 @@
{
"name": "libass",
- "version-string": "0.14.0",
- "port-version": 4,
+ "version-string": "0.15.0",
"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": [