Index: head/graphics/sekrit-twc-zimg/Makefile =================================================================== --- head/graphics/sekrit-twc-zimg/Makefile (revision 449348) +++ head/graphics/sekrit-twc-zimg/Makefile (revision 449349) @@ -1,60 +1,60 @@ # $FreeBSD$ PORTNAME= zimg -PORTVERSION= 2.5.1 +PORTVERSION= 2.6.1 DISTVERSIONPREFIX= release- CATEGORIES= graphics PKGNAMEPREFIX= ${GH_ACCOUNT}- MAINTAINER= jbeich@FreeBSD.org COMMENT= Scaling, colorspace conversion, and dithering library LICENSE= WTFPL LICENSE_FILE= ${WRKSRC}/COPYING USE_GITHUB= yes 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 EXTRA_PATCHES+= ${EXTRA_PATCHES_${OPSYS}_${OSREL}} EXTRA_PATCHES_FreeBSD_10.3= ${PATCHDIR}/extra-patch-src_zimg_api_zimg.cpp GNU_CONFIGURE= yes 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= 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}" EXAMPLES_MAKE_ARGS_OFF= dist_example_DATA= dist_examplemisc_DATA= SIMD_CONFIGURE_ENABLE= x86simd TEST_BUILD_DEPENDS= googletest>=1.6.0:devel/googletest TEST_USES= localbase TEST_CONFIGURE_ENABLE= unit-test TEST_TEST_TARGET= check VERBOSE=1 post-patch: @${REINPLACE_CMD} -e 's/x86_64/&|amd64/g' \ ${WRKSRC}/configure.ac @${REINPLACE_CMD} -e 's/-O2 //' \ -e '/dist_doc_DATA/d' \ ${WRKSRC}/Makefile.am pre-install-TEST-on: do-test .include Index: head/graphics/sekrit-twc-zimg/distinfo =================================================================== --- head/graphics/sekrit-twc-zimg/distinfo (revision 449348) +++ head/graphics/sekrit-twc-zimg/distinfo (revision 449349) @@ -1,3 +1,3 @@ -TIMESTAMP = 1492296140 -SHA256 (sekrit-twc-zimg-release-2.5.1_GH0.tar.gz) = deb85887081cab7fa9c492b588900d60d6466e61ee8ea51a84ca280688d93de9 -SIZE (sekrit-twc-zimg-release-2.5.1_GH0.tar.gz) = 213083 +TIMESTAMP = 1504621137 +SHA256 (sekrit-twc-zimg-release-2.6.1_GH0.tar.gz) = 3f380898b4bf71c20cfedf9b2f87ba30612520c28b57c344c538dd56b1a5ea62 +SIZE (sekrit-twc-zimg-release-2.6.1_GH0.tar.gz) = 238285 Index: head/graphics/sekrit-twc-zimg/files/patch-no-extra-deps =================================================================== --- head/graphics/sekrit-twc-zimg/files/patch-no-extra-deps (revision 449348) +++ head/graphics/sekrit-twc-zimg/files/patch-no-extra-deps (revision 449349) @@ -1,105 +1,106 @@ ---- Makefile.am.orig 2016-08-17 04:57:11 UTC +--- Makefile.am.orig 2017-09-05 14:18:57 UTC +++ Makefile.am -@@ -250,30 +250,12 @@ endif # TESTAPP +@@ -280,31 +280,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) -Wno-sign-compare -Wno-unused-variable -Wno-unused-but-set-variable +-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/logf.c \ - test/extra/musl-libm/mymath.h \ - test/extra/musl-libm/powf.c \ - test/extra/musl-libm/sin.c - 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 \ -@@ -272,9 +255,6 @@ test_unit_test_SOURCES = \ - test/colorspace/colorspace_test.cpp \ +@@ -313,9 +295,6 @@ test_unit_test_SOURCES = \ + test/colorspace/gamma_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 +@@ -355,7 +334,6 @@ 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 \ libzimg_internal.la endif # UNIT_TEST --- configure.ac.orig 2016-05-08 20:08:38 UTC +++ configure.ac @@ -30,8 +30,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_CONFIG_SUBDIRS(test/extra/googletest/googletest) - AC_SUBST([CONFIG_SUBDIRS], [test/extra/googletest/googletest]) ]) --- test/graph/filter_validator.cpp.orig 2016-01-22 18:12:28 UTC +++ test/graph/filter_validator.cpp @@ -14,7 +14,14 @@ #include "gtest/gtest.h" extern "C" { +#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" --- 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)