From owner-svn-ports-all@freebsd.org Sat Oct 5 00:42:04 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AE2E113D796; Sat, 5 Oct 2019 00:42:04 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46lScX4CXhz43sJ; Sat, 5 Oct 2019 00:42:04 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 73D5F4BF1; Sat, 5 Oct 2019 00:42:04 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x950g4RU069952; Sat, 5 Oct 2019 00:42:04 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x950g4BH069950; Sat, 5 Oct 2019 00:42:04 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201910050042.x950g4BH069950@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 5 Oct 2019 00:42:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r513800 - in head/graphics/sekrit-twc-zimg: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/graphics/sekrit-twc-zimg: . files X-SVN-Commit-Revision: 513800 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Oct 2019 00:42:04 -0000 Author: jbeich Date: Sat Oct 5 00:42:03 2019 New Revision: 513800 URL: https://svnweb.freebsd.org/changeset/ports/513800 Log: graphics/sekrit-twc-zimg: use bundled math library to unbreak some tests [==========] 129 tests from 25 test suites ran. (29301 ms total) [ PASSED ] 127 tests. [ FAILED ] 2 tests, listed below: [ FAILED ] ColorspaceConversionTest.test_transfer_only_b67 [ FAILED ] ColorspaceConversionTest.test_rec2100_ictcp PR: 216537 Modified: head/graphics/sekrit-twc-zimg/Makefile (contents, props changed) head/graphics/sekrit-twc-zimg/files/patch-no-extra-deps (contents, props changed) Modified: head/graphics/sekrit-twc-zimg/Makefile ============================================================================== --- head/graphics/sekrit-twc-zimg/Makefile Sat Oct 5 00:31:53 2019 (r513799) +++ head/graphics/sekrit-twc-zimg/Makefile Sat Oct 5 00:42:03 2019 (r513800) @@ -18,7 +18,8 @@ GH_ACCOUNT= sekrit-twc CONFLICTS_INSTALL= zimg-[0-9]* # include/zimg.h USES= autoreconf compiler:c++11-lib gmake libtool pathfix -EXTRACT_AFTER_ARGS= --exclude test/extra +EXCLUDE= googletest sha1 +EXTRACT_AFTER_ARGS= ${EXCLUDE:S,^,--exclude test/extra/,} GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_LDCONFIG= yes Modified: head/graphics/sekrit-twc-zimg/files/patch-no-extra-deps ============================================================================== --- head/graphics/sekrit-twc-zimg/files/patch-no-extra-deps Sat Oct 5 00:31:53 2019 (r513799) +++ head/graphics/sekrit-twc-zimg/files/patch-no-extra-deps Sat Oct 5 00:42:03 2019 (r513800) @@ -1,30 +1,6 @@ --- Makefile.am.orig 2017-12-21 02:35:58 UTC +++ Makefile.am -@@ -286,32 +286,13 @@ endif # TESTAPP - if UNIT_TEST - TESTS = test/unit_test - --check_LTLIBRARIES = test/libmusl_m.la - check_PROGRAMS = test/unit_test - --test_libmusl_m_la_CFLAGS = $(AM_CFLAGS) -std=c99 -Wno-sign-compare -Wno-unused-variable -Wno-unused-but-set-variable -- --test_libmusl_m_la_SOURCES = \ -- test/extra/musl-libm/__cos.c \ -- test/extra/musl-libm/__rem_pio2.c \ -- test/extra/musl-libm/__rem_pio2_large.c \ -- test/extra/musl-libm/__sin.c \ -- test/extra/musl-libm/cos.c \ -- test/extra/musl-libm/fpu_wrapper.c \ -- test/extra/musl-libm/expf.c \ -- test/extra/musl-libm/libm.h \ -- test/extra/musl-libm/log10f.c \ -- test/extra/musl-libm/logf.c \ -- test/extra/musl-libm/mymath.h \ -- test/extra/musl-libm/powf.c \ -- test/extra/musl-libm/sin.c -- - test_unit_test_CPPFLAGS = \ +@@ -314,8 +313,7 @@ test_unit_test_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(srcdir)/src/zimg \ -I$(srcdir)/test \ @@ -34,7 +10,7 @@ test_unit_test_SOURCES = \ test/main.cpp \ -@@ -320,9 +301,6 @@ test_unit_test_SOURCES = \ +@@ -324,9 +322,6 @@ test_unit_test_SOURCES = \ test/colorspace/gamma_test.cpp \ test/depth/depth_convert_test.cpp \ test/depth/dither_test.cpp \ @@ -44,13 +20,13 @@ test/graph/audit_buffer.cpp \ test/graph/audit_buffer.h \ test/graph/copy_filter_test.cpp \ -@@ -362,7 +340,6 @@ test_unit_test_SOURCES += \ +@@ -368,7 +363,7 @@ test_unit_test_SOURCES += \ endif # X86SIMD_AVX512 test_unit_test_LDADD = \ - test/extra/googletest/googletest/lib/libgtest.la \ -- test/libmusl_m.la \ + -lgtest -lmd -lpthread \ + test/libmusl_m.la \ libzimg_internal.la endif # UNIT_TEST --- configure.ac.orig 2016-05-08 20:08:38 UTC @@ -81,27 +57,3 @@ } #include "audit_buffer.h" ---- test/main.cpp.orig 2016-08-17 04:57:11 UTC -+++ test/main.cpp -@@ -1,8 +1,12 @@ - #include - #include --#include "common/libm_wrapper.h" - - #include "gtest/gtest.h" -+ -+#if !defined(_WIN32) && !defined(__GLIBC__) -+#define wrap_libm() // assume openlibm -+#else -+#include "common/libm_wrapper.h" - #include "musl-libm/mymath.h" - - namespace { -@@ -16,6 +20,7 @@ void wrap_libm() - } - - } // namespace -+#endif - - - int main(int argc, char **argv)