From owner-svn-ports-head@freebsd.org Thu Feb 25 18:32:24 2021 Return-Path: Delivered-To: svn-ports-head@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 5DDBA56C35B; Thu, 25 Feb 2021 18:32:24 +0000 (UTC) (envelope-from jbeich@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 4DmhGc2GYnz3ByR; Thu, 25 Feb 2021 18:32:24 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 412361C36D; Thu, 25 Feb 2021 18:32:24 +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 11PIWOtV076208; Thu, 25 Feb 2021 18:32:24 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11PIWODi076207; Thu, 25 Feb 2021 18:32:24 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202102251832.11PIWODi076207@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 25 Feb 2021 18:32:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r566548 - head/graphics/jpeg-xl X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/graphics/jpeg-xl X-SVN-Commit-Revision: 566548 X-SVN-Commit-Repository: ports 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.34 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: Thu, 25 Feb 2021 18:32:24 -0000 Author: jbeich Date: Thu Feb 25 18:32:23 2021 New Revision: 566548 URL: https://svnweb.freebsd.org/changeset/ports/566548 Log: graphics/jpeg-xl: enable LTO by default 3% faster at least with -s 9 (tortoise) and 2100x2800 input. Beware of dragons on non-amd64 e.g., $ cjxl -s 9 foo.png foo.jxl J P E G \/ | /\ |_ e n c o d e r [v0.3.2 | SIMD supported: SSE4,Scalar] Read 2100x2800 image, 47.7 MP/s Encoding [VarDCT, d1.000, tortoise], 8 threads. lib/jxl/butteraugli/butteraugli.cc:99: JXL_CHECK: out->xsize() == in.ysize() Illegal instruction Modified: head/graphics/jpeg-xl/Makefile (contents, props changed) Modified: head/graphics/jpeg-xl/Makefile ============================================================================== --- head/graphics/jpeg-xl/Makefile Thu Feb 25 18:26:19 2021 (r566547) +++ head/graphics/jpeg-xl/Makefile Thu Feb 25 18:32:23 2021 (r566548) @@ -3,6 +3,7 @@ PORTNAME= jpeg-xl DISTVERSIONPREFIX= v DISTVERSION= 0.3.2 +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org @@ -31,8 +32,10 @@ CMAKE_OFF= JPEGXL_WARNINGS_AS_ERRORS ${BENCHMARK FUZZE CMAKE_OFF+= ${OpenGL GLUT:L:S/^/CMAKE_DISABLE_FIND_PACKAGE_/} # sjpeg LDFLAGS+= -Wl,--as-needed # brotlicommon, GIMP/OPENEXR/PNG deps -OPTIONS_DEFINE= GIF GIMP JPEG OPENEXR PIXBUF PNG TEST -OPTIONS_DEFAULT=GIF GIMP JPEG OPENEXR PIXBUF PNG +OPTIONS_DEFINE= GIF GIMP JPEG LTO OPENEXR PIXBUF PNG TEST +OPTIONS_DEFAULT=GIF GIMP JPEG LTO 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 OPTIONS_SUB= yes GIF_LIB_DEPENDS= libgif.so:graphics/giflib @@ -45,6 +48,13 @@ GIMP_LIB_DEPENDS= libgegl-0.4.so:graphics/gegl \ JPEG_USES= jpeg JPEG_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_JPEG + +LTO_CMAKE_BOOL= CMAKE_INTERPROCEDURAL_OPTIMIZATION +LTO_CMAKE_ON= -DCMAKE_POLICY_DEFAULT_CMP0069:STRING=NEW +.if exists(/usr/bin/ld.lld) && ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld +# --plugin isn't supported by old GNU ld.bfd in base +LTO_LDFLAGS= -fuse-ld=lld +.endif OPENEXR_LIB_DEPENDS= libHalf.so:graphics/ilmbase \ libIlmImf.so:graphics/openexr