From nobody Tue Apr 19 06:14:14 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 0306811DE499; Tue, 19 Apr 2022 06:14:15 +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 4KjD5y6R9yz3hmk; Tue, 19 Apr 2022 06:14:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650348854; 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=p0bDpb6aDXutLqgEhhG6V7GPME+DRkvGoBfKF7PxI48=; b=tJTVl0M2dfxUP3nO9v6xIAvisj+8El5ipapNFeeQS4T/4GFDrxvGGK5r/40ROchA+nlbkA AKO1mvlNjCUU8EEu+wxwK5V2y5AVQrpMppRv6Q6T87mgez3aMrI2sU8F2SNYaPLZrBYF9G 9i5+zUiCMN7OYRoM96Z36imEruOaYSpi3ywn4vDS4fHtoYpKU5IOe+cgaNVnAzwMVV3WKz Qn8NHPwqTnUbCYW9bTWfq1jDUv16PTSVrSkJQiBXQjSyw8o/wdxr0sGZqQG9JgvrMI86Hs 2rRG4qXvR87KRrTXg7RB2UwJhM+ZM4GDBWdY/coDiZ+lTtBrsXD57kfmxiM/wQ== 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 BD61A2209A; Tue, 19 Apr 2022 06:14:14 +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 23J6EERo092260; Tue, 19 Apr 2022 06:14:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23J6EETH092259; Tue, 19 Apr 2022 06:14:14 GMT (envelope-from git) Date: Tue, 19 Apr 2022 06:14:14 GMT Message-Id: <202204190614.23J6EETH092259@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: 67189e73e058 - 2022Q2 - x11-toolkits/nanogui: Fix several issues 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/2022Q2 X-Git-Reftype: branch X-Git-Commit: 67189e73e0583d8aa367298e20a9a26e90e066ed Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650348854; 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=p0bDpb6aDXutLqgEhhG6V7GPME+DRkvGoBfKF7PxI48=; b=vgYy3sz4BFNxnHWw2349fWi4lm6SfKRncXP2vsH3YtlISmni/lOHGy1a0LIBaKhyyHircM n8/As3A/s/TmzRn5uET0uomVXhtcdtUlfgorwV53g7dhpP+1RvpT4bKNwgvaGP2Gg3siN5 JmDsAaw27DvhnPm8JgLSGWpie1sxCcukFuNL1owkBCv69qPNSvTcrFVVpOrVqpbsw5M7gb X7f4s8mmt3a3xVXkonTUuHtHQCc1qS3WO04Xor/Sbq6oPj9WfG17Gvgv5DQ9rGvkCGzmrc 2EZic30H/Brt+legYAa9JsXCAhNGsT+qveLh4dKPT1nwcnvnokskW6RE3f/Z7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650348854; a=rsa-sha256; cv=none; b=Jz0l0BZZscZVxQEsimF6T1oVmxyMgRq67h35+SbnQ/Mj/k82+9A5UMhGYYYyNeTJ6QGn22 R0BbqaatscitETf+jFgHAkGqVFkXPAW+sGDgo6ozxJul6ZdilNsfLFI++/rco8sT23iUkI atdxeUKel9Wh1+fisDEVjs8AUUeGOm7y7D2gW66HGPH/+CELTr0dIasFVc7CAEIydLlQqS ZBX21t9/r96oeE3/wGbrL9Ebr7j0Kyg610Z1JAUJp9BgmQpVVLg5Pc+tbsZEeX7zL+g3uQ bMncyhpAtoW4QARNdlqFscbqahRZnEsO5//P2Fyo37iWALwVspaxGn3eiuRbPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=67189e73e0583d8aa367298e20a9a26e90e066ed commit 67189e73e0583d8aa367298e20a9a26e90e066ed Author: Yuri Victorovich AuthorDate: 2022-04-10 20:30:52 +0000 Commit: Yuri Victorovich CommitDate: 2022-04-19 06:14:12 +0000 x11-toolkits/nanogui: Fix several issues * nanogui doesn't depend on Eigen any more * use external glfw package * for Python, __init__.py is installed * for tests, zenity executable is installed PR: 263194 Original patch submitted by: Hiroo Ono (cherry picked from commit 563c4a8cd859eeb4657a6d54730d65bde1541d36) --- x11-toolkits/nanogui/Makefile | 19 ++++++++++--------- x11-toolkits/nanogui/files/patch-CMakeLists.txt | 25 +++++++++++++++++++++++-- x11-toolkits/nanogui/pkg-plist | 3 ++- 3 files changed, 35 insertions(+), 12 deletions(-) diff --git a/x11-toolkits/nanogui/Makefile b/x11-toolkits/nanogui/Makefile index 0af92116fc15..d61dd7a3de6c 100644 --- a/x11-toolkits/nanogui/Makefile +++ b/x11-toolkits/nanogui/Makefile @@ -1,5 +1,6 @@ PORTNAME= nanogui DISTVERSION= g20220215 +PORTREVISION= 1 CATEGORIES= x11-toolkits MAINTAINER= yuri@FreeBSD.org @@ -8,7 +9,10 @@ COMMENT= Minimalistic GUI library for OpenGL LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -USES= cmake compiler:c++17-lang eigen:3,build,run gl xorg +LIB_DEPENDS= libglfw.so:graphics/glfw +TEST_DEPENDS= zenity:x11/zenity + +USES= cmake compiler:c++17-lang gl xorg USE_GL= gl USE_XORG= x11 xcursor xi xinerama xrandr xxf86vm USE_LDCONFIG= yes @@ -23,23 +27,20 @@ GH_TUPLE= wjakob:nanovg:bf2320d1175122374a9b806d91e9e666c9336375:wjakob_nanovg/e CMAKE_ARGS= -DCMAKE_INSTALL_INCLUDEDIR=${LOCALBASE}/include \ -DCMAKE_INSTALL_DATAROOTDIR=${LOCALBASE}/lib -CMAKE_ON= NANOGUI_BUILD_GLFW -CMAKE_OFF= NANOGUI_BUILD_EXAMPLES +CMAKE_OFF= NANOGUI_BUILD_GLFW NANOGUI_BUILD_EXAMPLES OPTIONS_DEFINE= PYTHON OPTIONS_DEFAULT= PYTHON OPTIONS_SUB= yes -PYTHON_CMAKE_BOOL= NANOGUI_BUILD_PYTHON PYTHON_USES= python +PYTHON_CMAKE_BOOL= NANOGUI_BUILD_PYTHON PYTHON_CMAKE_ON= -DFREEBSD_PYTHON_DISTVERSION=${PYTHON_DISTVERSION} -post-install: # workaround for https://github.com/mitsuba-renderer/nanogui/issues/116 - @${RM} -r ${STAGEDIR}${PREFIX}/include/GLFW - post-install-PYTHON-on: - @${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} - ${MV} ${STAGEDIR}${PREFIX}/lib/nanogui*.so ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} + @${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/nanogui + ${INSTALL_DATA} ${WRKSRC}/nanogui/__init__.py ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/nanogui + ${MV} ${STAGEDIR}${PREFIX}/lib/nanogui*.so ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/nanogui do-test: @cd ${BUILD_WRKSRC} && \ diff --git a/x11-toolkits/nanogui/files/patch-CMakeLists.txt b/x11-toolkits/nanogui/files/patch-CMakeLists.txt index 690e8bffbd12..9a10b4409cb3 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-02-15 15:25:41 UTC +--- CMakeLists.txt.orig 2022-04-10 13:30:19 UTC +++ CMakeLists.txt @@ -1,6 +1,8 @@ cmake_minimum_required (VERSION 3.13..3.18) @@ -9,7 +9,28 @@ # 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) ") -@@ -580,7 +582,7 @@ if (NANOGUI_BUILD_PYTHON) +@@ -497,6 +504,12 @@ if (EXISTS /opt/vc/include) + target_include_directories(nanogui PUBLIC /opt/vc/include) + endif() + ++# Find glfw if nanogui is not compiling it internally. ++if (NOT NANOGUI_BUILD_GLFW) ++ find_package(glfw3 CONFIG REQUIRED) ++ target_link_libraries(nanogui PUBLIC glfw) ++endif() ++ + if (NANOGUI_INSTALL) + install(TARGETS nanogui + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +@@ -522,6 +535,7 @@ if (NANOGUI_INSTALL) + + set(NANOGUI_CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_DATAROOTDIR}/cmake/nanogui") + ++ include(CMakePackageConfigHelpers) + configure_package_config_file( + resources/nanoguiConfig.cmake.in nanoguiConfig.cmake + INSTALL_DESTINATION ${NANOGUI_CMAKECONFIG_INSTALL_DIR}) +@@ -580,7 +594,7 @@ if (NANOGUI_BUILD_PYTHON) list(APPEND CMAKE_PREFIX_PATH "${_tmp_dir}") find_package(pybind11 CONFIG REQUIRED) else() diff --git a/x11-toolkits/nanogui/pkg-plist b/x11-toolkits/nanogui/pkg-plist index 1b0f4f7c53e7..b5426bcda933 100644 --- a/x11-toolkits/nanogui/pkg-plist +++ b/x11-toolkits/nanogui/pkg-plist @@ -47,4 +47,5 @@ lib/cmake/nanogui/nanoguiConfigVersion.cmake lib/cmake/nanogui/nanoguiTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/nanogui/nanoguiTargets.cmake lib/libnanogui.so -%%PYTHON%%%%PYTHON_SITELIBDIR%%/nanogui_ext%%PYTHON_EXT_SUFFIX%%.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/nanogui/__init__.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/nanogui/nanogui_ext%%PYTHON_EXT_SUFFIX%%.so