From nobody Tue Jul 19 07:09:58 2022 X-Original-To: dev-commits-ports-all@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 4Ln92G5x5pz4WXtp; Tue, 19 Jul 2022 07:09:58 +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 4Ln92G5Qcwz3lcv; Tue, 19 Jul 2022 07:09:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658214598; 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=X0kbjdG91dou6nWUlZ9xdPkXDNYAWLRzTsKzvD8oRFA=; b=gmH+S04kgkOfRGnDEUrtsVARuwhiTLaS/YNT2JIFfJz6ABlgqFw6Nz1B/8aaaCWFXlBW2o Mp52dTIEsXKSz5AIFz5oXOz1xR4mYbCq0uPqki8Kv0JfOaBthPp1SPL5Zzmasz3qe38aAp jFGzQN3V9LxExGvH3yxU1dwcBWEpY+KUHR4j2g/hywhDvb9pAMY//o76+lGjQ298HQ49Qn t7GFoG5FBwaLbqg5dxtuDbVf+uS/+ItdHArJgykYK+F+hvZxGcoSxLhWdhaz2O0asI7Ep7 wwq8TeMjKHSD8H9y9FIg/SrO1i/M0uAUBUKnxFRxgZDjVmyUtMRBGYeoGsSuCA== 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 4Ln92G4FR8z18Vm; Tue, 19 Jul 2022 07:09:58 +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 26J79wWd080895; Tue, 19 Jul 2022 07:09:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26J79w0a080894; Tue, 19 Jul 2022 07:09:58 GMT (envelope-from git) Date: Tue, 19 Jul 2022 07:09:58 GMT Message-Id: <202207190709.26J79w0a080894@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: b32b6222e87c - main - x11-toolkits/nanogui: Fix build on non-Intel architectures List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/main X-Git-Reftype: branch X-Git-Commit: b32b6222e87ce3ba54f2779ba5cd36f1d37f5b5d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658214598; 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=X0kbjdG91dou6nWUlZ9xdPkXDNYAWLRzTsKzvD8oRFA=; b=SI+UH4a1m/Wv+tjcZ57JFolp4z9wezSgeuc6gi8GD4URlRAuSjL0W8DGSyBD8vt6ZSJi+p z/KBtF+9SGEvB87Eu6qffz6YF/tdsspuCav6usSELJXjEm3g/PmJg03lKtNgjQeLwGbq8J MPrdsXMLGK/6ubfE6PjxfKdmouIupm3+5Ift2c+APy7YLCwraxoad2f/BQCt8qdoYTDW5n fQXBw+4QT3b2DBPvnH9foTp29NyJ8shuWmqddZCh19h8L8A7NOiNS0nD++k3wk871w1QZ6 EAbKYcUDtxv9uncivkQKWBAgF4Z2x1OrF6M6+3oGFMsUdBFTObnsgeID7dQFBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658214598; a=rsa-sha256; cv=none; b=QuyUrz/uB4oaBuILF8JGKNON/LT6vND9/1IO4AX0oc2WmZWY3VrOho/xwLTOFIZRL1O4R2 HW45txGD+jyQWR3SyDqVNT+OP3U79n1J9UuaXPg9UbPgBnhPsWMeTcm2uEPmCgor4g6s/8 TWiw0OJmQRClBqVCJF09gTO3nR8a3XRH0ST/BWCVueC8ONsEqvDYQi0ZqSCrb/7lMe/twD jD3BTQiqqeKi+h7laGeOBN81SSR0yGmeg4Gw3/Djo9V7vqSqSIprUACHlgeS0e0LIKTSZS F+vpqrLpHumEGYW+5kMGUxVnhwFC1PVOUuT1wmum6DzWios+x/+lM5jDf3SpNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=b32b6222e87ce3ba54f2779ba5cd36f1d37f5b5d commit b32b6222e87ce3ba54f2779ba5cd36f1d37f5b5d Author: Yuri Victorovich AuthorDate: 2022-07-19 07:08:35 +0000 Commit: Yuri Victorovich CommitDate: 2022-07-19 07:09:56 +0000 x11-toolkits/nanogui: Fix build on non-Intel architectures ... by removing bogus native compilation flags. Reported by: fallout --- 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()