Revision: 149391 https://trac.macports.org/changeset/149391 Author: michaelld@macports.org Date: 2016-06-16 06:13:48 -0700 (Thu, 16 Jun 2016) Log Message: ----------- glfw*: + update devel to f2ba78e0 (20160614); + merge OS version checks; + add patch to fix install name issue introduced in 7f7ad39e (2016-Feb-01), which addresses ticket #51618. Modified Paths: -------------- trunk/dports/graphics/glfw/Portfile Added Paths: ----------- trunk/dports/graphics/glfw/files/patch-src_CMakeLists.txt.diff Modified: trunk/dports/graphics/glfw/Portfile =================================================================== --- trunk/dports/graphics/glfw/Portfile 2016-06-16 13:12:04 UTC (rev 149390) +++ trunk/dports/graphics/glfw/Portfile 2016-06-16 13:13:48 UTC (rev 149391) @@ -36,10 +36,10 @@ # devel - github.setup glfw glfw d8c278bf529da00df31d125a7ad6291123ade2ef - version 20160606 - checksums rmd160 f7de6e90e7a775942ad8dc49c3f487dd08e4efe8 \ - sha256 15fc3a1aeb3d31e54a512236bda958b9af57aee8ac753593f5dd47aeead4aabb + github.setup glfw glfw f2ba78e04bf8e2cab04388fa8b12c133abb24001 + version 20160614 + checksums rmd160 11360d11e338052aaebf93f3e0dc3a216b9d3a9d \ + sha256 1be57641e50c0e5fbc178aa612514e1a6df6067153f699728f0debf172e29ff3 # patch to fix install directory for cmake files and docs @@ -51,18 +51,9 @@ } -# error out if trying to build on OSX 10.6 or earlier; not supported +# patch to fix install name of library -platform darwin { - if {${os.major} < 11} { - set os_note "${name} ${version} is designed for OS X 10.7 Lion and newer." - notes-append "\n\n${os_note}" - pre-fetch { - ui_error ${os_note} - error "unsupported platform" - } - } -} +patchfiles-append patch-src_CMakeLists.txt.diff # use the real home page, not github's @@ -74,10 +65,11 @@ # configuration arguments for MacPorts build -configure.args -DBUILD_SHARED_LIBS=on \ - -DGLFW_BUILD_EXAMPLES=off \ - -DGLFW_BUILD_TESTS=off \ - -DGLFW_CMAKE_CONFIG_PATH=share +configure.args-append \ + -DBUILD_SHARED_LIBS=on \ + -DGLFW_BUILD_EXAMPLES=off \ + -DGLFW_BUILD_TESTS=off \ + -DGLFW_CMAKE_CONFIG_PATH=share # remove top-level library path, such that internal libraries are used # instead of any already-installed ones. @@ -95,11 +87,15 @@ configure.args-append -DDOXYGEN_EXECUTABLE= } +# error out if trying to build on OSX 10.6 or earlier; not supported + platform darwin { - pre-fetch { - if {${os.major} < 10} { - ui_error "\n\n${name} does not support Mac OS X 10.6 or earlier.\n" - return -code error "Unsupported Mac OS X version." + if {${os.major} < 11} { + set os_note "${name} ${version} is designed for OS X 10.7 Lion and newer." + notes-append "\n\n${os_note}" + pre-fetch { + ui_error ${os_note} + error "unsupported platform" } } } Added: trunk/dports/graphics/glfw/files/patch-src_CMakeLists.txt.diff =================================================================== --- trunk/dports/graphics/glfw/files/patch-src_CMakeLists.txt.diff (rev 0) +++ trunk/dports/graphics/glfw/files/patch-src_CMakeLists.txt.diff 2016-06-16 13:13:48 UTC (rev 149391) @@ -0,0 +1,15 @@ +--- src/CMakeLists.txt.orig 2016-06-16 09:01:30.000000000 -0400 ++++ src/CMakeLists.txt 2016-06-16 09:03:11.000000000 -0400 +@@ -96,9 +96,10 @@ + elseif (APPLE) + # Add -fno-common to work around a bug in Apple's GCC + target_compile_options(glfw PRIVATE "-fno-common") +- +- set_target_properties(glfw PROPERTIES ++ if (NOT CMAKE_INSTALL_NAME_DIR) ++ set_target_properties(glfw PROPERTIES + INSTALL_NAME_DIR "lib${LIB_SUFFIX}") ++ endif() + elseif (UNIX) + # Hide symbols not explicitly tagged for export from the shared library + target_compile_options(glfw PRIVATE "-fvisibility=hidden")