From 1847d0be0b820c720ddf4405d7cca000eef06e23 Mon Sep 17 00:00:00 2001 From: Abdur Rehman Date: Wed, 25 May 2016 00:07:50 +0500 Subject: libass: add newer version * mpv requires newer libass to build * move SRC_URI from Google Code to GitHub * ENCA support has been removed https://github.com/libass/libass/pull/197 remove --enable-enca which is now an [unknown-configure-option] * Fix [textrel] for x86 targets Signed-off-by: Christopher Larson Signed-off-by: Abdur Rehman Signed-off-by: Martin Jansa --- meta-oe/recipes-multimedia/libass/libass.inc | 10 +++++----- meta-oe/recipes-multimedia/libass/libass_0.10.1.bb | 5 ----- meta-oe/recipes-multimedia/libass/libass_0.13.2.bb | 4 ++++ 3 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 meta-oe/recipes-multimedia/libass/libass_0.10.1.bb create mode 100644 meta-oe/recipes-multimedia/libass/libass_0.13.2.bb (limited to 'meta-oe/recipes-multimedia/libass') diff --git a/meta-oe/recipes-multimedia/libass/libass.inc b/meta-oe/recipes-multimedia/libass/libass.inc index 328cd145c8..85ac87320b 100644 --- a/meta-oe/recipes-multimedia/libass/libass.inc +++ b/meta-oe/recipes-multimedia/libass/libass.inc @@ -1,5 +1,5 @@ DESCRIPTION = "libass is a portable subtitle renderer for the ASS/SSA (Advanced Substation Alpha/Substation Alpha) subtitle format. It is mostly compatible with VSFilter." -HOMEPAGE = "http://code.google.com/p/libass/" +HOMEPAGE = "https://github.com/libass/libass" SECTION = "libs/multimedia" LICENSE = "ISC" @@ -7,9 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ae98663bac55afe5d989919d296f28a" DEPENDS = "enca fontconfig freetype libpng fribidi" -INC_PR = "r1" - -SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.gz" +SRC_URI = "https://github.com/libass/libass/releases/download/${PV}/libass-${PV}.tar.xz" inherit autotools pkgconfig @@ -17,10 +15,12 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[harfbuzz] = "--enable-harfbuzz,--disable-harfbuzz,harfbuzz" EXTRA_OECONF = " \ - --enable-enca \ --enable-fontconfig \ " +# Disable compiling with ASM for x86 to avoid textrel +EXTRA_OECONF_append_x86 = " --disable-asm" + PACKAGES =+ "${PN}-tests" FILES_${PN}-tests = " \ diff --git a/meta-oe/recipes-multimedia/libass/libass_0.10.1.bb b/meta-oe/recipes-multimedia/libass/libass_0.10.1.bb deleted file mode 100644 index 0b32276925..0000000000 --- a/meta-oe/recipes-multimedia/libass/libass_0.10.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require ${PN}.inc -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "6cace482a013a3c4bf3b31a68ac66026" -SRC_URI[sha256sum] = "629a7e81fff92dea8d0399b818a41fd1b61e381c67a5961b1eaec2efadb14c6c" diff --git a/meta-oe/recipes-multimedia/libass/libass_0.13.2.bb b/meta-oe/recipes-multimedia/libass/libass_0.13.2.bb new file mode 100644 index 0000000000..8cf2bd8991 --- /dev/null +++ b/meta-oe/recipes-multimedia/libass/libass_0.13.2.bb @@ -0,0 +1,4 @@ +require recipes-multimedia/${BPN}/${BPN}.inc + +SRC_URI[md5sum] = "1c8cbd5751aeb192bda04a65d0464fd9" +SRC_URI[sha256sum] = "d698d0a6adca7c36c5a86b540d67b05bfd36cebc3c351ab7646497c43fe1face" -- cgit 1.2.3-korg