From nobody Sat Dec 18 17:36:03 2021 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 BBC5B18E41A5; Sat, 18 Dec 2021 17:36:03 +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 4JGY0z3b1zz4b6x; Sat, 18 Dec 2021 17:36:03 +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 5ADD81383D; Sat, 18 Dec 2021 17:36:03 +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 1BIHa30H080433; Sat, 18 Dec 2021 17:36:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BIHa3Jt080432; Sat, 18 Dec 2021 17:36:03 GMT (envelope-from git) Date: Sat, 18 Dec 2021 17:36:03 GMT Message-Id: <202112181736.1BIHa3Jt080432@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: b452cf359ea6 - main - x11-toolkits/qt5-quick3d: switch to use bundled assimp 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: b452cf359ea6344ebe8fd3bf0ef91029a9a8626f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639848963; 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=w26GTDmjrue+eguzbFDbZkOXTo116zUH5Bco/XiYa9s=; b=xPHkWuhRnpo7UD20+YTW6ihHmZQbUXF6BEuWODa1l05ylfgEb8+Frp4/f5y0x38Uk1yEIr OYWnf8Bjly+44pyaGGO+lq48qjc520YwmbuXiLrQtx346YZf/NpddWEyPgPTGqOo7FkcJW y1k7toYSHTJpsoD93iM5iaj4ZQzGJV8+ntsqQfZaL3HAPwOVmzbP0C0u112t/96I3ttvS1 we33KmLAA6X7OoNJMuWuAw5Sog2WSF4e62gHOqDAmjyxpZxpOqk9h5atbohGMZGzC/9Rdq tXQdRWFt4MDV8vOiuPXFUPLdsbetIGNJT02CdVNK9QVDQSO/xnP4UqLd3j8EgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639848963; a=rsa-sha256; cv=none; b=ovwg3FQW7ir1EYCFCHrA6W6UMWQ4cX90lp5hQXrUzLmaBFYz1/rpcBmjr+hm08I/QrhVb7 hVVSCwxDu9QWU0UPkLGUK1Cbn2m1Zn7ljrC5F3SyKRD2KTbD1Q/NWlUQfjgzQv+UYwPG/1 aJRsqDNU4CKDagTt6RM0bB2p5z12Ge84Ete6l0KFb+Q+QQhJNkHNsVKnOadmgmWVXdcFu6 lbF2ouuyiNoohMChJB0zn5K4oS+jfl9+oJNxG4CBH+gAsUbvHgNb6qPYyjqkTXPFtEeXZu bgv429mUi76MPnXE0B9Dl8CUNFQfU+Su5ZxJ+GnPOgQAkGgw/K6P+jBwngeUiQ== 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=b452cf359ea6344ebe8fd3bf0ef91029a9a8626f commit b452cf359ea6344ebe8fd3bf0ef91029a9a8626f Author: Tobias C. Berner AuthorDate: 2021-12-18 17:20:44 +0000 Commit: Tobias C. Berner CommitDate: 2021-12-18 17:35:53 +0000 x11-toolkits/qt5-quick3d: switch to use bundled assimp Quick3d is at the moment not compatible with assimp-5.1.0. In poudriere, due to assimp not being available, the port was already built with the bundled assimp version. For builds in a non-clean-room environment, explitely specify, that we want the bundled one too. PR: 260355 Reported by: Bertrand Petit --- x11-toolkits/qt5-quick3d/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/x11-toolkits/qt5-quick3d/Makefile b/x11-toolkits/qt5-quick3d/Makefile index e02d9c5b84e8..7d1b8dfeae02 100644 --- a/x11-toolkits/qt5-quick3d/Makefile +++ b/x11-toolkits/qt5-quick3d/Makefile @@ -1,6 +1,6 @@ PORTNAME= quick3d DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- @@ -11,6 +11,7 @@ USES= compiler:c++11-lang qmake qt-dist:5 USE_QT= core declarative gui network opengl \ buildtools_build +QMAKE_CONFIGURE_ARGS= --quick3d-assimp=qt QT_BINARIES= yes .include