From owner-dev-commits-ports-all@freebsd.org Tue May 18 00:55:02 2021 Return-Path: Delivered-To: dev-commits-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 5D640638256; Tue, 18 May 2021 00:55:02 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Fkcwk15wFz3HxP; Tue, 18 May 2021 00:55:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0AD8B1607A; Tue, 18 May 2021 00:55:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14I0t12g047158; Tue, 18 May 2021 00:55:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14I0t1tk047157; Tue, 18 May 2021 00:55:01 GMT (envelope-from git) Date: Tue, 18 May 2021 00:55:01 GMT Message-Id: <202105180055.14I0t1tk047157@gitrepo.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 From: Jan Beich Subject: git: 45182f52f4b6 - main - graphics/jpeg-xl: convert TEST option to USES=cmake:testing MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 45182f52f4b6e9ea4e2cbec59519eff1c341a515 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 May 2021 00:55:02 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=45182f52f4b6e9ea4e2cbec59519eff1c341a515 commit 45182f52f4b6e9ea4e2cbec59519eff1c341a515 Author: Jan Beich AuthorDate: 2021-05-17 13:42:20 +0000 Commit: Jan Beich 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