From nobody Sat Dec 11 09:09:10 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 4A4E818E470D; Sat, 11 Dec 2021 09:09:11 +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 4JB25M05hBz3s0D; Sat, 11 Dec 2021 09:09:11 +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 D2F953322; Sat, 11 Dec 2021 09:09:10 +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 1BB99AGj013533; Sat, 11 Dec 2021 09:09:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BB99AmQ013532; Sat, 11 Dec 2021 09:09:10 GMT (envelope-from git) Date: Sat, 11 Dec 2021 09:09:10 GMT Message-Id: <202112110909.1BB99AmQ013532@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: 4b0e25639b72 - main - graphics/blender-lts28: prepare for cmake-3.22 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: 4b0e25639b7290d5009ebfda073bb2364da9172f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639213751; 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=dUTfWjWBLP9oD4Ughfs7B2V+r8CCwz8v5sZinnswP70=; b=PtkdQ2xOn7FNb/wRAclAzC32TEDOwSi29uGmwWtjrlbw3gWjZV04AH5PrTxtpmwg9b6LTq Dmds3qeRlRX5NBFjJOmeXWNWqZ4WeYIpjnzSMLJPYw/YvHssjC1Fs33PF4eW0czogTcDtg Zg8IQTjesAc2PF+mOtNi7X+x7QgkOgkz7F1RQT/Fc/Dq1YrFEKuiXvwzwPOEBRmIzWd9B5 3eCx+6aKvjj20t1JFxybMiqZybFm+N2ygehsVMO61CRoTBbTA8vfIynHSxZS3PpW5gLStP L5J1inX22BtbLKaS+9Cvo6U+AFaCPRXJhhfKnnT8OOdIyppWh4x7V9Qu72nkog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639213751; a=rsa-sha256; cv=none; b=HZxUMgjPMRB0PMVMFZzl6bvZIIyAwf6jFOAGdcb+3KlEDo2QnZQyJAG/3msbiAg7UV/upS L8ho69pvR9Ov6rufTDf8Gb+SLxlB2AjabE4gf1cBN3mpSFgTFxxcB+7o1A1nofelPju8Pi PTbTNe716dayKURA9b1Eu3o8b5INiHHNcftE4e2PGxzwzHG3t9VkNe/fCRzjOUW+sDTSr0 ThMNXncVR+Fz8OVtIBKwGkgM0f7NZycQwh+r6RFDsM6hl0leP/tu4z2bOZNYuULqNcHKMs CyRiCpaDee8WQ9jAUhUu0F2GHwZ4OAVmlO6cckYfjKN2z1Fsw4xrNqlrxYsYBQ== 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=4b0e25639b7290d5009ebfda073bb2364da9172f commit 4b0e25639b7290d5009ebfda073bb2364da9172f Author: Tobias C. Berner AuthorDate: 2021-12-11 09:04:27 +0000 Commit: Tobias C. Berner CommitDate: 2021-12-11 09:05:17 +0000 graphics/blender-lts28: prepare for cmake-3.22 PR: 260123 --- graphics/blender-lts28/files/patch-CMakeLists.txt | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/graphics/blender-lts28/files/patch-CMakeLists.txt b/graphics/blender-lts28/files/patch-CMakeLists.txt index ee48fd245d84..f138a4bee9da 100644 --- a/graphics/blender-lts28/files/patch-CMakeLists.txt +++ b/graphics/blender-lts28/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2019-07-31 13:12:04 UTC +--- CMakeLists.txt.orig 2021-02-23 09:13:59 UTC +++ CMakeLists.txt -@@ -647,11 +647,6 @@ if(NOT WITH_PYTHON) +@@ -613,11 +613,6 @@ if(NOT WITH_PYTHON) set(WITH_DRACO OFF) endif() @@ -11,4 +11,13 @@ - # enable boost for cycles, audaspace or i18n # otherwise if the user disabled - if(NOT WITH_BOOST) + +@@ -1552,7 +1547,7 @@ elseif( + CMAKE_C_COMPILER_ID MATCHES "Intel" + ) + # TODO(sergey): Do we want c++11 or gnu-c++11 here? +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") + else() + message(FATAL_ERROR "Unknown compiler ${CMAKE_C_COMPILER_ID}, can't enable C++11 build") + endif()