<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/393572db0143e070119f4ae3a6ecffde18dd1a93">https://github.com/macports/macports-ports/commit/393572db0143e070119f4ae3a6ecffde18dd1a93</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 393572d glui: incorporate upstream bug fixes
</span>393572d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 393572db0143e070119f4ae3a6ecffde18dd1a93
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Mon Aug 27 06:28:11 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> glui: incorporate upstream bug fixes
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/57041
</span>---
x11/glui/Portfile | 12 ++-
x11/glui/files/patch-CMakeLists.txt.diff | 174 +++++++++++++++++++++++++++++-
x11/glui/files/patch-glui.h-freeglut.diff | 33 ++++++
x11/glui/files/patch-glui.h.diff | 13 +++
4 files changed, 226 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/glui/Portfile b/x11/glui/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index de0917e..aa40341 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/glui/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/glui/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup github 1.0
</span> PortGroup cmake 1.1
github.setup libglui glui 2.37
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories x11
maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
description A GLUT-based C++ user interface library.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,14 +19,24 @@ checksums rmd160 44cb8c9e30e8dbdfee6ed0ae609029c1ca449211 \
</span> sha256 2f505a5320b6002f940a33d88e59d52333164cc0f2de8d6bd55b7d4d83664dfe \
size 487960
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://github.com/libglui/glui/commit/eaca63aea72ed4db055514dfec2abc71a106aa70
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://github.com/libglui/glui/commit/4299e8fa43bb1e67370be36cad4b21115ab88af9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# install bins and examples
</span> patchfiles-append patch-CMakeLists.txt.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://github.com/libglui/glui/commit/fc9ad76733034605872a0d1323bb19cbc23d87bf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-glui.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant x11 {
depends_lib-append \
port:mesa \
port:libGLU \
port:freeglut
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # only use FreeGLUT headers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-glui.h-freeglut.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append \
-DOPENGL_gl_LIBRARY=${prefix}/lib/libGL.dylib \
-DOPENGL_glu_LIBRARY=${prefix}/lib/libGLU.dylib \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/glui/files/patch-CMakeLists.txt.diff b/x11/glui/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3161c1e..27d6bf1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/glui/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/glui/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +1,176 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2015-09-25 02:35:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2018-08-19 04:17:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -49,23 +49,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From eaca63aea72ed4db055514dfec2abc71a106aa70 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Nigel Stewart <nigels@users.sourceforge.net>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 13 Nov 2016 16:04:00 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Mac OSX needs to link OpenGL framework for libglui.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMakeLists.txt | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/CMakeLists.txt b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 033cfd6..3b3aa2b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -49,7 +49,7 @@ add_library(glui_obj OBJECT ${GLUI_SRCS})
</span> set_property(TARGET glui_obj PROPERTY POSITION_INDEPENDENT_CODE 1)
add_library(glui SHARED $<TARGET_OBJECTS:glui_obj>)
-target_link_libraries(glui ${GLUT_LIBRARIES})
+target_link_libraries(glui ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES})
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+install(TARGETS glui DESTINATION lib)
</span>
add_library(glui_static STATIC $<TARGET_OBJECTS:glui_obj>)
target_link_libraries(glui_static ${GLUT_LIBRARIES})
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+install(TARGETS glui_static DESTINATION lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 4299e8fa43bb1e67370be36cad4b21115ab88af9 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Simone Gasparini <simone.gasparini@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 14 May 2017 21:44:52 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] [cmake] added install targets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMakeLists.txt | 96 +++++++++++++++++++++++++++++++++++++++----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake/Config.cmake.in | 4 ++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 93 insertions(+), 7 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ create mode 100644 cmake/Config.cmake.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/CMakeLists.txt b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3b3aa2b..a73e83a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,13 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-cmake_minimum_required(VERSION 2.8)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cmake_minimum_required(VERSION 2.8.12)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ project(glui)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set(PROJECT_VERSION 2.37)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(GLUT REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(OpenGL REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-include_directories(${GLUT_INCLUDE_DIR}/include)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-include_directories(${CMAKE_SOURCE_DIR}/include)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(GLUI_SRCS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ algebra3.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ arcball.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,15 +42,37 @@ SET(GLUI_SRCS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ viewmodel.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library(glui_obj OBJECT ${GLUI_SRCS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++target_include_directories(glui_obj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PUBLIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${OPENGL_INCLUDE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${GLUT_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # we need to enable -fPIC this so that the same object code can be used to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # create static *and* shared libraries without double compilation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set_property(TARGET glui_obj PROPERTY POSITION_INDEPENDENT_CODE 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set_target_properties( glui_obj PROPERTIES POSITION_INDEPENDENT_CODE 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library(glui SHARED $<TARGET_OBJECTS:glui_obj>)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-target_link_libraries(glui ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++target_include_directories(glui
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PUBLIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "$<INSTALL_INTERFACE:include>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${OPENGL_INCLUDE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${GLUT_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++target_link_libraries(glui PUBLIC ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set_target_properties(glui PROPERTIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DEBUG_POSTFIX "d"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VERSION ${PROJECT_VERSION}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SOVERSION ${PROJECT_VERSION})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library(glui_static STATIC $<TARGET_OBJECTS:glui_obj>)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-target_link_libraries(glui_static ${GLUT_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++target_include_directories(glui_static
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PUBLIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "$<INSTALL_INTERFACE:include>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${OPENGL_INCLUDE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${GLUT_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++target_link_libraries(glui_static PUBLIC ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set_target_properties(glui_static PROPERTIES DEBUG_POSTFIX "d")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_executable(ppm2array tools/ppm.cpp tools/ppm2array.cpp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(ppm2array)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -69,3 +89,65 @@ add_executable(example5 example/example5.cpp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(example5 glui_static ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_executable(example6 example/example6.cpp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(example6 glui_static ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++####
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Installation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set(config_install_dir "lib/cmake/${PROJECT_NAME}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set(include_install_dir "include")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Configuration
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set(version_config "${generated_dir}/${PROJECT_NAME}ConfigVersion.cmake")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set(project_config "${generated_dir}/${PROJECT_NAME}Config.cmake")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set(targets_export_name "${PROJECT_NAME}Targets")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set(namespace "${PROJECT_NAME}::")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Include module with fuction 'write_basic_package_version_file'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++include(CMakePackageConfigHelpers)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Configure '<PROJECT-NAME>ConfigVersion.cmake'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++write_basic_package_version_file(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "${version_config}" VERSION ${PROJECT_VERSION} COMPATIBILITY SameMajorVersion
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Configure '<PROJECT-NAME>Config.cmake'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++configure_package_config_file(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "cmake/Config.cmake.in"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "${project_config}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ INSTALL_DESTINATION "${config_install_dir}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Targets:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++install(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ TARGETS glui_static glui
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ EXPORT "${targets_export_name}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBRARY DESTINATION "lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ARCHIVE DESTINATION "lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ RUNTIME DESTINATION "bin"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ INCLUDES DESTINATION "${include_install_dir}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Headers:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++install(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DIRECTORY "${CMAKE_SOURCE_DIR}/include/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DESTINATION "${include_install_dir}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ FILES_MATCHING PATTERN "*.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++install(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ FILES "${project_config}" "${version_config}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DESTINATION "${config_install_dir}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++install(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ EXPORT "${targets_export_name}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NAMESPACE "${namespace}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DESTINATION "${config_install_dir}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+new file mode 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0000000..9b4c9ee
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/Config.cmake.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@PACKAGE_INIT@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++check_required_components("@PROJECT_NAME@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2018-08-27 05:43:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2018-08-27 05:57:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -76,20 +76,26 @@
</span>
add_executable(ppm2array tools/ppm.cpp tools/ppm2array.cpp)
target_link_libraries(ppm2array)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,4 +193,8 @@
</span> +install(TARGETS example5 DESTINATION share/examples/glui)
add_executable(example6 example/example6.cpp)
target_link_libraries(example6 glui_static ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES})
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> +install(TARGETS example6 DESTINATION share/examples/glui)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ####
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/glui/files/patch-glui.h-freeglut.diff b/x11/glui/files/patch-glui.h-freeglut.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..6d54bb7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/glui/files/patch-glui.h-freeglut.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/GL/glui.h.orig 2018-08-27 05:58:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/GL/glui.h 2018-08-27 06:16:26.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,29 +38,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // that come from old GLUT headers.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <cstdlib>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(GLUI_FREEGLUT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // FreeGLUT does not yet work perfectly with GLUI
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // - use at your own risk.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #include <GL/freeglut.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif defined(GLUI_OPENGLUT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // OpenGLUT does not yet work properly with GLUI
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // - use at your own risk.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #include <GL/openglut.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #include <GLUT/glut.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #include <GL/glut.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <GL/glut.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <cstdio>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <cstring>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/glui/files/patch-glui.h.diff b/x11/glui/files/patch-glui.h.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..bd8441b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/glui/files/patch-glui.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/include/GL/glui.h b/include/GL/glui.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5c15080..56b8208 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/GL/glui.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/GL/glui.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -929,7 +929,7 @@ class GLUIAPI GLUI_Control : public GLUI_Node
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ spacebar_mouse_click = true; /* Does spacebar simulate a mouse click? */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ live_type = GLUI_LIVE_NONE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ text = "";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- last_live_text == "";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ last_live_text = "";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ live_inited = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ collapsible = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ is_open = true;
</span></pre><pre style='margin:0'>
</pre>