From nobody Fri Apr 01 14:20:54 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id C22151A41FE1; Fri, 1 Apr 2022 14:20:54 +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 4KVMlp4SvPz3Ddw; Fri, 1 Apr 2022 14:20:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648822854; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1w8FPPTB0/Gw2Hx1vSNPZEsLG+K6PH8mqh+zE624XMQ=; b=RXgiZlRyC7k88S1WEdOTqyLHqEyS3bcZUTqkCR8s2yBKRPETrqZqfLA62GsC+1qCDDlLOk G3tkZEZH+prtpxWAybEJsGaHrC9EsDxzD8F09DFfQRcVQgg/mZOXWqGZylvDhx4Y2KWSr8 H2sfFOi2XmzFpnTJcs6W0qTKrtRseR0rU3m1zz8WqR372ypRJGQKPfwpqJF6sy/biWQYhk oHxtvFTIR/12Qn+4/oRMYzpJluAhvRkw8YjLLwAsTXpzXse8Tu2ABc8NU2cyZQr1OfDLpA 8ksYEfsoLET9FEV88pTcVZePFoprt4J/fGd8te/ArHW0lwy68UyChs1JO/Yk4A== 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 76E0C159E6; Fri, 1 Apr 2022 14:20:54 +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 231EKseb004646; Fri, 1 Apr 2022 14:20:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 231EKsEL004645; Fri, 1 Apr 2022 14:20:54 GMT (envelope-from git) Date: Fri, 1 Apr 2022 14:20:54 GMT Message-Id: <202204011420.231EKsEL004645@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 7f6220a9b5d9 - main - graphics/poppler: ignore graphics/openjpeg15 presence List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7f6220a9b5d9ee74b0564706001a5287094b0428 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648822854; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1w8FPPTB0/Gw2Hx1vSNPZEsLG+K6PH8mqh+zE624XMQ=; b=OmAShkk9IVDCe9ZmNdrpHp7hQTvCdSLTyrmTnKJCuaq55AO3NBzZ20P5DwGP3rHrH5xWNH 0X9DNjOtK9aKYIR0iv3T64uV5nESQrxZTKvxnKIuOkacNzzDWxLPQdVp2bsGJ9m0jOSc6Z 7EeVbwx2cc7jGJLa2NaojQUYZo78Cc0BZeu0QVqNo3oxEnmMpIN1zenEBFz009+xqw226+ odUnie4MM2SrsvyObiYELM0YUtiW77VqB0Dsbkx8VNTUEEn71FPY89NSVlsih9bdrf7XHX k0DnNcUCQbf81OXiysN4Oedx8sW3gJuc6eXD+O8nvn7heLxyE3AHuaERE7esiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648822854; a=rsa-sha256; cv=none; b=wu9kEGcHK0bXTCoyPKKppaFMxUiMkGoUMD2OBX8tspejnSsrRuEvsa9l3F07l0CC0znqn4 x7Nh+BtN4snCU6y/V9VH5Hrk29YdUDbQhLjidE9+hGD9zdM6CLUer0k+JWfJM/x9juqBq3 RBWt0yheMf1xoE41jOFNgx1P5n3Z7399j9E+lwqTCuLRXj6Yzbe9ZzoC2WN59jxW+aH9T7 kYMW7IhSl0Rcnm5DAQjhGnV4anYBnyAi3WDS28Wco9bGpK+qh37YjptoPMuEih9maqf2zi zpzd0LKT0rKuH/w6AJNdYSC70/QgUIbFJjP6IjmnluR3rBS2mk0xvLg0HsVx2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=7f6220a9b5d9ee74b0564706001a5287094b0428 commit 7f6220a9b5d9ee74b0564706001a5287094b0428 Author: Tobias C. Berner AuthorDate: 2022-03-31 03:58:43 +0000 Commit: Tobias C. Berner CommitDate: 2022-04-01 14:19:30 +0000 graphics/poppler: ignore graphics/openjpeg15 presence - cmake can under some non-determinstic circumstances find the OpenJPEGConfig.cmake in ${PREFIX}/lib/openjpeg-1.5 prior to the one in ${PREFIX}/lib/openjpeg2 with would be the wanted one. - Use CMAKE_IGNORE_PATH to explicitely make it not see that prefix. https://cmake.org/cmake/help/latest/variable/CMAKE_IGNORE_PATH.html#variable:CMAKE_IGNORE_PATH PR: 262888 --- graphics/poppler/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile index ea57d64e88bd..b13c08e85ac6 100644 --- a/graphics/poppler/Makefile +++ b/graphics/poppler/Makefile @@ -34,6 +34,11 @@ CMAKE_ON= ENABLE_LIBJPEG \ ENABLE_NSS \ ENABLE_SPLASH CMAKE_OFF= BUILD_GTK_TESTS +# Ensure that path ordering does not lead to openjpeg15 being found and picked +# instead of openjpeg2 on systems that have both installed +# Note: since f3ba77e14cac05d43caf35100848eeaee3bc64b4 graphics/openjpeg15 installs +# its cmake files to ${PREFIX}/lib/openjpeg15 +CMAKE_ARGS+= -DCMAKE_IGNORE_PATH:PATH=${PREFIX}/lib/openjpeg-1.5 # Slave ports. _POPPLER_SLAVES= library glib qt5 utils