[libass] Update to 0.15.0 (#15213)

* [libass] Update to 0.15.0

* [libass] Add vcpkg_fixup_pkgconfig()

* [libass] Add to versions file

7 files changed, 25 insertions, 40 deletions

diff --git a/ports/libass/CMakeLists.txt b/ports/libass/CMakeLists.txt
index b91a6aab2..f26c2de70 100644
--- a/ports/libass/CMakeLists.txt
+++ b/ports/libass/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.9)

 project(libass C CXX)

 

-set(LIBASS_VERSION 0.14.0)

+set(LIBASS_VERSION 0.15.0)

 

 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h)

 

@@ -77,7 +77,7 @@ 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 >= 0.9.5, fribidi >= 0.19.0, freetype2 >= 9.10.3")

+set(PKG_REQUIRES_PRIVATE "harfbuzz >= 1.2.3, fribidi >= 0.19.0, freetype2 >= 9.10.3")

 set(PKG_LIBS_PRIVATE -lm)

 configure_file(libass.pc.in libass.pc @ONLY)

 install(FILES

diff --git a/ports/libass/ConstantValues.patch b/ports/libass/ConstantValues.patch
deleted file mode 100644
index e666b8466..000000000
--- a/ports/libass/ConstantValues.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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/libass.def b/ports/libass/libass.def
index 58bfad3d6..7edbbdf63 100644
--- a/ports/libass/libass.def
+++ b/ports/libass/libass.def
@@ -1,24 +1,34 @@
 EXPORTS

+ass_library_version

 ass_library_init

 ass_library_done

-ass_library_version

 ass_set_fonts_dir

 ass_set_extract_fonts

 ass_set_style_overrides

+ass_process_force_style

+ass_set_message_cb

 ass_renderer_init

 ass_renderer_done

 ass_set_frame_size

 ass_set_storage_size

+ass_set_shaper

 ass_set_margins

 ass_set_use_margins

+ass_set_pixel_aspect

 ass_set_aspect_ratio

 ass_set_font_scale

 ass_set_hinting

 ass_set_line_spacing

+ass_set_line_position

 ass_get_available_font_providers

 ass_set_fonts

+ass_set_selective_style_override_enabled

+ass_set_selective_style_override

+ass_fonts_update

+ass_set_cache_limits

 ass_render_frame

 ass_new_track

+ass_track_set_feature

 ass_free_track

 ass_alloc_style

 ass_alloc_event

@@ -27,20 +37,11 @@ ass_free_event
 ass_process_data

 ass_process_codec_private

 ass_process_chunk

+ass_set_check_readorder

+ass_flush_events

 ass_read_file

 ass_read_memory

 ass_read_styles

 ass_add_font

 ass_clear_fonts

 ass_step_sub

-ass_process_force_style

-ass_set_message_cb

-ass_fonts_update

-ass_set_cache_limits

-ass_flush_events

-ass_set_shaper

-ass_set_line_position

-ass_set_pixel_aspect

-ass_set_selective_style_override_enabled

-ass_set_selective_style_override

-ass_set_check_readorder

diff --git a/ports/libass/portfile.cmake b/ports/libass/portfile.cmake
index 63562f06f..eac81b339 100644
--- a/ports/libass/portfile.cmake
+++ b/ports/libass/portfile.cmake
@@ -1,10 +1,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libass/libass
-    REF d149636f502f5774ae1a8fb4c554b122674393b2   #v 0.15.0
-    SHA512 d8b3b23e3cfa42b6f65a59a389a54a18a8470f015ca828e2a08afd9633510ebf58c74e630b086cd611629f79e68f23be47dd2f798e223330216e6b1f487afd7a
+    REF 0.15.0
+    SHA512 a832da5246577cf815481bb9e4bebabc74bc1d0f5c50faa098f4150a379d801d7e6d1bd7f9f578143a9412e258c5296d08c4fc2d04cc33f1751e613c2583214c
     HEAD_REF master
-    PATCHES ConstantValues.patch
 )
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h.in DESTINATION ${SOURCE_PATH})
@@ -22,6 +21,7 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
+vcpkg_fixup_pkgconfig()
 
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/libass/vcpkg.json b/ports/libass/vcpkg.json
index 2eab327b8..b16ff6769 100644
--- a/ports/libass/vcpkg.json
+++ b/ports/libass/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libass",
   "version-string": "0.15.0",
+  "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 988fd085c..b195a3a79 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2838,7 +2838,7 @@
     },
     "libass": {
       "baseline": "0.15.0",
-      "port-version": 0
+      "port-version": 1
     },
     "libassuan": {
       "baseline": "2.5.3",
diff --git a/versions/l-/libass.json b/versions/l-/libass.json
index 0956685f4..78937e0da 100644
--- a/versions/l-/libass.json
+++ b/versions/l-/libass.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "ba6a3b98d6557361a7c46c0d8543e8d928a3825f",
+      "version-string": "0.15.0",
+      "port-version": 1
+    },
+    {
       "git-tree": "09bc1e4af0701ac49dfb52104d0e940a5810e03d",
       "version-string": "0.15.0",
       "port-version": 0