svn commit: r466523 - in head/x11-toolkits/nanogui: . files
Yuri Victorovich
yuri at FreeBSD.org
Thu Apr 5 02:55:44 UTC 2018
Author: yuri
Date: Thu Apr 5 02:55:43 2018
New Revision: 466523
URL: https://svnweb.freebsd.org/changeset/ports/466523
Log:
x11-toolkits/nanogui: Update g20171202 -> g20180318
Modified:
head/x11-toolkits/nanogui/Makefile
head/x11-toolkits/nanogui/distinfo
head/x11-toolkits/nanogui/files/patch-CMakeLists.txt
Modified: head/x11-toolkits/nanogui/Makefile
==============================================================================
--- head/x11-toolkits/nanogui/Makefile Thu Apr 5 02:43:07 2018 (r466522)
+++ head/x11-toolkits/nanogui/Makefile Thu Apr 5 02:55:43 2018 (r466523)
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= nanogui
-DISTVERSIONPREFIX= v
-DISTVERSION= g20171202
+DISTVERSION= g20180318
CATEGORIES= x11-toolkits
MAINTAINER= yuri at FreeBSD.org
@@ -18,7 +17,7 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
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
Modified: head/x11-toolkits/nanogui/distinfo
==============================================================================
--- head/x11-toolkits/nanogui/distinfo Thu Apr 5 02:43:07 2018 (r466522)
+++ head/x11-toolkits/nanogui/distinfo Thu Apr 5 02:55:43 2018 (r466523)
@@ -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
Modified: head/x11-toolkits/nanogui/files/patch-CMakeLists.txt
==============================================================================
--- head/x11-toolkits/nanogui/files/patch-CMakeLists.txt Thu Apr 5 02:43:07 2018 (r466522)
+++ head/x11-toolkits/nanogui/files/patch-CMakeLists.txt Thu Apr 5 02:55:43 2018 (r466523)
@@ -1,6 +1,6 @@
---- 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()
@@ -17,7 +17,7 @@
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()
@@ -26,16 +26,32 @@
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()
@@ -45,7 +61,7 @@
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()
@@ -54,16 +70,16 @@
# 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}
+ $<TARGET_OBJECTS:nanogui-obj>
+- $<TARGET_OBJECTS:glfw_objects>
++ #$<TARGET_OBJECTS:glfw_objects>
+ )
+ endif()
- add_library(nanogui ${NANOGUI_LIBRARY_TYPE}
- $<TARGET_OBJECTS:nanogui-obj>
-- $<TARGET_OBJECTS:glfw_objects>
-+ #$<TARGET_OBJECTS:glfw_objects>
- )
-
- 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)
@@ -72,7 +88,7 @@
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)
@@ -81,7 +97,7 @@
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
More information about the svn-ports-all
mailing list