From nobody Sat Dec 18 17:41:19 2021 X-Original-To: dev-commits-ports-branches@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 BD02218E5D12; Sat, 18 Dec 2021 17:41:19 +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 4JGY7331jDz4bsN; Sat, 18 Dec 2021 17:41:19 +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 47C0D13BBC; Sat, 18 Dec 2021 17:41:19 +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 1BIHfJr8092513; Sat, 18 Dec 2021 17:41:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BIHfJHC092512; Sat, 18 Dec 2021 17:41:19 GMT (envelope-from git) Date: Sat, 18 Dec 2021 17:41:19 GMT Message-Id: <202112181741.1BIHfJHC092512@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: "Tobias C. Berner" Subject: git: 8bf5428a441b - 2021Q4 - x11-toolkits/qt5-quick3d: switch to use bundled assimp List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2021Q4 X-Git-Reftype: branch X-Git-Commit: 8bf5428a441be3d28e2ede460fe5d57ab663b462 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639849279; 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=zqaN6nWAzhCBzePv9v2PcSYl1QEpgRtQg3rzsgJIm+g=; b=t1WMsw6XgoyIuCp7GxqlbQB45AnZz05D+fyI43geyS+uZodjw+nNvnfxyPhDj7YIFbI0IA A/oLLAlHRv9e6+0gsl2+g5VdE/ypFsKdrRSr87DQ+Fla5me/SgjghrwqvKt3B4iBtyBYbf 7npk7j+W/k7z/aowkj0+ILn4887m0DUS8SBd645oJ2BolIuQ9kBPB+CXc/2DpUWcaI9IK+ p8Ew1myig5MF3qnv+Zngw1CNCZgJM99Mn+zWXYKhQdhXPiGtuWpr9g4z4j7NWKFjl4w2Tf X55gSnabgy0DNQ7iK5Pp66ypoCagr9hmLrbovh4lcVaqlJ3Tga+UtQ9EaejFvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639849279; a=rsa-sha256; cv=none; b=KF70YbC+2mf0xW0XFg2mqcXWELduqDRLo0ARZnyn9mh+RQ8FQNdEBIgPA0NKN52PMwqwPi 36TJPmOhiJ9N3+KY9W56cErFl/xKQy5ihgtZ2bIy/y21j8Tgv0WNskMf/Q10Y/7oZBvF2u /xoGlVgsPz4sFw03sVP9CLilDgia6EGNsEa+3gvw9kKzgzgQJjqkUXou7AVQd5sHkZBdgL a7b1tt/7AJ5VTToLHy78BjKudLBd1YI3u19MkpwgItzc6iHXzpacYMocJNgsj6mLlQas5/ Tyby1bN1hnKTboIIL0OCFZ9z+GM0d6pPot27QudvptDnUcb8rm7syfdYDmqx9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=8bf5428a441be3d28e2ede460fe5d57ab663b462 commit 8bf5428a441be3d28e2ede460fe5d57ab663b462 Author: Tobias C. Berner AuthorDate: 2021-12-18 17:20:44 +0000 Commit: Tobias C. Berner CommitDate: 2021-12-18 17:39:34 +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 (cherry picked from commit b452cf359ea6344ebe8fd3bf0ef91029a9a8626f) --- 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