From a653f80e7e184b4ba7169a36672ed0f94c5aabdc Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Thu, 9 Nov 2017 23:52:09 +1100
Subject: libass: update and use GH_CONF and BUILD_DIR
---
src/libass.mk | 25 ++++++-------------------
1 file changed, 6 insertions(+), 19 deletions(-)
diff --git a/src/libass.mk b/src/libass.mk
index 28af3b0..38c0ad3 100644
--- a/src/libass.mk
+++ b/src/libass.mk
@@ -3,32 +3,19 @@
PKG := libass
$(PKG)_WEBSITE := https://code.google.com/p/libass/
$(PKG)_IGNORE :=
-# remove autoreconf step after 0.13.1
-# https://github.com/libass/libass/issues/209
-$(PKG)_VERSION := 0.13.1
-$(PKG)_CHECKSUM := 4aa36b1876a61cab46fc9284fee84224b9e2840fe7b3e63d96a8d32574343fe7
-$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE := $($(PKG)_SUBDIR).tar.xz
-$(PKG)_URL := https://github.com/libass/libass/releases/download/$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_VERSION := 0.14.0
+$(PKG)_CHECKSUM := 8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf
+$(PKG)_GH_CONF := libass/libass/releases/latest
$(PKG)_DEPS := gcc fontconfig freetype fribidi harfbuzz
-define $(PKG)_UPDATE
- $(WGET) -q -O- "https://api.github.com/repos/libass/libass/releases" | \
- grep 'tag_name' | \
- $(SED) -n 's,.*tag_name": "\([0-9][^>]*\)".*,\1,p' | \
- $(SORT) -Vr | \
- head -1
-endef
-
define $(PKG)_BUILD
- cd '$(1)' && $(LIBTOOLIZE) && autoreconf -fi
# fontconfig is only required for legacy XP support
- cd '$(1)' && ./configure \
+ cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \
$(MXE_CONFIGURE_OPTS) \
--enable-fontconfig \
--enable-harfbuzz
- $(MAKE) -C '$(1)' -j '$(JOBS)'
- $(MAKE) -C '$(1)' -j 1 install
+ $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
+ $(MAKE) -C '$(BUILD_DIR)' -j 1 install
'$(TARGET)-gcc' \
-W -Wall -Werror -ansi -pedantic \
--
cgit v0.12