From owner-svn-ports-all@freebsd.org Sat Jan 2 14:44:42 2021 Return-Path: Delivered-To: svn-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 C7E464D1FD0; Sat, 2 Jan 2021 14:44:42 +0000 (UTC) (envelope-from mandree@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D7Pmp0NRjz4SSZ; Sat, 2 Jan 2021 14:44:42 +0000 (UTC) (envelope-from mandree@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 00662170F3; Sat, 2 Jan 2021 14:44:42 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 102Eif2s088412; Sat, 2 Jan 2021 14:44:41 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 102EifnY088411; Sat, 2 Jan 2021 14:44:41 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <202101021444.102EifnY088411@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Sat, 2 Jan 2021 14:44:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r559947 - head/graphics/rawtherapee X-SVN-Group: ports-head X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: head/graphics/rawtherapee X-SVN-Commit-Revision: 559947 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Jan 2021 14:44:42 -0000 Author: mandree Date: Sat Jan 2 14:44:41 2021 New Revision: 559947 URL: https://svnweb.freebsd.org/changeset/ports/559947 Log: graphics/rawtherapee: further stability improvements - drop TCMALLOC option everywhere, it causes massive slowdowns + bump PORTREVISION to flush out old packages - revise self-tests a bit to make them easier to analyse NOTE: an OpenEXR-induced PORTREVISION bump is expected in the next few days, so you may want to hold off on manually rebuilding _8 and wait for _9. Modified: head/graphics/rawtherapee/Makefile Modified: head/graphics/rawtherapee/Makefile ============================================================================== --- head/graphics/rawtherapee/Makefile Sat Jan 2 14:38:13 2021 (r559946) +++ head/graphics/rawtherapee/Makefile Sat Jan 2 14:44:41 2021 (r559947) @@ -3,7 +3,7 @@ PORTNAME= rawtherapee PORTVERSION= 5.8 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= https://rawtherapee.com/shared/source/ \ LOCAL/mandree/ @@ -90,20 +90,14 @@ CMAKE_ARGS+= -DCMAKE_C_COMPILER_LAUNCHER=${CCACHE_BIN} .endif OPTIONS_DEFINE= DOCS NATIVE -OPTIONS_DEFINE_amd64= OPENMP TCMALLOC -OPTIONS_DEFINE_i386= OPENMP TCMALLOC -OPTIONS_DEFAULT= OPENMP TCMALLOC -# For some reason, 11.4-amd64 fails run-time tests with TCMALLOC, strip out: -OPTIONS_EXCLUDE_FreeBSD_11= TCMALLOC +OPTIONS_DEFINE_amd64= OPENMP +OPTIONS_DEFINE_i386= OPENMP +OPTIONS_DEFAULT= OPENMP NATIVE_DESC= Use -march=native (avoid for generic packages!) OPENMP_DESC= Enable OpenMP parallel processing (i386/amd64 only) -TCMALLOC_DESC= Use Google's tcmalloc instead of system allocator OPENMP_CMAKE_BOOL= OPTION_OMP -TCMALLOC_LIB_DEPENDS= libtcmalloc.so:devel/google-perftools -TCMALLOC_CMAKE_BOOL= ENABLE_TCMALLOC - .include # ------------------------------------------------------------------- @@ -175,22 +169,29 @@ TESTIMAGES= ${FILESDIR}/../testimages _check_version= ${PKGVERSION:C/.g0//} _env= LANG= LC_ALL=C LANGUAGE= DISPLAY= HOME="$$TMP" RT_SETTINGS=${WRKDIR}/rt-config RT_CACHE="$$TMP/rtcache" post-install: - @${ECHO_MSG} "===> Running smoke tests" @${RM} -f ${WRKDIR}/selftest.exitcodes ${WRKDIR}/selftest.expect - @${RM} -rf ${WRKDIR}/rt-config - ${MKDIR} ${WRKDIR}/rt-config ${WRKDIR}/rt-config/dcpprofiles ${WRKDIR}/rt-config/profiles - ${CP} ${WRKSRC}/rtengine/camconst.json ${WRKDIR}/rt-config - ${CP} ${WRKSRC}/rtdata/options/options.lin ${WRKDIR}/rt-config/options - (cd ${WRKSRC}/rtdata/ && ${COPYTREE_SHARE} "profiles dcpprofiles" ${WRKDIR}/rt-config ) - @(set -x ; TMP=$$(${MKTEMP} -d -t ${PORTNAME}) && trap "rc=$$? ; ${RM} -rf \"$$TMP\" ; exit \$$rc" 0 && \ + @(set -e; _mp=$$(/bin/df -P ${STAGEDIR}${PREFIX}/bin/rawtherapee | ${AWK} 'NR==2{print $$NF}') ; \ + _fsflags=$$(${MOUNT} -p | ${AWK} "{ if (\$$2 == \"$$_mp\") { print \$$4 } }") ; \ + case $$_fsflags in *noexec*) \ + ${TOUCH} ${WRKDIR}/selftest.expect ${WRKDIR}/selftest.exitcodes ; \ + ${ECHO_CMD} "===> Skipping smoke tests, STAGEDIR=${STAGEDIR} is on a noexec file system" ; \ + exit 0 ;; \ + esac ; \ + ${ECHO_MSG} "===> Running smoke tests" ; \ + ${RM} -rf ${WRKDIR}/rt-config ; \ + ${MKDIR} ${WRKDIR}/rt-config ${WRKDIR}/rt-config/dcpprofiles ${WRKDIR}/rt-config/profiles ; \ + ${CP} ${WRKSRC}/rtengine/camconst.json ${WRKDIR}/rt-config ; \ + ${CP} ${WRKSRC}/rtdata/options/options.lin ${WRKDIR}/rt-config/options ; \ + (cd ${WRKSRC}/rtdata/ && ${COPYTREE_SHARE} "profiles dcpprofiles" ${WRKDIR}/rt-config ) ; \ + (set -x ; TMP=$$(${MKTEMP} -d -t ${PORTNAME}) && trap "rc=$$? ; ${RM} -rf \"$$TMP\" ; exit \$$rc" 0 && \ ( set +e ; ${SETENV} ${_env} ${STAGEDIR}${PREFIX}/bin/rawtherapee -v ; \ echo $$? >&3 ) 3>&3 | ${EGREP} -q "RawTherapee, version ${_check_version:C/_.*//:C/,.*//}|cannot open display:" && \ ( set +e ; ${SETENV} ${_env} ${STAGEDIR}${PREFIX}/bin/rawtherapee-cli ; \ echo $$? >&3 ) 3>&3 | ${EGREP} -q "RawTherapee, version ${_check_version:C/_.*//:C/,.*//}" && \ - expect='0\n0\n' && \ + expect=$$'0\n0\n' && \ onefile=$$(ls "${TESTIMAGES}"/* | head -1) && \ if test -d "${TESTIMAGES}" && test -n "$$onefile" -a -r "$$onefile" ; then \ - expect='0\n0\n0\n0\n0\n' && \ + expect=$$'0\n0\n0\n0\n0\n' && \ ( set +e ; \ /usr/bin/time ${SETENV} ${_env} ${STAGEDIR}${PREFIX}/bin/rawtherapee-cli \ -o "$$TMP" -q -f -c ${TESTIMAGES} ; echo $$? >&3 ; \ @@ -200,7 +201,9 @@ post-install: -o "$$TMP" -q -s -Y -tz -c ${TESTIMAGES} ; echo $$? >&3 ) 3>&3 ; \ fi ; \ ls -Rlbai "${TESTIMAGES}" "$${TMP}" || :; \ - ${PRINTF} "%s" "$$expect" >&4 ) 3>${WRKDIR}/selftest.exitcodes 4>${WRKDIR}/selftest.expect ; \ - ${PRINTF} "$$(cat ${WRKDIR}/selftest.expect)" | cmp - ${WRKDIR}/selftest.exitcodes || { ${ECHO_CMD} '===> !!! SELF-TEST FAILED !!! <===' ; exit 1 ; } + ${PRINTF} "%s" "$$expect" >&4 ) ) 3>${WRKDIR}/selftest.exitcodes 4>${WRKDIR}/selftest.expect ; \ + ${HEAD} ${WRKDIR}/selftest.exitcodes ${WRKDIR}/selftest.expect ; \ + cmp ${WRKDIR}/selftest.expect ${WRKDIR}/selftest.exitcodes \ + || { ${ECHO_CMD} '===> !!! SELF-TEST FAILED !!! <===' ; exit 1 ; } .include