<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2be44862a14be29b81565425e6b51033e450e99c">https://github.com/macports/macports-ports/commit/2be44862a14be29b81565425e6b51033e450e99c</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 2be4486 glfw: update release to 3.3 and devel to 20190415-b0796109
</span>2be4486 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2be44862a14be29b81565425e6b51033e450e99c
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue Apr 16 11:40:43 2019 -0400
<span style='display:block; white-space:pre;color:#404040;'> glfw: update release to 3.3 and devel to 20190415-b0796109
</span>---
graphics/glfw/Portfile | 51 ++++++++++++----------
.../glfw/files/patch-CMakeLists.txt.devel.diff | 6 +--
.../glfw/files/patch-CMakeLists.txt.release.diff | 10 ++---
.../files/patch-src_CMakeLists.txt.release.diff | 7 ++-
4 files changed, 38 insertions(+), 36 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/glfw/Portfile b/graphics/glfw/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e34b7da..e6e07ff 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/glfw/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/glfw/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,15 +43,34 @@ if {${os.platform} eq "darwin" && ${os.major} == 10} {
</span>
# Mac OS X 10.7 and newer: release and devel
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # requires c11 support as of 82ca58da (20190305) for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # <stdatomic.h>; 3.3 was released shortly after this change, so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this requirement is now for all modern GLFW. hopefully the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # following force a C11 compliant compiler to be used! require GCC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # >= 4.6 (4.9 for full C11) or MacPorts' Clang >= 3.1 or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # AppleClang >= 700. MacPorts' Clang starts at 3.3, so nothing to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # block there!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup compiler_blacklist_versions 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.blacklist-append macports-gcc-4.3 macports-gcc-4.4 macports-gcc-4.5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-gcc macports-gcc-4.6 macports-gcc-4.7 macports-gcc-4.8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-llvm-gcc-4.2 macports-dragonegg-3.3 macports-dragonegg-3.4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ apple-gcc-4.0 apple-gcc-4.2 gcc-3.3 gcc-4.0 llvm-gcc-4.2 gcc cc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {clang < 700}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DCMAKE_C_STANDARD=11 -DCMAKE_C_EXTENSIONS=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> subport glfw-devel {}
if {${subport} eq ${name}} {
# release
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup glfw glfw 3.2.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 5fb5988736a0a2812426907ab8d64b94eeacc010 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 34bc25f8111501eec35a52fd39fa50336a0c2e812d4a14454c7c946458ab015c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup glfw glfw 3.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 c119dfda395c2250042b1463eaf00b068422e9b2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7f788385e1bce1151f80101a14310bd8add536fbe940fbce02aef1d28417009b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 758548
</span> revision 0
# bump the epoch because I moved the version from 20151012 to 3.1.2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,11 +93,11 @@ if {${os.platform} eq "darwin" && ${os.major} == 10} {
</span>
# devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup glfw glfw 0267cebe00d72b56d7a57262e39e5b39eb221e85
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20190405
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 88620c01dd19dda7ece8b2fdc9a328e2c654a324 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 26bd6aa642733dd68797c32a4c127648e2a4c0c6499c2c4ace12711513a3f551 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 774144
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup glfw glfw b0796109629931b6fa6e449c15a177845256a407
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20190415-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 51c3a8e82276a3f48bc44deaf5345a98d40b523d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e8a261a448a5659e9bb86433fdb0b36592f61b9df545d4ce0dbcf9e5f54a6fa0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 758563
</span> revision 0
conflicts glfw
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,22 +112,6 @@ if {${os.platform} eq "darwin" && ${os.major} == 10} {
</span>
patchfiles-append patch-src_CMakeLists.txt.devel.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # requires c11 support as of 82ca58da (20190305) for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # <stdatomic.h>. hopefully the following force a C11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # compliant compiler to be used! require GCC >= 4.6 (4.9 for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # full C11) or MacPorts' Clang >= 3.1 or AppleClang >= 700.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # MacPorts' Clang starts at 3.3, so nothing to block there!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup compiler_blacklist_versions 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.blacklist-append macports-gcc-4.3 macports-gcc-4.4 macports-gcc-4.5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macports-gcc macports-gcc-4.6 macports-gcc-4.7 macports-gcc-4.8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macports-llvm-gcc-4.2 macports-dragonegg-3.3 macports-dragonegg-3.4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- apple-gcc-4.0 apple-gcc-4.2 gcc-3.3 gcc-4.0 llvm-gcc-4.2 gcc cc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {clang < 700}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DCMAKE_C_STANDARD=11 -DCMAKE_C_EXTENSIONS=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/glfw/files/patch-CMakeLists.txt.devel.diff b/graphics/glfw/files/patch-CMakeLists.txt.devel.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index fd231ad..853f973 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/glfw/files/patch-CMakeLists.txt.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/glfw/files/patch-CMakeLists.txt.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- CMakeLists.txt.orig
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -321,7 +321,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -314,7 +314,11 @@
</span> #--------------------------------------------------------------------
include(CMakePackageConfigHelpers)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@
</span>
configure_package_config_file(src/glfw3Config.cmake.in
src/glfw3Config.cmake
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -351,6 +355,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -344,6 +348,9 @@
</span>
if (DOXYGEN_FOUND AND GLFW_BUILD_DOCS)
add_subdirectory(docs)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,7 @@
</span> endif()
#--------------------------------------------------------------------
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -371,6 +378,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -364,6 +371,11 @@
</span> install(FILES "${GLFW_BINARY_DIR}/src/glfw3.pc"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/glfw/files/patch-CMakeLists.txt.release.diff b/graphics/glfw/files/patch-CMakeLists.txt.release.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 78afc7c..853f973 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/glfw/files/patch-CMakeLists.txt.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/glfw/files/patch-CMakeLists.txt.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,10 @@
</span> --- CMakeLists.txt.orig
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -356,7 +356,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -314,7 +314,11 @@
</span> #--------------------------------------------------------------------
include(CMakePackageConfigHelpers)
<span style='display:block; white-space:pre;background:#ffe0e0;'>--set(GLFW_CONFIG_PATH "lib${LIB_SUFFIX}/cmake/glfw3")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(GLFW_CONFIG_PATH "${CMAKE_INSTALL_LIBDIR}/cmake/glfw3")
</span> +if (NOT GLFW_CMAKE_CONFIG_PATH)
+ set(GLFW_CMAKE_CONFIG_PATH "lib${LIB_SUFFIX}")
+endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@
</span>
configure_package_config_file(src/glfw3Config.cmake.in
src/glfw3Config.cmake
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -386,6 +390,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -344,6 +348,9 @@
</span>
if (DOXYGEN_FOUND AND GLFW_BUILD_DOCS)
add_subdirectory(docs)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,9 +23,9 @@
</span> endif()
#--------------------------------------------------------------------
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -406,6 +413,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -364,6 +371,11 @@
</span> install(FILES "${GLFW_BINARY_DIR}/src/glfw3.pc"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- DESTINATION "lib${LIB_SUFFIX}/pkgconfig")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
</span>
+ if (DOXYGEN_FOUND AND GLFW_BUILD_DOCS)
+ install(FILES "${GLFW_BINARY_DIR}/docs/html"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/glfw/files/patch-src_CMakeLists.txt.release.diff b/graphics/glfw/files/patch-src_CMakeLists.txt.release.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1ac5a30..fa07ed6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/glfw/files/patch-src_CMakeLists.txt.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/glfw/files/patch-src_CMakeLists.txt.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,13 @@
</span> --- src/CMakeLists.txt.orig
+++ src/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -96,9 +96,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elseif (APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -138,8 +138,10 @@
</span> # Add -fno-common to work around a bug in Apple's GCC
target_compile_options(glfw PRIVATE "-fno-common")
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> - set_target_properties(glfw PROPERTIES
+ if (NOT CMAKE_INSTALL_NAME_DIR)
+ set_target_properties(glfw PROPERTIES
<span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL_NAME_DIR "lib${LIB_SUFFIX}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INSTALL_NAME_DIR "${CMAKE_INSTALL_LIBDIR}")
</span> + endif()
elseif (UNIX)
# Hide symbols not explicitly tagged for export from the shared library
</pre><pre style='margin:0'>
</pre>