From afabe47345ce5dd3a5070b67d98261c9fb671bfe Mon Sep 17 00:00:00 2001 From: TheOneric <1668471+TheOneric@users.noreply.github.com> Date: Mon, 13 Mar 2023 10:33:53 +0100 Subject: [PATCH] libass: update to 0.17.1, enable assembly and cleanup (#7949) * libass: drop useless dependency libass doesn't use enca anymore since 0.13.0. * libass: drop transitive build dependencies They are added automatically now, but keep transitive non-build dependencies. Also properly mark libintl as a transitive dep, as it is not required by libass itself but only fontconfig. * libass: build with assembly libass contains hand-crafted assembly for 32-bit and 64-bit x86 which requires NASM to build. By default assembly on 32-bit x86 is not fully PIC for performance reasons, so add --with-pic. * libass: disable static library * libass: update to 0.17.1 And delete old libass-0.16.0.recipe --- ...libass-0.16.0.recipe => libass-0.17.1.recipe} | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) rename media-libs/libass/{libass-0.16.0.recipe => libass-0.17.1.recipe} (81%) diff --git a/media-libs/libass/libass-0.16.0.recipe b/media-libs/libass/libass-0.17.1.recipe similarity index 81% rename from media-libs/libass/libass-0.16.0.recipe rename to media-libs/libass/libass-0.17.1.recipe index 86fba1e03..e8fde64fc 100644 --- a/media-libs/libass/libass-0.16.0.recipe +++ b/media-libs/libass/libass-0.17.1.recipe @@ -12,12 +12,12 @@ COPYRIGHT="2006-2021 libass contributors LICENSE="ISC" REVISION="1" SOURCE_URI="https://github.com/libass/libass/releases/download/$portVersion/libass-$portVersion.tar.xz" -CHECKSUM_SHA256="5dbde9e22339119cf8eed59eea6c623a0746ef5a90b689e68a090109078e3c08" +CHECKSUM_SHA256="f0da0bbfba476c16ae3e1cfd862256d30915911f7abaa1b16ce62ee653192784" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" -libVersion="9.1.4" +libVersion="9.2.1" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" @@ -27,14 +27,13 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix lib:libbz2$secondaryArchSuffix # required by freetype - lib:libenca$secondaryArchSuffix lib:libfontconfig$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix lib:libfribidi$secondaryArchSuffix lib:libgraphite2$secondaryArchSuffix # required by harfbuzz lib:libharfbuzz$secondaryArchSuffix lib:libiconv$secondaryArchSuffix - lib:libintl$secondaryArchSuffix + lib:libintl$secondaryArchSuffix # required by fontconfig lib:libpng16$secondaryArchSuffix # required by freetype lib:libxml2$secondaryArchSuffix # required by fontconfig lib:libz$secondaryArchSuffix # required by freetype @@ -53,17 +52,11 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libbz2$secondaryArchSuffix # required by freetype - devel:libenca$secondaryArchSuffix devel:libfontconfig$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix devel:libfribidi$secondaryArchSuffix - devel:libgraphite2$secondaryArchSuffix # required by harfbuzz devel:libharfbuzz$secondaryArchSuffix devel:libiconv$secondaryArchSuffix - devel:libpng16$secondaryArchSuffix # required by freetype - devel:libxml2$secondaryArchSuffix # required by fontconfig - devel:libz$secondaryArchSuffix # required by freetype " BUILD_PREREQUIRES=" cmd:aclocal @@ -73,6 +66,7 @@ BUILD_PREREQUIRES=" cmd:ld$secondaryArchSuffix cmd:libtoolize$secondaryArchSuffix cmd:make + cmd:nasm cmd:pkg_config$secondaryArchSuffix " @@ -82,7 +76,7 @@ defineDebugInfoPackage libass$secondaryArchSuffix \ BUILD() { autoreconf -fi - runConfigure ./configure + runConfigure ./configure --with-pic --disable-static make $jobArgs }