Date: Tue, 18 May 2021 00:55:01 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 45182f52f4b6 - main - graphics/jpeg-xl: convert TEST option to USES=cmake:testing Message-ID: <202105180055.14I0t1tk047157@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=45182f52f4b6e9ea4e2cbec59519eff1c341a515 commit 45182f52f4b6e9ea4e2cbec59519eff1c341a515 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2021-05-17 13:42:20 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2021-05-18 00:47:15 +0000 graphics/jpeg-xl: convert TEST option to USES=cmake:testing --- graphics/jpeg-xl/Makefile | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/graphics/jpeg-xl/Makefile b/graphics/jpeg-xl/Makefile index bcaedd837d5b..19f2795543e7 100644 --- a/graphics/jpeg-xl/Makefile +++ b/graphics/jpeg-xl/Makefile @@ -13,8 +13,9 @@ LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/third_party/skcms/LICENSE LICENSE_FILE_ZLIB= ${WRKSRC}/third_party/lodepng/LICENSE LIB_DEPENDS= libbrotlienc.so:archivers/brotli +TEST_DEPENDS= googletest>0:devel/googletest -USES= cmake compiler:c++11-lib pkgconfig shared-mime-info +USES= cmake:testing compiler:c++11-lib localbase:ldflags pkgconfig shared-mime-info USE_GITHUB= nodefault USE_GITLAB= yes USE_LDCONFIG= yes @@ -28,9 +29,10 @@ GL_COMMIT= 9e9bce86164dc4d01c39eeeb3404d6aed85137b2 CMAKE_ON= JPEGXL_ENABLE_PLUGINS CMAKE_OFF= JPEGXL_WARNINGS_AS_ERRORS ${BENCHMARK FUZZERS TCMALLOC:L:S/^/JPEGXL_ENABLE_/} CMAKE_OFF+= ${OpenGL GLUT:L:S/^/CMAKE_DISABLE_FIND_PACKAGE_/} # sjpeg +CMAKE_OFF+= ${CMAKE_TESTING_ON} LDFLAGS+= -Wl,--as-needed # brotlicommon, GIMP/OPENEXR/PNG deps -OPTIONS_DEFINE= GIF GIMP JPEG LTO MANPAGES OPENEXR PIXBUF PNG TEST +OPTIONS_DEFINE= GIF GIMP JPEG LTO MANPAGES OPENEXR PIXBUF PNG OPTIONS_DEFAULT=GIF GIMP JPEG LTO MANPAGES OPENEXR PIXBUF PNG OPTIONS_EXCLUDE_i386= LTO # ConvolutionWithTranspose(): JXL_CHECK: out->xsize() == in.ysize() OPTIONS_EXCLUDE_powerpc64= ${"${/usr/bin/ld:L:tA}"==/usr/bin/ld.lld:?LTO:} # LLVM bug 47353 @@ -68,11 +70,6 @@ PIXBUF_USE= GNOME=gdkpixbuf2 PNG_LIB_DEPENDS= libpng.so:graphics/png PNG_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_PNG -TEST_BUILD_DEPENDS= googletest>0:devel/googletest -TEST_USES= localbase:ldflags -TEST_CMAKE_BOOL= BUILD_TESTING -TEST_TEST_TARGET= test - post-patch: @${REINPLACE_CMD} 's,/usr,${LOCALBASE},' \ ${WRKSRC}/plugins/gdk-pixbuf/jxl.thumbnailer @@ -85,6 +82,4 @@ post-patch-GIMP-off: post-patch-PIXBUF-off: @${REINPLACE_CMD} -i.nopixbuf '/gdk-pixbuf/d' ${WRKSRC}/plugins/CMakeLists.txt -pre-install-TEST-on: do-test - .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105180055.14I0t1tk047157>