Index: head/graphics/sekrit-twc-zimg/Makefile =================================================================== --- head/graphics/sekrit-twc-zimg/Makefile (revision 435887) +++ head/graphics/sekrit-twc-zimg/Makefile (revision 435888) @@ -1,62 +1,62 @@ # $FreeBSD$ PORTNAME= zimg -PORTVERSION= 2.4 +PORTVERSION= 2.5 DISTVERSIONPREFIX= release- CATEGORIES= graphics PKGNAMEPREFIX= ${GH_ACCOUNT}- MAINTAINER= jbeich@FreeBSD.org COMMENT= Scaling, colorspace conversion, and dithering library LICENSE= WTFPL2 LICENSE_NAME= Do What The Fuck You Want To Public License version 2 LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_PERMS= ${_LICENSE_PERMS_DEFAULT} 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 435887) +++ head/graphics/sekrit-twc-zimg/distinfo (revision 435888) @@ -1,3 +1,3 @@ -TIMESTAMP = 1485025143 -SHA256 (sekrit-twc-zimg-release-2.4_GH0.tar.gz) = 996ea0e446df6ff4d6cb9c04a77d60978eca47c32d3785cd63fe8c29a9523d1f -SIZE (sekrit-twc-zimg-release-2.4_GH0.tar.gz) = 193791 +TIMESTAMP = 1489128996 +SHA256 (sekrit-twc-zimg-release-2.5_GH0.tar.gz) = 50b2bcc49e51cd36011a0c363ff914a81b6f161aefdffeaa2bc4a4627c13784d +SIZE (sekrit-twc-zimg-release-2.5_GH0.tar.gz) = 213054 Index: head/graphics/sekrit-twc-zimg/files/patch-test_resize_resize__impl__avx2__test.cpp =================================================================== --- head/graphics/sekrit-twc-zimg/files/patch-test_resize_resize__impl__avx2__test.cpp (revision 435887) +++ head/graphics/sekrit-twc-zimg/files/patch-test_resize_resize__impl__avx2__test.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- test/resize/resize_impl_avx2_test.cpp.orig 2016-05-08 20:08:38 UTC -+++ test/resize/resize_impl_avx2_test.cpp -@@ -9,6 +9,8 @@ - #include "gtest/gtest.h" - #include "graph/filter_validator.h" - -+#include // NAN -+ - namespace { - - void test_case(const zimg::resize::Filter &filter, bool horizontal, unsigned src_w, unsigned src_h, unsigned dst_w, unsigned dst_h, Property changes on: head/graphics/sekrit-twc-zimg/files/patch-test_resize_resize__impl__avx2__test.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/sekrit-twc-zimg/files/patch-test_resize_resize__impl__test.cpp =================================================================== --- head/graphics/sekrit-twc-zimg/files/patch-test_resize_resize__impl__test.cpp (revision 435887) +++ head/graphics/sekrit-twc-zimg/files/patch-test_resize_resize__impl__test.cpp (nonexistent) @@ -1,36 +0,0 @@ -test/resize/resize_impl_test.cpp:37:3: error: no matching conversion for functional-style cast from - 'std::__1::unique_ptr >' to '::testing::AssertionResult' - ASSERT_TRUE(filter); - ^~~~~~~~~~~~~~~~~~~ -/usr/local/include/gtest/gtest.h:1921:3: note: expanded from macro 'ASSERT_TRUE' - GTEST_TEST_BOOLEAN_(condition, #condition, false, true, \ - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -/usr/local/include/gtest/internal/gtest-internal.h:1111:7: note: expanded from macro - 'GTEST_TEST_BOOLEAN_' - ::testing::AssertionResult(expression)) \ - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -/usr/local/include/gtest/gtest.h:260:3: note: candidate constructor not viable: no known conversion - from 'std::__1::unique_ptr >' to 'const testing::AssertionResult' for - 1st argument - AssertionResult(const AssertionResult& other); - ^ -/usr/local/include/gtest/gtest.h:262:12: note: candidate constructor not viable: no known conversion - from 'std::__1::unique_ptr >' to 'bool' for 1st argument - explicit AssertionResult(bool success) : success_(success) {} - ^ -1 error generated. - ---- test/resize/resize_impl_test.cpp.orig 2017-01-21 18:59:03 UTC -+++ test/resize/resize_impl_test.cpp -@@ -35,7 +35,7 @@ void test_case(const zimg::PixelFormat & - .set_subwidth(subwidth_factor * (horizontal ? src_w : src_h)) - .create(); - -- ASSERT_TRUE(filter); -+ ASSERT_TRUE(static_cast(filter)); - validate_filter(filter.get(), src_w, src_h, format, expected_sha1[sha1_idx++]); - } - } Property changes on: head/graphics/sekrit-twc-zimg/files/patch-test_resize_resize__impl__test.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/sekrit-twc-zimg/files/patch-test_resize_resize__impl__sse2__test.cpp =================================================================== --- head/graphics/sekrit-twc-zimg/files/patch-test_resize_resize__impl__sse2__test.cpp (revision 435887) +++ head/graphics/sekrit-twc-zimg/files/patch-test_resize_resize__impl__sse2__test.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- test/resize/resize_impl_sse2_test.cpp.orig 2016-05-08 20:08:38 UTC -+++ test/resize/resize_impl_sse2_test.cpp -@@ -7,6 +7,8 @@ - #include "gtest/gtest.h" - #include "graph/filter_validator.h" - -+#include // INFINITY -+ - namespace { - - void test_case(const zimg::resize::Filter &filter, bool horizontal, unsigned src_w, unsigned src_h, unsigned dst_w, unsigned dst_h, Property changes on: head/graphics/sekrit-twc-zimg/files/patch-test_resize_resize__impl__sse2__test.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property