From nobody Tue Jul 19 07:10:26 2022 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 4Ln92p583Fz4WY5R; Tue, 19 Jul 2022 07:10:26 +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 4Ln92p4RMKz3mV1; Tue, 19 Jul 2022 07:10:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658214626; 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=Ve73HWEGuS64EgrWi6sASo9oV03fMLUliG1QzuZOk7U=; b=sduQrW6ZMNeWVRqC/zxMjAMn78lJIGiAYpnrlyJ1lvizZwJdLuKBqoxpzz0VvcjpavH/+1 OWSeMwcJTMA0uc2+zdwGEAtdr1hi+6LRh9EZ4ynY46auk3zh9XdlMb3hKp2ceQKz7sZ8LK pdCMFVnbHDI3BEwawQcWrQlVp1d4UYeKYi+nvLkpYBllxfdJ9avY+7Tn0OTm/1oCR7aMMv NCKd2ClPvJfw0D0Gcaj5nL9ydqlkuwd2/Ud4/PI3+hj09x/DQet/QpFHUYTnw069iwhAUF j5aAp2Dw8mQ2LzWYTudIJcB6IktfubaQS0G7fgoXgIxyB0gvH7VFf/IHKvqaPQ== 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 4Ln92p3WhDz193B; Tue, 19 Jul 2022 07:10:26 +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 26J7AQsH089363; Tue, 19 Jul 2022 07:10:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26J7AQcK089362; Tue, 19 Jul 2022 07:10:26 GMT (envelope-from git) Date: Tue, 19 Jul 2022 07:10:26 GMT Message-Id: <202207190710.26J7AQcK089362@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yuri Victorovich Subject: git: 3087799ebc77 - 2022Q3 - x11-toolkits/nanogui: Fix build on non-Intel architectures 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q3 X-Git-Reftype: branch X-Git-Commit: 3087799ebc778e095161db8c9cb3cc72207bc464 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658214626; 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=Ve73HWEGuS64EgrWi6sASo9oV03fMLUliG1QzuZOk7U=; b=mNPwIDzFvfbjp1I9wL0LJ1gqPHGOggF2JY0JYx261cuXJqC4eWsFEST15mIsvFX2t7vrrE iUTAOk7Qf0hJMa/T6nI51tUlzN1mwW6eliFKjyNss99p2aoFbEOsmjB1RFdFDaVjBVL4MK QO/PWVyTGlnA3aGxHmDKP9UcKiVfRL8DmzTrB1iGnBrF3KIhwHLcD5m/HwhVqTZYXvNObz oT6bX2kVS2DtPuX/pjmYayOZpFQ5f5k5wqZ9hAqYrbmoEPxRSjWCupli9bguIWbn+AYhzE Ol8y+SLtyaZ1XT16ey8sHWPykhTFtwt35dehTT/JogH595CZtPR/mdWYfvZPCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658214626; a=rsa-sha256; cv=none; b=ri2LpXge/4iq7P3nxxGrUxQJWJh7pMcqP3RFaEj9XfC6GCZUvJKFaAoxOTAAu88NH1ozZw TFJEBcnhBAEK4LyOculSpUHZVsd9Qi5C4zsDGe15qamYMjU/f+j5Xbp9WqYK5yI7zTYiQS uuHx36JG8SacvFsaLZ/Cz4j6vjo5hNorKsQkyXw9eOKqyvH74u7/mhDRxVY7xuKT4oJ4X7 XkSwYsdFZv9JGCAetMYAAZzN/9V4WHxEkv359ozXxnrIO7zcMXC0BQBo9YJsgzFOl+7Qe3 zbPAXExI9woXAN4nLAQNJaAEv7SdF3R6crsyoS/ZH/ITdaSIW+Gfj73Lp1TBxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=3087799ebc778e095161db8c9cb3cc72207bc464 commit 3087799ebc778e095161db8c9cb3cc72207bc464 Author: Yuri Victorovich AuthorDate: 2022-07-19 07:08:35 +0000 Commit: Yuri Victorovich CommitDate: 2022-07-19 07:10:19 +0000 x11-toolkits/nanogui: Fix build on non-Intel architectures ... by removing bogus native compilation flags. Reported by: fallout (cherry picked from commit b32b6222e87ce3ba54f2779ba5cd36f1d37f5b5d) --- x11-toolkits/nanogui/Makefile | 2 -- x11-toolkits/nanogui/files/patch-CMakeLists.txt | 24 ++++++++++++++++++++---- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/x11-toolkits/nanogui/Makefile b/x11-toolkits/nanogui/Makefile index 8ea7405e6152..d61dd7a3de6c 100644 --- a/x11-toolkits/nanogui/Makefile +++ b/x11-toolkits/nanogui/Makefile @@ -9,8 +9,6 @@ COMMENT= Minimalistic GUI library for OpenGL LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BROKEN_aarch64= error: the clang compiler does not support '-march=nehalem', see https://github.com/mitsuba-renderer/nanogui/issues/118 - LIB_DEPENDS= libglfw.so:graphics/glfw TEST_DEPENDS= zenity:x11/zenity diff --git a/x11-toolkits/nanogui/files/patch-CMakeLists.txt b/x11-toolkits/nanogui/files/patch-CMakeLists.txt index 9a10b4409cb3..296032ec8234 100644 --- a/x11-toolkits/nanogui/files/patch-CMakeLists.txt +++ b/x11-toolkits/nanogui/files/patch-CMakeLists.txt @@ -1,4 +1,4 @@ ---- CMakeLists.txt.orig 2022-04-10 13:30:19 UTC +--- CMakeLists.txt.orig 2022-02-15 15:25:41 UTC +++ CMakeLists.txt @@ -1,6 +1,8 @@ cmake_minimum_required (VERSION 3.13..3.18) @@ -9,7 +9,23 @@ # Extract project version from source file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/include/nanogui/common.h" nanogui_version_defines REGEX "#define NANOGUI_VERSION_(MAJOR|MINOR|PATCH) ") -@@ -497,6 +504,12 @@ if (EXISTS /opt/vc/include) +@@ -78,6 +80,7 @@ endif() + # default. You may want to set MTS_NATIVE_FLAGS to "-march=native" to use all + # instructions available on a particular machine. + ++if (FALSE) # disable NANOGUI_NATIVE_FLAGS_DEFAULT to allow to build on all architectures + if (MSVC) + set(NANOGUI_NATIVE_FLAGS_DEFAULT "") + elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") +@@ -86,6 +89,7 @@ elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm + else() + set(NANOGUI_NATIVE_FLAGS_DEFAULT "-march=nehalem") + endif() ++endif() + + option(NANOGUI_BUILD_EXAMPLES "Build NanoGUI example application?" ON) + option(NANOGUI_BUILD_SHARED "Build NanoGUI as a shared library?" ${NANOGUI_BUILD_SHARED_DEFAULT}) +@@ -497,6 +501,12 @@ if (EXISTS /opt/vc/include) target_include_directories(nanogui PUBLIC /opt/vc/include) endif() @@ -22,7 +38,7 @@ if (NANOGUI_INSTALL) install(TARGETS nanogui LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -@@ -522,6 +535,7 @@ if (NANOGUI_INSTALL) +@@ -522,6 +532,7 @@ if (NANOGUI_INSTALL) set(NANOGUI_CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_DATAROOTDIR}/cmake/nanogui") @@ -30,7 +46,7 @@ configure_package_config_file( resources/nanoguiConfig.cmake.in nanoguiConfig.cmake INSTALL_DESTINATION ${NANOGUI_CMAKECONFIG_INSTALL_DIR}) -@@ -580,7 +594,7 @@ if (NANOGUI_BUILD_PYTHON) +@@ -580,7 +591,7 @@ if (NANOGUI_BUILD_PYTHON) list(APPEND CMAKE_PREFIX_PATH "${_tmp_dir}") find_package(pybind11 CONFIG REQUIRED) else()