From 5da918d3fe5c9daa16d4ab6e011e50e4767130fa Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Sun, 19 Nov 2017 01:06:09 +0000 Subject: [PATCH] multimedia/kvazaar: update to 1.2.0 - Increase verbosity of automake tests Changes: https://github.com/ultravideo/kvazaar/releases/tag/v1.2.0 ABI: https://abi-laboratory.pro/tracker/timeline/kvazaar/ --- multimedia/ffmpeg/Makefile | 1 + multimedia/kvazaar/Makefile | 14 +++++------ multimedia/kvazaar/distinfo | 6 ++--- .../kvazaar/files/patch-tests_Makefile.am | 24 +++++++++++++++++++ multimedia/kvazaar/pkg-plist | 4 ++-- 5 files changed, 36 insertions(+), 13 deletions(-) create mode 100644 multimedia/kvazaar/files/patch-tests_Makefile.am diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index b8b707d7897a..ccb395db8c91 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -3,6 +3,7 @@ PORTNAME= ffmpeg PORTVERSION= 3.4 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ diff --git a/multimedia/kvazaar/Makefile b/multimedia/kvazaar/Makefile index 593017820961..115d518d5ec9 100644 --- a/multimedia/kvazaar/Makefile +++ b/multimedia/kvazaar/Makefile @@ -2,8 +2,8 @@ PORTNAME= kvazaar DISTVERSIONPREFIX= v -DISTVERSION?= 1.1.0 -PORTREVISION?= 2 +DISTVERSION?= 1.2.0 +PORTREVISION?= 0 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org @@ -38,16 +38,14 @@ CRYPTOPP_CONFIGURE_ENV= cryptopp_CFLAGS=" " cryptopp_LIBS="-lcryptopp" CRYPTOPP_CONFIGURE_WITH=cryptopp post-patch: - @${REINPLACE_CMD} 's/x86_64/&|amd64/' ${WRKSRC}/configure.ac - -post-patch-CRYPTOPP-on: -# XXX Force C++ linking to avoid error with Clang - @${ECHO_CMD} nodist_EXTRA_kvazaar_tests_SOURCES \ - = dummy.cpp >>${WRKSRC}/tests/Makefile.am + @${REINPLACE_CMD} -e 's/x86_64/&|amd64/' \ + -e '/AM_INIT_AUTOMAKE/s/])/ serial-tests&/' \ + ${WRKSRC}/configure.ac pre-install: do-test .include +# XXX test_external_symbols.sh fails with CRYPTOPP=on # XXX beefy5 (fails) vs. beefy4 (succeeds). Missed CPUID check? do-test: .IGNORE diff --git a/multimedia/kvazaar/distinfo b/multimedia/kvazaar/distinfo index b31974094059..7a6b16f428cf 100644 --- a/multimedia/kvazaar/distinfo +++ b/multimedia/kvazaar/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1487271125 -SHA256 (ultravideo-kvazaar-v1.1.0_GH0.tar.gz) = 8e382738a51004bfcfca4c832e8b41fe6a17f889f3c39151dc1c1a37261a3a6d -SIZE (ultravideo-kvazaar-v1.1.0_GH0.tar.gz) = 484601 +TIMESTAMP = 1510925013 +SHA256 (ultravideo-kvazaar-v1.2.0_GH0.tar.gz) = 480ecfd9b4d2b7d21b355e4a35fcf47b4db7a3b0315b6219d93733db42392bd9 +SIZE (ultravideo-kvazaar-v1.2.0_GH0.tar.gz) = 486455 SHA256 (silentbicycle-greatest-v1.0.0_GH0.tar.gz) = 18ee57a34869c6f6ce511cd71a5cc8661801cf69d64c4c66ff76773835df659b SIZE (silentbicycle-greatest-v1.0.0_GH0.tar.gz) = 11959 diff --git a/multimedia/kvazaar/files/patch-tests_Makefile.am b/multimedia/kvazaar/files/patch-tests_Makefile.am new file mode 100644 index 000000000000..817bdf5ccef7 --- /dev/null +++ b/multimedia/kvazaar/files/patch-tests_Makefile.am @@ -0,0 +1,24 @@ +- Disable valgrind tests due to hangs, x86-only and missing TAppDecoder +- Disable encode tests to avoid circular dependency on ffmpeg + +--- tests/Makefile.am.orig 2017-11-17 13:23:33 UTC ++++ tests/Makefile.am +@@ -1,17 +1,7 @@ + + TESTS = $(check_PROGRAMS) \ + test_external_symbols.sh \ +- test_gop.sh \ +- test_interlace.sh \ +- test_intra.sh \ +- test_invalid_input.sh \ +- test_mv_constraint.sh \ +- test_owf_wpp_tiles.sh \ +- test_rate_control.sh \ +- test_slices.sh \ +- test_smp.sh \ +- test_tools.sh \ +- test_weird_shapes.sh ++ $(NULL) + + check_PROGRAMS = kvazaar_tests + diff --git a/multimedia/kvazaar/pkg-plist b/multimedia/kvazaar/pkg-plist index c9486ae18b77..65b06b453c41 100644 --- a/multimedia/kvazaar/pkg-plist +++ b/multimedia/kvazaar/pkg-plist @@ -2,8 +2,8 @@ bin/kvazaar include/kvazaar.h lib/libkvazaar.a lib/libkvazaar.so -lib/libkvazaar.so.3 -lib/libkvazaar.so.3.15.0 +lib/libkvazaar.so.4 +lib/libkvazaar.so.4.0.0 libdata/pkgconfig/kvazaar.pc man/man1/kvazaar.1.gz %%PORTDOCS%%%%DOCSDIR%%/COPYING