[vlc-commits] [Git][videolan/vlc][master] contribs: update libass to 0.17.1

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
00e4996d by Francois Cartegnie at 2023-05-17T07:29:31+00:00
contribs: update libass to 0.17.1

refs #27771

- - - - -


2 changed files:

- contrib/src/ass/SHA512SUMS
- contrib/src/ass/rules.mak


Changes:

=====================================
contrib/src/ass/SHA512SUMS
=====================================
@@ -1 +1 @@
-1d2fd02fb2669de7f38ecfa0fe79e3c89da93e09c3cf6bf7b7b811a4808a06fd702da27ba1d9223c9a8a943198e7961b06c808a07e17d6cc6ba2ce70fd802300  libass-0.16.0.tar.gz
+29c3f82e8d68ffc403941805202c4756b65cf48aeadbe9ae5e307ee4f52a5e4d916330ad26ec322aa92ddc72a4f01633033f9f628dbb8d8653a74b3e6eb7f735  libass-0.17.1.tar.gz


=====================================
contrib/src/ass/rules.mak
=====================================
@@ -1,5 +1,5 @@
 # ASS
-ASS_VERSION := 0.16.0
+ASS_VERSION := 0.17.1
 ASS_URL := $(GITHUB)/libass/libass/releases/download/$(ASS_VERSION)/libass-$(ASS_VERSION).tar.gz
 
 PKGS += ass
@@ -9,26 +9,21 @@ endif
 
 ifdef HAVE_ANDROID
 WITH_FONTCONFIG = 0
-WITH_HARFBUZZ = 1
 ifeq ($(ANDROID_ABI), x86)
 WITH_ASS_ASM = 0
 endif
 else
 ifdef HAVE_DARWIN_OS
 WITH_FONTCONFIG = 0
-WITH_HARFBUZZ = 1
 else
 ifdef HAVE_WIN32
 WITH_FONTCONFIG = 0
-WITH_HARFBUZZ = 1
 WITH_DWRITE = 1
 else
 ifdef HAVE_EMSCRIPTEN
 WITH_FONTCONFIG = 0
-WITH_HARFBUZZ = 1
 else
 WITH_FONTCONFIG = 1
-WITH_HARFBUZZ = 1
 endif
 endif
 endif
@@ -44,7 +39,7 @@ libass: libass-$(ASS_VERSION).tar.gz .sum-ass
 	$(call pkg_static,"libass.pc.in")
 	$(MOVE)
 
-DEPS_ass = freetype2 $(DEPS_freetype2) fribidi $(DEPS_fribidi) iconv $(DEPS_iconv)
+DEPS_ass = freetype2 $(DEPS_freetype2) fribidi $(DEPS_fribidi) iconv $(DEPS_iconv) harfbuzz $(DEPS_harfbuzz)
 
 ASS_CONF = --disable-test
 ifneq ($(WITH_FONTCONFIG), 0)
@@ -57,12 +52,6 @@ ifeq ($(WITH_DWRITE), 1)
 ASS_CONF += --enable-directwrite
 endif
 
-ifneq ($(WITH_HARFBUZZ), 0)
-DEPS_ass += harfbuzz $(DEPS_harfbuzz)
-else
-ASS_CONF += --disable-harfbuzz
-endif
-
 ifeq ($(WITH_ASS_ASM), 0)
 ASS_CONF += --disable-asm
 endif



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/00e4996d1e0707a3a451a2faeb7b868328e03a2d

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/00e4996d1e0707a3a451a2faeb7b868328e03a2d
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance