From 91ce87bd89940b8b83d1bd044288008182cf3a2e Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Fri, 28 Aug 2020 13:59:04 +0000
Subject: [PATCH] sd_ass: replace deprecated ASS_OVERRIDE_BIT_FONT_SIZE

This requires a slightly more recent libass than before
---
 sub/sd_ass.c | 6 ++----
 wscript      | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/sub/sd_ass.c b/sub/sd_ass.c
index eae1536df8..e5e12cbc04 100644
--- a/sub/sd_ass.c
+++ b/sub/sd_ass.c
@@ -418,13 +418,11 @@ static void configure_ass(struct sd *sd, struct mp_osd_res *dim,
     ass_set_shaper(priv, opts->ass_shaper);
     int set_force_flags = 0;
     if (total_override)
-        set_force_flags |= ASS_OVERRIDE_BIT_STYLE | ASS_OVERRIDE_BIT_FONT_SIZE;
+        set_force_flags |= ASS_OVERRIDE_BIT_STYLE | ASS_OVERRIDE_BIT_SELECTIVE_FONT_SCALE;
     if (opts->ass_style_override == 4) // 'scale'
-        set_force_flags |= ASS_OVERRIDE_BIT_FONT_SIZE;
-#if LIBASS_VERSION >= 0x01201001
+        set_force_flags |= ASS_OVERRIDE_BIT_SELECTIVE_FONT_SCALE;
     if (converted)
         set_force_flags |= ASS_OVERRIDE_BIT_ALIGNMENT;
-#endif
 #ifdef ASS_JUSTIFY_AUTO
     if ((converted || opts->ass_style_override) && opts->ass_justify)
         set_force_flags |= ASS_OVERRIDE_BIT_JUSTIFY;
diff --git a/wscript b/wscript
index 1c45e20a27..a54a1191dd 100644
--- a/wscript
+++ b/wscript
@@ -312,7 +312,7 @@ iconv support use --disable-iconv.",
     }, {
         'name': 'libass',
         'desc': 'SSA/ASS support',
-        'func': check_pkg_config('libass', '>= 0.12.1'),
+        'func': check_pkg_config('libass', '>= 0.12.2'),
         'req': True,
         'fmsg': "Unable to find development files for libass, or the version " +
                 "found is too old. Aborting."