Index: head/x11-toolkits/nanogui/Makefile =================================================================== --- head/x11-toolkits/nanogui/Makefile (revision 466522) +++ head/x11-toolkits/nanogui/Makefile (revision 466523) @@ -1,44 +1,43 @@ # $FreeBSD$ PORTNAME= nanogui -DISTVERSIONPREFIX= v -DISTVERSION= g20171202 +DISTVERSION= g20180318 CATEGORIES= x11-toolkits MAINTAINER= yuri@FreeBSD.org COMMENT= Minimalistic GUI library for OpenGL LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libglfw.so:graphics/glfw USES= cmake:outsource compiler:c++14-lang eigen:3,build,run USE_GITHUB= yes GH_ACCOUNT= wjakob -GH_TAGNAME= 3e0b2c8 +GH_TAGNAME= be13c9b GH_TUPLE= wjakob:nanovg:ab38df8:nanovg/ext/nanovg USE_GL= gl USE_XORG= x11 xcursor xi xinerama xrandr xxf86vm USE_LDCONFIG= yes CMAKE_OFF= NANOGUI_BUILD_EXAMPLE GLFW_BUILD_EXAMPLES OPTIONS_DEFINE= PYTHON OPTIONS_DEFAULT= PYTHON OPTIONS_SUB= yes PYTHON_CMAKE_BOOL= NANOGUI_BUILD_PYTHON PYTHON_USES= python PYTHON_BUILD_DEPENDS= ${LOCALBASE}/include/pybind11/pybind11.h:devel/pybind11 PYTHON_RUN_DEPENDS= pybind11>0:devel/pybind11 post-install: ${INSTALL_DATA} ${WRKSRC}/ext/nanovg/src/*.h ${STAGEDIR}${PREFIX}/include/nanogui/ # bundled dependency headers aren't installed post-install-PYTHON-on: @${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} ${MV} ${STAGEDIR}${PREFIX}/lib/nanogui.so ${STAGEDIR}${PYTHON_SITELIBDIR} .include Index: head/x11-toolkits/nanogui/distinfo =================================================================== --- head/x11-toolkits/nanogui/distinfo (revision 466522) +++ head/x11-toolkits/nanogui/distinfo (revision 466523) @@ -1,5 +1,5 @@ -TIMESTAMP = 1514452444 -SHA256 (wjakob-nanogui-vg20171202-3e0b2c8_GH0.tar.gz) = 04a7e1628ae7507fd0a3482f096205bccd0c667caef104eafb7c3b57f0a57f18 -SIZE (wjakob-nanogui-vg20171202-3e0b2c8_GH0.tar.gz) = 2742665 +TIMESTAMP = 1522872847 +SHA256 (wjakob-nanogui-g20180318-be13c9b_GH0.tar.gz) = b16c85dc1c969c47475c09d0d8043821d67bd43b1af8bfeeba8e4da567970dda +SIZE (wjakob-nanogui-g20180318-be13c9b_GH0.tar.gz) = 2751066 SHA256 (wjakob-nanovg-ab38df8_GH0.tar.gz) = 4919c34f84eefaea556130906e1a1e0733562c96de1b46715ed31b5d15fc5eca SIZE (wjakob-nanovg-ab38df8_GH0.tar.gz) = 2014812 Index: head/x11-toolkits/nanogui/files/patch-CMakeLists.txt =================================================================== --- head/x11-toolkits/nanogui/files/patch-CMakeLists.txt (revision 466522) +++ head/x11-toolkits/nanogui/files/patch-CMakeLists.txt (revision 466523) @@ -1,96 +1,112 @@ ---- CMakeLists.txt.orig 2017-12-02 22:40:58 UTC +--- CMakeLists.txt.orig 2018-03-18 12:10:05 UTC +++ CMakeLists.txt -@@ -6,11 +6,11 @@ if (POLICY CMP0058) +@@ -11,11 +11,11 @@ if (POLICY CMP0058) cmake_policy(SET CMP0058 NEW) endif() -if (NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/ext/glfw/src") - message(FATAL_ERROR "The NanoGUI dependency repositories (GLFW, etc.) are missing! " - "You probably did not clone the project with --recursive. It is possible to recover " - "by calling \"git submodule update --init --recursive\"") -endif() +#if (NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/ext/glfw/src") +# message(FATAL_ERROR "The NanoGUI dependency repositories (GLFW, etc.) are missing! " +# "You probably did not clone the project with --recursive. It is possible to recover " +# "by calling \"git submodule update --init --recursive\"") +#endif() if (WIN32) set(NANOGUI_USE_GLAD_DEFAULT ON) -@@ -18,6 +18,8 @@ else() +@@ -23,6 +23,8 @@ else() set(NANOGUI_USE_GLAD_DEFAULT OFF) endif() +include_directories(${CMAKE_INSTALL_PREFIX}/include/eigen3) + option(NANOGUI_BUILD_EXAMPLE "Build NanoGUI example application?" ON) option(NANOGUI_BUILD_SHARED "Build NanoGUI as a shared library?" ON) option(NANOGUI_BUILD_PYTHON "Build a Python plugin for NanoGUI?" ON) -@@ -73,7 +75,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang +@@ -78,13 +80,13 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-deprecated-declarations") endif() -add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/ext/glfw" "ext_build/glfw") +#add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/ext/glfw" "ext_build/glfw") + # Two targets have now been defined: `glfw_objects`, which will be merged into + # NanoGUI at the end, and `glfw`. The `glfw` target is the library itself + # (e.g., libglfw.so), but can be skipped as we do not need to link against it + # (because we merge `glfw_objects` into NanoGUI). Skipping is required for + # XCode, but preferable for all build systems (reduces build artifacts). +-set_target_properties(glfw PROPERTIES EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_DEFAULT_BUILD 1) ++#set_target_properties(glfw PROPERTIES EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_DEFAULT_BUILD 1) # Python support: add NANOGUI_PYTHON flag to all targets if (NANOGUI_BUILD_PYTHON) -@@ -243,6 +245,9 @@ elseif(CMAKE_SYSTEM MATCHES "Linux" OR C +@@ -218,7 +220,7 @@ if (NANOGUI_USE_GLAD) + endif() + + list(APPEND NANOGUI_EXTRA_INCS +- "${CMAKE_CURRENT_SOURCE_DIR}/ext/glfw/include" ++ #"${CMAKE_CURRENT_SOURCE_DIR}/ext/glfw/include" + "${CMAKE_CURRENT_SOURCE_DIR}/ext/nanovg/src" + ) + +@@ -254,6 +256,9 @@ elseif(CMAKE_SYSTEM MATCHES "Linux" OR C if(CMAKE_SYSTEM MATCHES "Linux") list(APPEND NANOGUI_EXTRA_LIBS dl) endif() + if(CMAKE_SYSTEM MATCHES "FreeBSD") + list(APPEND NANOGUI_EXTRA_LIBS glfw) + endif() endif() include_directories(${NANOGUI_EIGEN_INCLUDE_DIR} ext/glfw/include ext/nanovg/src include ${CMAKE_CURRENT_BINARY_DIR}) -@@ -282,7 +287,7 @@ else() +@@ -293,7 +298,7 @@ else() set(NANOGUI_LIBRARY_TYPE "STATIC") endif() -if (APPLE OR CMAKE_SYSTEM MATCHES "Linux") +if (APPLE OR CMAKE_SYSTEM MATCHES "Linux|FreeBSD") # Include coroutine support for running the mainloop in detached mode add_definitions(-DCORO_SJLJ) include_directories(ext/coro) -@@ -343,7 +348,7 @@ add_library(nanogui-obj OBJECT +@@ -368,7 +373,7 @@ if (CMAKE_GENERATOR STREQUAL Xcode) + else() + add_library(nanogui ${NANOGUI_LIBRARY_TYPE} + $ +- $ ++ #$ + ) + endif() - add_library(nanogui ${NANOGUI_LIBRARY_TYPE} - $ -- $ -+ #$ - ) - - if (NANOGUI_BUILD_SHARED) -@@ -415,7 +420,7 @@ if (NANOGUI_BUILD_PYTHON) +@@ -441,7 +446,7 @@ if (NANOGUI_BUILD_PYTHON) # Detect Python # Try to autodetect Python (can be overridden manually if needed) - list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/ext/pybind11/tools") + list(APPEND CMAKE_MODULE_PATH "${CMAKE_INSTALL_PREFIX}/share/cmake/pybind11/") set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4) find_package(PythonLibsNew ${NANOGUI_PYTHON_VERSION}) if (NOT PYTHONLIBS_FOUND) -@@ -430,7 +435,7 @@ endif() +@@ -456,7 +461,7 @@ endif() if (NANOGUI_BUILD_PYTHON) # Need PIC code in libnanogui even when compiled as a static library set_target_properties(nanogui-obj PROPERTIES POSITION_INDEPENDENT_CODE ON) - set_target_properties(glfw_objects PROPERTIES POSITION_INDEPENDENT_CODE ON) + #set_target_properties(glfw_objects PROPERTIES POSITION_INDEPENDENT_CODE ON) include_directories("ext/pybind11/include" ${PYTHON_INCLUDE_DIR}) add_library(nanogui-python-obj OBJECT -@@ -489,9 +494,9 @@ if (NANOGUI_BUILD_PYTHON) +@@ -515,9 +520,9 @@ if (NANOGUI_BUILD_PYTHON) endif() elseif(UNIX) # Optimize for size - if (U_CMAKE_BUILD_TYPE MATCHES REL) - set_property(TARGET nanogui-python-obj APPEND PROPERTY COMPILE_OPTIONS "-Os") - endif() + #if (U_CMAKE_BUILD_TYPE MATCHES REL) + # set_property(TARGET nanogui-python-obj APPEND PROPERTY COMPILE_OPTIONS "-Os") + #endif() # Strip unnecessary sections of the binary on Linux/Mac OS if(APPLE)