Merge commit 'e46aedea0a0d17da4c4ef49d84b94a7994664ab5'

Author: Sibras

.gitignore

@@ -38,7 +38,6 @@ Makefile.in
 /libtool
 /ltmain.sh
 /missing
-/m4
 /test-driver
 
 # Meson

Changelog

@@ -1,3 +1,14 @@
+libass (0.17.3)
+ * Fix 0.17.2 regression in the fontconfig fontprovider
+   leading to undesirable widths being chosen from large typographic families
+ * Fix configure generated with slibtool-provided autoconf macros
+ * Fix "make check" for shared-only builds
+ * Constify some API parameters in a backwards-compatible manner
+ * Add new ass_malloc and ass_free API functions
+ * Tweak default optimization flags
+ * Speed up parsing of events with very long override blocks
+ * Improve handling of HarfBuzz-related failures
+
 libass (0.17.2)
  * Fix rendering of \h in certain cases
  * Fix a minor memory leak in the CoreText and DirectWrite font provider

Makefile.am

@@ -1,9 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4
 AM_CPPFLAGS = -I$(top_srcdir)/libass
-AM_CFLAGS = -std=gnu99 -Wall -Wextra -Wno-sign-compare -Wno-unused-parameter \
-            -Werror-implicit-function-declaration -Wstrict-prototypes        \
-            -Wpointer-arith -Wredundant-decls -Wno-missing-field-initializers\
-            -D_GNU_SOURCE
+AM_CFLAGS = -std=gnu99 -D_GNU_SOURCE
 
 EXTRA_DIST = libass.pc.in Changelog MAINTAINERS RELEASEVERSION ltnasm.sh
 
@@ -20,6 +17,7 @@ nasm_verbose_ = $(nasm_verbose_$(AM_DEFAULT_VERBOSITY))
 nasm_verbose_0 = @echo "  NASM    " $@;
 
 lib_LTLIBRARIES =
+noinst_LTLIBRARIES =
 noinst_PROGRAMS =
 check_PROGRAMS =
 TESTS =

Makefile_util.am

@@ -54,10 +54,11 @@ checkasm_checkasm_SOURCES = \
     checkasm/blend_bitmaps.c \
     checkasm/be_blur.c \
     checkasm/blur.c \
-    checkasm/checkasm.h checkasm/checkasm.c
+    checkasm/checkasm.h checkasm/checkasm.c \
+    libass/ass_rasterizer.h libass/ass_utils.h
 
 checkasm_checkasm_CPPFLAGS = -I$(top_srcdir)/libass
-checkasm_checkasm_LDADD = libass/libass.la
+checkasm_checkasm_LDADD = libass/libass_internal.la
 checkasm_checkasm_LDFLAGS = $(AM_LDFLAGS) -static
 
 if X86

README.md

@@ -8,7 +8,7 @@ libass is a portable subtitle renderer for the ASS/SSA (Advanced Substation Alph
 
 Get it
 ======
-See [GitHub releases](https://github.com/libass/libass/releases) for the latest release 0.17.2 (released 2024-05-19).
+See [GitHub releases](https://github.com/libass/libass/releases) for the latest release 0.17.3 (released 2024-07-02).
 See the [changelog](https://github.com/libass/libass/blob/master/Changelog) for a detailed list of changes.
 
 Source code is available from our [GitHub repository](https://github.com/libass/libass).
@@ -34,28 +34,6 @@ Windows. It is suited for static-only builds on any platform well supported by
 Meson and as a Meson subproject.
 Notably, Meson supports MSVC and generation of VS project files.
 
-Related Links
-=============
-The following projects/companies use libass:
-
-- [MPlayer](http://www.mplayerhq.hu/)
-- [mplayer2](http://www.mplayer2.org/)
-- [mpv](http://mpv.io/)
-- [VLC](http://www.videolan.org/)
-- [GStreamer](http://gstreamer.freedesktop.org/) (assrender plugin)
-- [FFmpeg](http://ffmpeg.org/)
-  - [Libav](http://libav.org/) (unmaintained)
-- [Aegisub](http://www.aegisub.org/)
-- [Kodi (XBMC)](http://kodi.tv/)
-- [avidemux](http://fixounet.free.fr/avidemux/)
-- [PunkGraphicsStream (BD subtitle encoder)](http://code.google.com/p/punkgraphicstream/)
-- [HandBrake](http://handbrake.fr/)
-- [MX Player](https://play.google.com/store/apps/details?id=com.mxtech.videoplayer.ad)
-- [QMPlay2](http://zaps166.sourceforge.net/?app=QMPlay2)
-- [SubtitlesOctopus](https://github.com/libass/JavascriptSubtitlesOctopus) (JavaScript ASS via wasm libass)
-  - [Crunchyroll](http://www.crunchyroll.com/) uses SubtitlesOctopus
-- [AssRender for Avisynth(+)](http://avisynth.nl/index.php/AssRender)
-
 Information about the ASS format:
 =================================
 - [ASS format overview](https://github.com/libass/libass/wiki/ASS-File-Format-Guide)
@@ -68,8 +46,9 @@ Other ASS/SSA implementations:
   - [xy-VSFilter/XySubFilter](https://github.com/Cyberbeing/xy-VSFilter/)
     - [pfmod](https://github.com/pinterf/xy-VSFilter/)
   - VSFilter in [MPC-HC](https://github.com/clsid2/mpc-hc/tree/develop/src/filters/transform/VSFilter/)
-  - [VSFilterMod](https://code.google.com/archive/p/vsfiltermod/) (with custom format extensions)
-    - [sorayuki fork](https://github.com/sorayuki/VSFilterMod/) with some bugfixes
+  - [VSFilterMod](https://code.google.com/archive/p/vsfiltermod/) with custom format extensions (defunct, subsumed by forks)
+    - [sorayuki fork](https://github.com/sorayuki/VSFilterMod/) with some bugfixes (defunct)
+    - various forks focussing on internal use
   - [Threaded VSFilter](https://code.google.com/p/threaded-vsfilter/) (defunct)
   - VSFilter in [Guliverkli2](http://sourceforge.net/projects/guliverkli2/) (defunct, subsumed by all of the above)
   - VSFilter in [guliverkli](http://sourceforge.net/projects/guliverkli/) (defunct, forked as Guliverkli2)

RELEASEVERSION

@@ -1 +1 @@
-0.17.2
+0.17.3

checkasm/be_blur.c

@@ -18,6 +18,8 @@
 
 #include "checkasm.h"
 
+#include <string.h>
+
 #define HEIGHT 8
 #define STRIDE 64
 #define MIN_WIDTH 2

checkasm/blend_bitmaps.c

@@ -18,6 +18,8 @@
 
 #include "checkasm.h"
 
+#include <string.h>
+
 #define HEIGHT 8
 #define DST_STRIDE 64
 #define MIN_WIDTH  1

checkasm/blur.c

@@ -16,8 +16,11 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "ass_utils.h"
 #include "checkasm.h"
 
+#include <string.h>
+
 #define HEIGHT 13
 #define STRIDE 64
 #define MIN_WIDTH 1

checkasm/checkasm.c

@@ -25,6 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "ass_utils.h"
 #include "checkasm.h"
 
 #include <math.h>
@@ -736,7 +737,6 @@ int checkasm_bench_func(void) {
 
 /* Indicate that the current test has failed, return whether verbose printing
  * is requested. */
-ASM_CALLABLE
 int checkasm_fail_func(const char *const msg, ...) {
     if (state.current_func_ver && state.current_func_ver->cpu &&
         state.current_func_ver->ok)