From owner-svn-ports-head@freebsd.org Wed Aug 17 14:24:44 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 96274BBDDEF; Wed, 17 Aug 2016 14:24:44 +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 mx1.freebsd.org (Postfix) with ESMTPS id 5A0121150; Wed, 17 Aug 2016 14:24:44 +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 u7HEOh4W066974; Wed, 17 Aug 2016 14:24:43 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7HEOhdY066970; Wed, 17 Aug 2016 14:24:43 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201608171424.u7HEOhdY066970@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 17 Aug 2016 14:24:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420352 - in head/graphics/sekrit-twc-zimg: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Aug 2016 14:24:44 -0000 Author: jbeich Date: Wed Aug 17 14:24:43 2016 New Revision: 420352 URL: https://svnweb.freebsd.org/changeset/ports/420352 Log: graphics/sekrit-twc-zimg: update to 2.2 Changes: https://github.com/sekrit-twc/zimg/blob/release-2.2/ChangeLog ABI: https://people.freebsd.org/~jbeich/compat_reports/zimg/2.1_to_2.2/compat_report.html Modified: head/graphics/sekrit-twc-zimg/Makefile (contents, props changed) head/graphics/sekrit-twc-zimg/distinfo (contents, props changed) head/graphics/sekrit-twc-zimg/files/patch-no-extra-deps (contents, props changed) head/graphics/sekrit-twc-zimg/pkg-plist (contents, props changed) Modified: head/graphics/sekrit-twc-zimg/Makefile ============================================================================== --- head/graphics/sekrit-twc-zimg/Makefile Wed Aug 17 14:01:22 2016 (r420351) +++ head/graphics/sekrit-twc-zimg/Makefile Wed Aug 17 14:24:43 2016 (r420352) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= zimg -PORTVERSION= 2.1 +PORTVERSION= 2.2 DISTVERSIONPREFIX= release- CATEGORIES= graphics PKGNAMEPREFIX= ${GH_ACCOUNT}- @@ -23,19 +23,25 @@ USES= autoreconf compiler:c++11-lib gma EXTRACT_AFTER_ARGS= --exclude test/extra PATHFIX_MAKEFILEIN= Makefile.am GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-silent-rules --enable-testapp +CONFIGURE_ARGS= --disable-silent-rules CPPFLAGS+= -D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH_TR1 \ -D_DECLARE_C99_LDBL_MATH # XXX ports/193528 +CPPFLAGS+= ${CPPFLAGS_${CHOSEN_COMPILER_TYPE}_${COMPILER_VERSION}} +CPPFLAGS_clang_34= -include x86intrin.h # revert 575bd93 INSTALL_TARGET= install-strip USE_LDCONFIG= yes +PORTEXAMPLES= * -OPTIONS_DEFINE= TEST +OPTIONS_DEFINE= EXAMPLES TEST OPTIONS_DEFINE_amd64= SIMD OPTIONS_DEFINE_i386= SIMD OPTIONS_DEFAULT_amd64= SIMD OPTIONS_DEFAULT_i386= SIMD # runtime detection +EXAMPLES_CONFIGURE_ENABLE= example +EXAMPLES_MAKE_ARGS= exampledir="${EXAMPLESDIR}" + SIMD_CONFIGURE_ENABLE= x86simd TEST_BUILD_DEPENDS= googletest>=1.6.0:devel/googletest @@ -47,7 +53,7 @@ post-patch: @${REINPLACE_CMD} -e 's/x86_64/&|amd64/g' \ ${WRKSRC}/configure.ac @${REINPLACE_CMD} -e 's/-O2 //' \ - -e '/zimg-test/ { s/+=/=/; s/^noinst_/bin_/; } ' \ + -e '/dist_doc_DATA/d' \ ${WRKSRC}/Makefile.am pre-install-TEST-on: do-test Modified: head/graphics/sekrit-twc-zimg/distinfo ============================================================================== --- head/graphics/sekrit-twc-zimg/distinfo Wed Aug 17 14:01:22 2016 (r420351) +++ head/graphics/sekrit-twc-zimg/distinfo Wed Aug 17 14:24:43 2016 (r420352) @@ -1,2 +1,3 @@ -SHA256 (sekrit-twc-zimg-release-2.1_GH0.tar.gz) = 09093bbb4d73865362e1e346762a6efdc9acc3d2cab6a2ebf5f00ba5d90b17c3 -SIZE (sekrit-twc-zimg-release-2.1_GH0.tar.gz) = 171769 +TIMESTAMP = 1471300524 +SHA256 (sekrit-twc-zimg-release-2.2_GH0.tar.gz) = 573ef25858623d90158f829d1fa66d4ef429a005034cae7a9dc3e9d250b9abf7 +SIZE (sekrit-twc-zimg-release-2.2_GH0.tar.gz) = 175926 Modified: head/graphics/sekrit-twc-zimg/files/patch-no-extra-deps ============================================================================== --- head/graphics/sekrit-twc-zimg/files/patch-no-extra-deps Wed Aug 17 14:01:22 2016 (r420351) +++ head/graphics/sekrit-twc-zimg/files/patch-no-extra-deps Wed Aug 17 14:24:43 2016 (r420352) @@ -1,6 +1,6 @@ ---- Makefile.am.orig 2016-01-22 18:12:28 UTC +--- Makefile.am.orig 2016-08-17 04:57:11 UTC +++ Makefile.am -@@ -197,35 +197,16 @@ endif # TESTAPP +@@ -242,29 +242,12 @@ endif # TESTAPP if UNIT_TEST TESTS = test/unit_test @@ -9,42 +9,46 @@ -test_libmusl_m_la_CFLAGS = $(AM_CFLAGS) -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/libm.h \ -- test/extra/musl-libm/mymath.h \ -- test/extra/musl-libm/pow.c \ -- test/extra/musl-libm/powf.c \ -- test/extra/musl-libm/sin.c +-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/libm.h \ +- test/extra/musl-libm/mymath.h \ +- test/extra/musl-libm/pow.c \ +- test/extra/musl-libm/powf.c \ +- test/extra/musl-libm/sin.c - - test_unit_test_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 \ - test/colorspace/colorspace_test.cpp \ - test/depth/depth_convert_test.cpp \ - test/depth/dither_test.cpp \ -- test/extra/sha1/config.h \ -- test/extra/sha1/sha1.c \ -- test/extra/sha1/sha1.h \ - test/graph/audit_buffer.cpp \ - test/graph/audit_buffer.h \ - test/graph/basic_filter_test.cpp \ -@@ -247,7 +228,6 @@ test_unit_test_SOURCES += test/colorspac - + test_unit_test_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 \ +@@ -272,9 +255,6 @@ test_unit_test_SOURCES = \ + test/colorspace/colorspace_test.cpp \ + test/depth/depth_convert_test.cpp \ + test/depth/dither_test.cpp \ +- test/extra/sha1/config.h \ +- test/extra/sha1/sha1.c \ +- test/extra/sha1/sha1.h \ + test/graph/audit_buffer.cpp \ + test/graph/audit_buffer.h \ + test/graph/basic_filter_test.cpp \ +@@ -302,7 +282,6 @@ test_unit_test_SOURCES += \ endif #X86SIMD --test_unit_test_LDADD = test/extra/googletest/googletest/lib/libgtest.la \ -- test/libmusl_m.la \ -+test_unit_test_LDADD = -lgtest -lmd -lpthread \ - libzimg.la + test_unit_test_LDADD = \ +- test/extra/googletest/googletest/lib/libgtest.la \ +- test/libmusl_m.la \ ++ -lgtest -lmd -lpthread \ + libzimg_internal.la endif # UNIT_TEST --- configure.ac.orig 2016-05-08 20:08:38 UTC +++ configure.ac @@ -59,55 +63,42 @@ --- test/graph/filter_validator.cpp.orig 2016-01-22 18:12:28 UTC +++ test/graph/filter_validator.cpp -@@ -13,7 +13,7 @@ +@@ -14,7 +14,14 @@ #include "gtest/gtest.h" extern "C" { -- #include "sha1/sha1.h" ++#ifdef _WIN32 + #include "sha1/sha1.h" ++#else // assume openssl or libmd + #include ++ #define SHA1Init SHA1_Init ++ #define SHA1Update SHA1_Update ++ #define SHA1Final SHA1_Final ++#endif } #include "audit_buffer.h" -@@ -35,14 +35,14 @@ void hash_buffer(const AuditBuffer &b - auto image_buffer = buf.as_read_buffer(); - SHA1_CTX sha_ctx; - -- SHA1Init(&sha_ctx); -+ SHA1_Init(&sha_ctx); - - for (unsigned i = 0; i < height; ++i) { - const unsigned char *ptr = zimg::graph::static_buffer_cast(image_buffer[p])[i]; -- SHA1Update(&sha_ctx, ptr, width * sizeof(T)); -+ SHA1_Update(&sha_ctx, ptr, width * sizeof(T)); - } - -- SHA1Final(digest, &sha_ctx); -+ SHA1_Final(digest, &sha_ctx); - } - - std::string hash_to_str(const unsigned char digest[20]) ---- test/main.cpp.orig 2016-01-22 18:12:28 UTC +--- test/main.cpp.orig 2016-08-17 04:57:11 UTC +++ test/main.cpp -@@ -3,22 +3,11 @@ - #include "common/libm_wrapper.h" +@@ -1,8 +1,12 @@ + #include + #include +-#include "common/libm_wrapper.h" #include "gtest/gtest.h" --#include "musl-libm/mymath.h" -- --void wrap_libm() --{ -- _zimg_sin = mysin; -- _zimg_cos = mycos; -- _zimg_pow = mypow; -- _zimg_powf = mypowf; --} ++ ++#if !defined(_WIN32) && !defined(__GLIBC__) ++#define wrap_libm() // assume openlibm ++#else ++#include "common/libm_wrapper.h" + #include "musl-libm/mymath.h" - int main(int argc, char **argv) - { - int ret; + namespace { +@@ -16,6 +20,7 @@ void wrap_libm() + } -- wrap_libm(); -- - ::testing::InitGoogleTest(&argc, argv); - ret = RUN_ALL_TESTS(); + } // namespace ++#endif + + int main(int argc, char **argv) Modified: head/graphics/sekrit-twc-zimg/pkg-plist ============================================================================== --- head/graphics/sekrit-twc-zimg/pkg-plist Wed Aug 17 14:01:22 2016 (r420351) +++ head/graphics/sekrit-twc-zimg/pkg-plist Wed Aug 17 14:24:43 2016 (r420352) @@ -1,4 +1,3 @@ -bin/zimg-test include/zimg++.hpp include/zimg.h lib/libzimg.a