From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A4246158095 for ; Sun, 25 Sep 2022 01:27:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5A533E0BC3; Sun, 25 Sep 2022 01:27:58 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 25A41E0BC3 for ; Sun, 25 Sep 2022 01:27:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 57182340EA9 for ; Sun, 25 Sep 2022 01:27:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E73E75FF for ; Sun, 25 Sep 2022 01:27:53 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1664069243.41f53032ea23d2a8a2cac6d58812130518c69315.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/zimg/files/, media-libs/zimg/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/zimg/files/backport-e29571f-issue-175.patch media-libs/zimg/files/system-gtest.patch media-libs/zimg/zimg-3.0.4.ebuild X-VCS-Directories: media-libs/zimg/files/ media-libs/zimg/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 41f53032ea23d2a8a2cac6d58812130518c69315 X-VCS-Branch: master Date: Sun, 25 Sep 2022 01:27:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5a2a6e0a-08b1-4b3f-9d3a-393df5c673e9 X-Archives-Hash: 3ec1b856e5347f15302063f66a42038b commit: 41f53032ea23d2a8a2cac6d58812130518c69315 Author: matoro users noreply github com> AuthorDate: Sat Sep 17 18:09:34 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sun Sep 25 01:27:23 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41f53032 media-libs/zimg: enable tests Bug: https://bugs.gentoo.org/868030 Closes: https://github.com/gentoo/gentoo/pull/27310 Signed-off-by: Sam James gentoo.org> .../zimg/files/backport-e29571f-issue-175.patch | 83 ++++++++++++++++++++++ media-libs/zimg/files/system-gtest.patch | 45 ++++++++++++ media-libs/zimg/zimg-3.0.4.ebuild | 12 +++- 3 files changed, 138 insertions(+), 2 deletions(-) diff --git a/media-libs/zimg/files/backport-e29571f-issue-175.patch b/media-libs/zimg/files/backport-e29571f-issue-175.patch new file mode 100644 index 000000000000..e8512f35eb7e --- /dev/null +++ b/media-libs/zimg/files/backport-e29571f-issue-175.patch @@ -0,0 +1,83 @@ +https://github.com/sekrit-twc/zimg/issues/175 + +From e29571f9fc4a7bb37503a9c7ae4afd2352968b8f Mon Sep 17 00:00:00 2001 +From: sekrit-twc +Date: Sat, 7 May 2022 07:47:53 -0700 +Subject: [PATCH] test: update ARM hashsums + +Fix #175 +--- + test/colorspace/arm/colorspace_neon_test.cpp | 36 ++++++++++---------- + 1 file changed, 18 insertions(+), 18 deletions(-) + +diff --git a/test/colorspace/arm/colorspace_neon_test.cpp b/test/colorspace/arm/colorspace_neon_test.cpp +index 1b6e0bc9..54ad2c39 100644 +--- a/test/colorspace/arm/colorspace_neon_test.cpp ++++ b/test/colorspace/arm/colorspace_neon_test.cpp +@@ -54,13 +54,13 @@ TEST(ColorspaceConversionNeonTest, test_matrix) + + const char *expected_sha1[3] = { + #if defined(_M_ARM64) || defined(__aarch64__) +- "7b2a05426e2ef61dc6adc16573fca46ea3480256", +- "9c69bc8fa775a8e877e66e79812e9f4c39cec647", +- "6010983126eb3f5ca2dd5c01f4753c0e9f36d0bb" ++ "749f74428406c019b1b727fa30352fcd1f0141ed", ++ "334cfa73375f8afef8423a163f3cff8f8a196762", ++ "aa3aab12d52e67b4d6765b4e8c03205a5375d8d9" + #else +- "0495adab9c82d98e73841e229a9b2041838fc0f2", +- "ece7edb1118d4b3063ad80f5d8febb6db7e9633a", +- "73a9ee951c7bde9ae0ada9b90afd1f7ce8b604df" ++ "1d559e4b2812a5940839b064f5bd74bc4fe0a2f9", ++ "b32a33c4bbbf3901f89458f914e6d03cc81f2c1d", ++ "4aadd644fae30cfd2098bb8d2b9f98483c8821fd" + #endif + }; + #if defined(_M_ARM64) || defined(__aarch64__) +@@ -82,34 +82,34 @@ TEST(ColorspaceConversionNeonTest, test_transfer_lut) + { + #if defined(_M_ARM64) || defined(__aarch64__) + "23d012fcb280f601e2e3c349229d0108e3cd632a", +- "21f5071b0a817c28295d51ead5137cabc6e0d5c4", +- "158c4ff0c91c08f82e9fc35a500a1c8166f5ae6b" ++ "7ae186215d5fa45065f7aeac74ab2dc74b556696", ++ "bad84d4e0de8572c81df6d9f91fef05b1576f9e5" + #else + "52451877e62e9fc31eb10b1e37c5f95fdd8851db", +- "3e2ff4f017c343edbe787692ce169123124337b1", +- "f719a90e6a6c859bfcfc136f3296e65044495da0" ++ "06bc0aff436bbbf4ba633b2255dd096e628a129c", ++ "a20570af1c05291029ea7d6b4215c451f4a9187a" + #endif + }, + { + "011ee645ad30bb6ad6d93d8980d89a3e3e073c19", +- "d64814ca78cbf4e07606f92f1644f59762271ca5", +- "f871247697737f9f8b6a59a58306e22cce472ea6" ++ "5ae0e075b3856d9f491954b477568b17daf7f147", ++ "84b20f8fa27c23a668540566b9df26c4b42c9afa" + }, + { + #if defined(_M_ARM64) || defined(__aarch64__) + "8206be2ae5e8a0fc003daeec4178189eecf82a13", +- "6bc5833cbd22f04c1965d230aad2ef8969da24b7", +- "6538399afe0b9fd55a95608b25c8036e16d658b8" ++ "24843f17600dd7bf9870f5c778549bd96c333427", ++ "26a6b00801b41da17d849e02217bf69add6324a6" + #else + "905d4d54eeae6458e8e0975c9cea66b25edcc234", +- "c2e7015447b40ebb2f4bfba48b7b091f964b22f1", +- "d222f960fe874ac88608666c4af8de180d91868e" ++ "d380f54820f1e269ea54a1d552b0cb704f83dd7b", ++ "552579149674b5e37f0d443ad19a59593fdca057" + #endif + }, + { + "16f2274ffac90927de0438114f0ea22e650981a0", +- "2e01c95f89ea26b5a55bed895223381ac3f17e70", +- "c61d9c5369a00af5bb40b70fbb21956c00a4a1e9" ++ "b1c8b15b6159ab43e7bfc4e715fe3b621628d26e", ++ "632ae07d6919533c87d2ed28560a60cf070498e2" + }, + }; + const double expected_tolinear_snr = 80.0; diff --git a/media-libs/zimg/files/system-gtest.patch b/media-libs/zimg/files/system-gtest.patch new file mode 100644 index 000000000000..5e9e49bcab4d --- /dev/null +++ b/media-libs/zimg/files/system-gtest.patch @@ -0,0 +1,45 @@ +diff --git a/Makefile.am b/Makefile.am +index 8727ca4..303cc6f 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -356,8 +356,7 @@ test_unit_test_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -I$(srcdir)/src/zimg \ + -I$(srcdir)/test \ +- -I$(srcdir)/test/extra \ +- -I$(srcdir)/test/extra/googletest/googletest/include ++ -I$(srcdir)/test/extra + + test_unit_test_SOURCES = \ + test/main.cpp \ +@@ -419,13 +418,8 @@ test_unit_test_SOURCES += \ + test/resize/x86/resize_impl_avx512_vnni_test.cpp + endif # X86SIMD_AVX512 + +-test/extra/googletest/build/lib/libgtest.a: .FAKE +- -$(MAKE) -C test/extra/googletest/build gtest +- +-.FAKE: +- + test_unit_test_LDADD = \ +- test/extra/googletest/build/lib/libgtest.a \ ++ -lgtest \ + test/libmusl_m.la \ + libzimg_internal.la + endif # UNIT_TEST +diff --git a/configure.ac b/configure.ac +index cd50e96..5fd41fb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -45,11 +45,6 @@ AS_IF([test "x$enable_unit_test" = "xyes"], + [i?86], [CFLAGS="$CFLAGS -mfpmath=sse -msse2" CXXFLAGS="$CXXFLAGS -mfpmath=sse -msse2"], + [x86_64], [], + [AC_MSG_WARN([Could not determine how to enable IEEE-754 compliance on host. Tests may fail.])]) +- +- AC_CHECK_PROG([CMAKE], [cmake], [cmake]) +- AS_MKDIR_P([test/extra/googletest/build]) +- AS_IF([(cd "test/extra/googletest/build" && $CMAKE -Dgtest_disable_pthreads=ON "$ac_abs_confdir/test/extra/googletest")], +- [], [AC_MSG_ERROR([CMake error])]) + ]) + + diff --git a/media-libs/zimg/zimg-3.0.4.ebuild b/media-libs/zimg/zimg-3.0.4.ebuild index 5198226202f1..be89f6335570 100644 --- a/media-libs/zimg/zimg-3.0.4.ebuild +++ b/media-libs/zimg/zimg-3.0.4.ebuild @@ -18,7 +18,14 @@ HOMEPAGE="https://github.com/sekrit-twc/zimg" LICENSE="WTFPL-2" SLOT="0" -IUSE="debug static-libs" +IUSE="debug static-libs test" +RESTRICT="!test? ( test )" +DEPEND="test? ( dev-cpp/gtest )" + +PATCHES=( + "${FILESDIR}/system-gtest.patch" + "${FILESDIR}/backport-e29571f-issue-175.patch" +) src_prepare() { default @@ -28,5 +35,6 @@ src_prepare() { multilib_src_configure() { ECONF_SOURCE="${S}" econf \ $(use_enable debug) \ - $(use_enable static-libs static) + $(use_enable static-libs static) \ + $(use_enable test unit-test) }