[vlc-commits] [Git][videolan/vlc][master] 4 commits: contrib: ass: update to 0.17.4
Steve Lhomme (@robUx4)
gitlab at videolan.org
Fri Sep 26 13:23:58 UTC 2025
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
80dc6ef1 by Steve Lhomme at 2025-09-26T12:45:10+00:00
contrib: ass: update to 0.17.4
- - - - -
a9920866 by Steve Lhomme at 2025-09-26T12:45:10+00:00
contrib: ass: enable assembler on platforms allowed via meson
x86, x86_64 and arm64.
- - - - -
3a3cd6f0 by Steve Lhomme at 2025-09-26T12:45:10+00:00
contrib: ass: build with meson
- - - - -
9230f8b6 by Steve Lhomme at 2025-09-26T12:45:10+00:00
contrib: ass: enable assembler on x86 Android
There is no restriction anymore.
Partial revert of dd225aba266ce126f82d3979dc87b77d59cac564.
- - - - -
3 changed files:
- − contrib/src/ass/0001-aarch64-Set-the-right-intended-alignment-for-constan.patch
- contrib/src/ass/SHA512SUMS
- contrib/src/ass/rules.mak
Changes:
=====================================
contrib/src/ass/0001-aarch64-Set-the-right-intended-alignment-for-constan.patch deleted
=====================================
@@ -1,70 +0,0 @@
-From 159cefc9074a9b816d62c6b4251521ab515ecaca Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
-Date: Tue, 12 Nov 2024 10:08:13 +0200
-Subject: [PATCH] aarch64: Set the right intended alignment for constants
-
-The align parameter to these macros is passed to the gas directive
-.align. This directive is architecture dependent; on some
-architectures, the given alignment is an alignment in bytes,
-while on others, its the power of two to align to. On aarch64,
-.align is for power of two alignment, see [1] for details; i.e.
-it behaves the same as .p2align.
-
-This means that when the macros are invoked with align=16, we
-actually requested 64 KB alignment, not 16 byte alignment. Fix
-this, setting the alignment to the intended 16 byte alignment.
-
-This fixes building for aarch64-windows targets with assert enabled
-versions of Clang; such versions of Clang error out with
-"unsupported section alignment" on this case, while regular release
-versions of Clang silently let this issue pass.
-
-[1] https://sourceware.org/binutils/docs/as/Align.html
----
- libass/aarch64/blend_bitmaps.S | 2 +-
- libass/aarch64/blur.S | 2 +-
- libass/aarch64/rasterizer.S | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libass/aarch64/blend_bitmaps.S b/libass/aarch64/blend_bitmaps.S
-index 2e8f053..a58c09b 100644
---- a/libass/aarch64/blend_bitmaps.S
-+++ b/libass/aarch64/blend_bitmaps.S
-@@ -18,7 +18,7 @@
-
- #include "asm.S"
-
--const edge_mask, align=16
-+const edge_mask, align=4
- .dcb.b 16, 0xFF
- .dcb.b 16, 0x00
- endconst
-diff --git a/libass/aarch64/blur.S b/libass/aarch64/blur.S
-index de8b508..292ee84 100644
---- a/libass/aarch64/blur.S
-+++ b/libass/aarch64/blur.S
-@@ -18,7 +18,7 @@
-
- #include "asm.S"
-
--const words_zero, align=16
-+const words_zero, align=4
- .dc.w 0, 0, 0, 0, 0, 0, 0, 0
- endconst
-
-diff --git a/libass/aarch64/rasterizer.S b/libass/aarch64/rasterizer.S
-index 5fde704..514fba2 100644
---- a/libass/aarch64/rasterizer.S
-+++ b/libass/aarch64/rasterizer.S
-@@ -28,7 +28,7 @@
- #endif
-
-
--const words_index, align=16
-+const words_index, align=4
- .dc.w 0, 1, 2, 3, 4, 5, 6, 7
- endconst
-
---
-2.34.1
-
=====================================
contrib/src/ass/SHA512SUMS
=====================================
@@ -1 +1 @@
-b8f7868f99fbc9128144d0cdad3de8ca83eefc6c186e2c295afa98e36bd88d4533969618030ff33ab809850ce1c584f967104b5725b41b1db5cef05434258d5d libass-0.17.3.tar.gz
+d368144c19384957e77174748d7cc5d08a978a87daa3b4e944fc50614c6583bb585c90365d0593ed40cfc486e07cdc4cefed5aeabea9883b084879207c16043a libass-0.17.4.tar.gz
=====================================
contrib/src/ass/rules.mak
=====================================
@@ -1,5 +1,5 @@
# ASS
-ASS_VERSION := 0.17.3
+ASS_VERSION := 0.17.4
ASS_URL := $(GITHUB)/libass/libass/releases/download/$(ASS_VERSION)/libass-$(ASS_VERSION).tar.gz
PKGS += ass
@@ -7,11 +7,12 @@ ifeq ($(call need_pkg,"libass"),)
PKGS_FOUND += ass
endif
+ifneq ($(filter aarch64 i386 x86_64, $(ARCH)),)
+WITH_ASS_ASM = 1
+endif
+
ifdef HAVE_ANDROID
WITH_FONTCONFIG = 0
-ifeq ($(ANDROID_ABI), x86)
-WITH_ASS_ASM = 0
-endif
else
ifdef HAVE_DARWIN_OS
WITH_FONTCONFIG = 0
@@ -36,31 +37,28 @@ $(TARBALLS)/libass-$(ASS_VERSION).tar.gz:
libass: libass-$(ASS_VERSION).tar.gz .sum-ass
$(UNPACK)
- $(APPLY) $(SRC)/ass/0001-aarch64-Set-the-right-intended-alignment-for-constan.patch
- $(call update_autoconfig,.)
- $(call pkg_static,"libass.pc.in")
$(MOVE)
DEPS_ass = freetype2 $(DEPS_freetype2) fribidi $(DEPS_fribidi) iconv $(DEPS_iconv) harfbuzz $(DEPS_harfbuzz)
-ASS_CONF = --disable-test
+ASS_CONF = -Dauto_features=disabled
ifneq ($(WITH_FONTCONFIG), 0)
DEPS_ass += fontconfig $(DEPS_fontconfig)
+ASS_CONF += -Dfontconfig=enabled
else
-ASS_CONF += --disable-fontconfig --disable-require-system-font-provider
+ASS_CONF += -Drequire-system-font-provider=false
endif
ifeq ($(WITH_DWRITE), 1)
-ASS_CONF += --enable-directwrite
+ASS_CONF += -Ddirectwrite=enabled
endif
-ifeq ($(WITH_ASS_ASM), 0)
-ASS_CONF += --disable-asm
+ifeq ($(WITH_ASS_ASM), 1)
+ASS_CONF += -Dasm=enabled
endif
-.ass: libass
- $(MAKEBUILDDIR)
- $(MAKECONFIGURE) $(ASS_CONF)
- +$(MAKEBUILD)
- +$(MAKEBUILD) install
+.ass: libass crossfile.meson
+ $(MESONCLEAN)
+ $(MESON) $(ASS_CONF)
+ +$(MESONBUILD)
touch $@
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/66c3788d2aed5f4c2cb5fdc295a02f6330c7f59b...9230f8b65a4d8c53855e42aa2a80bee24e767d7e
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/66c3788d2aed5f4c2cb5fdc295a02f6330c7f59b...9230f8b65a4d8c53855e42aa2a80bee24e767d7e
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list