From c81d5ba91725be914fe3199be755f21c51b52f1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Sun, 12 Jul 2020 22:36:53 -0300 Subject: [PATCH] libaom: update to 2.0.0. --- common/shlibs | 2 +- srcpkgs/libaom/patches/version.patch | 14 ----------- srcpkgs/libaom/template | 36 ++++++++++++++++++++++++---- srcpkgs/libaom/update | 2 +- 4 files changed, 33 insertions(+), 21 deletions(-) delete mode 100644 srcpkgs/libaom/patches/version.patch diff --git a/common/shlibs b/common/shlibs index ef2869d632e..693fd9566bb 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3501,7 +3501,7 @@ libticalcs2.so.12 libticalcs2-1.1.9_1 libhtmlcxx.so.3 htmlcxx-0.86_1 libcss_parser_pp.so.0 htmlcxx-0.86_1 libcss_parser.so.0 htmlcxx-0.86_1 -libaom.so.0 libaom-1.0.0_1 +libaom.so.2 libaom-2.0.0_1 libre.so re-0.5.8_1 libspandsp.so.2 spandsp-0.0.6_1 libspa-alsa.so libspa-alsa-0.3.6_1 diff --git a/srcpkgs/libaom/patches/version.patch b/srcpkgs/libaom/patches/version.patch deleted file mode 100644 index 97372192897..00000000000 --- a/srcpkgs/libaom/patches/version.patch +++ /dev/null @@ -1,14 +0,0 @@ -add entry for 1.0.0 release to fix version in pkg-config file - ---- CHANGELOG -+++ CHANGELOG -@@ -3,6 +3,9 @@ - The AV1 encoder's default keyframe interval changed to 128 from 9999. - Support for armv6 was removed. - -+2019-03-16 v1.0.0 "AOMedia Codec 1" -+ Current release -+ - 2016-04-07 v0.1.0 "AOMedia Codec 1" - This release is the first Alliance for Open Media codec. - 2015-11-09 v1.5.0 "Javan Whistling Duck" diff --git a/srcpkgs/libaom/template b/srcpkgs/libaom/template index 7cb2fcf07db..93f1983edfc 100644 --- a/srcpkgs/libaom/template +++ b/srcpkgs/libaom/template @@ -1,18 +1,43 @@ # Template file for 'libaom' pkgname=libaom -version=1.0.0.1 -revision=2 +version=2.0.0 +revision=1 create_wrksrc=yes build_style=cmake -configure_args="-DENABLE_DOCS=OFF -DBUILD_SHARED_LIBS=ON -DENABLE_TESTS=OFF" +configure_args="-DENABLE_DOCS=OFF -DBUILD_SHARED_LIBS=ON" hostmakedepends="yasm doxygen perl python" short_desc="AV1 Codec library implementation" maintainer="Orphaned " license="BSD-2-Clause" homepage="https://aomedia.org/" changelog="https://aomedia.googlesource.com/aom/+/master/CHANGELOG" -distfiles="https://aomedia.googlesource.com/aom/+archive/v${version%.*}-errata${version##*.}.tar.gz" -checksum=@0f1e812ca6d3b3809bf3f7a12a85b549c96d20bfa72fa606a682541bbc3eaeab +distfiles="https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz" +checksum=@4e8a74ed7e05d5534ab0b72735fa670ce1a1e757bc4a777f07fdabf8629fced1 + +# aom segfaults with default musl stack size +LDFLAGS="-Wl,-z,stack-size=2097152" + +case "$XBPS_TARGET_MACHINE" in + # no runtime detection + arm*) configure_args+=" -DENABLE_NEON=0" ;; + ppc64le*) ;; + ppc*) configure_args+=" -DENABLE_VSX=0" ;; +esac + +if [ -z "$XBPS_CHECK_PKGS" ]; then + configure_args+=" -DENABLE_TESTS=OFF" +fi + +pre_check() { + mkdir -p /host/libaom-test-data + export LIBAOM_TEST_DATA_PATH=/host/libaom-test-data +} + +do_check() { + cd build + make runtests ${makejobs} + ../test/examples.sh --bin-path examples +} post_install() { vlicense LICENSE @@ -25,6 +50,7 @@ libaom-devel_package() { vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/*.so" + vmove "usr/lib/*.a" } } diff --git a/srcpkgs/libaom/update b/srcpkgs/libaom/update index fd5a23fd8eb..866cfaf6c8c 100644 --- a/srcpkgs/libaom/update +++ b/srcpkgs/libaom/update @@ -1,3 +1,3 @@ site=https://aomedia.googlesource.com/aom/ pkgname= -pattern="aom/\+/v\K[\d\.]+" +pattern="v\K[\d\.][\d.]+"