aboutsummaryrefslogtreecommitdiff
path: root/package/libass
diff options
context:
space:
mode:
Diffstat (limited to 'package/libass')
-rw-r--r--package/libass/Config.in9
-rw-r--r--package/libass/libass.hash4
-rw-r--r--package/libass/libass.mk11
3 files changed, 14 insertions, 10 deletions
diff --git a/package/libass/Config.in b/package/libass/Config.in
index c654d8212a..803f6b4438 100644
--- a/package/libass/Config.in
+++ b/package/libass/Config.in
@@ -1,9 +1,18 @@
config BR2_PACKAGE_LIBASS
bool "libass"
+ depends on BR2_INSTALL_LIBSTDCPP # harfbuzz
+ depends on BR2_TOOLCHAIN_HAS_SYNC_4 # harfbuzz
+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # harfbuzz
select BR2_PACKAGE_FREETYPE
+ select BR2_PACKAGE_HARFBUZZ
select BR2_PACKAGE_LIBFRIBIDI
help
libass is a portable subtitle renderer for the ASS/SSA
(Advanced Substation Alpha/Substation Alpha) subtitle format
https://github.com/libass/libass
+
+comment "libass needs a toolchain w/ C++, gcc >= 4.8"
+ depends on BR2_TOOLCHAIN_HAS_SYNC_4
+ depends on !BR2_INSTALL_LIBSTDCPP || \
+ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
diff --git a/package/libass/libass.hash b/package/libass/libass.hash
index 74ea5f921d..cd3c3af61c 100644
--- a/package/libass/libass.hash
+++ b/package/libass/libass.hash
@@ -1,3 +1,3 @@
# Locally computed
-sha256 881f2382af48aead75b7a0e02e65d88c5ebd369fe46bc77d9270a94aa8fd38a2 libass-0.14.0.tar.xz
-sha256 f7e30699d02798351e7f839e3d3bfeb29ce65e44efa7735c225464c4fd7dfe9c COPYING
+sha256 9f09230c9a0aa68ef7aa6a9e2ab709ca957020f842e52c5b2e52b801a7d9e833 libass-0.15.0.tar.xz
+sha256 f7e30699d02798351e7f839e3d3bfeb29ce65e44efa7735c225464c4fd7dfe9c COPYING
diff --git a/package/libass/libass.mk b/package/libass/libass.mk
index 50600963ed..8bdfd9dd40 100644
--- a/package/libass/libass.mk
+++ b/package/libass/libass.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBASS_VERSION = 0.14.0
+LIBASS_VERSION = 0.15.0
LIBASS_SOURCE = libass-$(LIBASS_VERSION).tar.xz
# Do not use the github helper here, the generated tarball is *NOT*
# the same as the one uploaded by upstream for the release.
@@ -12,9 +12,11 @@ LIBASS_SITE = https://github.com/libass/libass/releases/download/$(LIBASS_VERSIO
LIBASS_INSTALL_STAGING = YES
LIBASS_LICENSE = ISC
LIBASS_LICENSE_FILES = COPYING
+LIBASS_CPE_ID_VALID = YES
LIBASS_DEPENDENCIES = \
host-pkgconf \
freetype \
+ harfbuzz \
libfribidi \
$(if $(BR2_PACKAGE_LIBICONV),libiconv)
@@ -31,11 +33,4 @@ else
LIBASS_CONF_OPTS += --disable-fontconfig --disable-require-system-font-provider
endif
-ifeq ($(BR2_PACKAGE_HARFBUZZ),y)
-LIBASS_DEPENDENCIES += harfbuzz
-LIBASS_CONF_OPTS += --enable-harfbuzz
-else
-LIBASS_CONF_OPTS += --disable-harfbuzz
-endif
-
$(eval $(autotools-package))