From nobody Sun Apr 10 21:00:25 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 F17A41A93A32; Sun, 10 Apr 2022 21:00: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 4Kc4Bf3BB8z3hP7; Sun, 10 Apr 2022 21:00:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649624426; 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=mGsI4I9+ukmmwGZeKbz8knz0HJAhcKlHtcaR8hlFHnw=; b=dYE8bsv9V3s3Xn5Kd9drriI58t6jZm/KhGS+6O1Smh7M11qv46WCQCH3jG2Cb2xaNFbzbN dm8cEXaF7dk1Q8WR/Q6f0Um8m6bIXqsU4oIihECdwqhIQ+p5KegtXrSjdwQp29hbr065a5 kLQ+JuXs9GusR0SiWA6HM9JG5dfhnFpw5QBcD8PIZ7nzqYzF3TOCx54EGYFUwmwDd70KPS yyIjXXLqD35AiERtzbS/dIbb+DBWym/43pHB7pFhQcLrGRZjnG5jh0Waer85dHgjjJwa+g wIlnrCTbFLtD2MLg0M1vBYsDZ+33SVIFUnR+gzExBkAIRBrGCrHsN09edIGiWg== 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 752FC15954; Sun, 10 Apr 2022 21:00:25 +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 23AL0PZt076972; Sun, 10 Apr 2022 21:00:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23AL0P0Y076971; Sun, 10 Apr 2022 21:00:25 GMT (envelope-from git) Date: Sun, 10 Apr 2022 21:00:25 GMT Message-Id: <202204102100.23AL0P0Y076971@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: 563c4a8cd859 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 563c4a8cd859eeb4657a6d54730d65bde1541d36 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649624426; 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=mGsI4I9+ukmmwGZeKbz8knz0HJAhcKlHtcaR8hlFHnw=; b=VzT6ava+X+wScinK/18NPlzEKXJ1mbq7BHTcVPodT3tKSr90Sa7tFeNtUNcOPuQhUlpyMI 4LXfnj3QRc00+Vlp4oGyXsQGIqgFe4Yck5jY9iEOfkYoJsCijxvgFxGiqh2ZD2svZmHNyJ 5Ee9tA5/AO8X1fTBEfo0Ady3ODH5PeV7C18qfx1DbKggO1ksyO/8luxl2oFlox3ZQf6fFV c1wrrEgdXtABehlZbfveY2jWI1hqYgHr9uBtWDy89dPBErXKpLLVnvMyMmRivNSn63cCeN gPHRW1+22dSXDyK+xC5B0uWb8ZjDyp1XeWAFT5FnbeU9orMe7aiNnMjkXYr/qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649624426; a=rsa-sha256; cv=none; b=HbJ4tF7Nsgb66EmVuqdoBahIvt7smVtTHoEVwIpV87hHl1XVVR/xO4S4iE2TcTfUFjqjNv 7GuqNLhZzPgTgUGtW7fkEswZBFa3IKS7mOsZKV9YRVAoRJwx16ENS4v0Yqq2pHAX/SZVCQ 5s1FEunHZRPKVtRYLO3fQJ6cdLsHU8VMLMkVpuG208sUDUnRDJXDiYBwIzQl/czG0z3sfg 6/YNbQswTwgamB6UGOfBBrDKE/R+QjJEctlLq9PIVuT2dffxLYsrFK51hopSptv08yRgxQ aPmXpRHzrv/MKSoBOtCQpIU4MJCvR1aw5K/UXLF5L02rGBT4qeRBM384sT4iAw== 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=563c4a8cd859eeb4657a6d54730d65bde1541d36 commit 563c4a8cd859eeb4657a6d54730d65bde1541d36 Author: Yuri Victorovich AuthorDate: 2022-04-10 20:30:52 +0000 Commit: Yuri Victorovich CommitDate: 2022-04-10 21:00:11 +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 --- 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