[151803] trunk/dports/graphics/glfw
michaelld at macports.org
michaelld at macports.org
Mon Aug 22 05:55:56 PDT 2016
Revision: 151803
https://trac.macports.org/changeset/151803
Author: michaelld at macports.org
Date: 2016-08-22 05:55:56 -0700 (Mon, 22 Aug 2016)
Log Message:
-----------
glfw:
+ update release to 3.2.1;
+ update glfw-devel to 9cd0c101 (20160818);
+ swap to a single patch for CMakeLists.txt.
Modified Paths:
--------------
trunk/dports/graphics/glfw/Portfile
Added Paths:
-----------
trunk/dports/graphics/glfw/files/patch-CMakeLists.txt.diff
Removed Paths:
-------------
trunk/dports/graphics/glfw/files/patch-CMakeLists.txt.devel.diff
trunk/dports/graphics/glfw/files/patch-CMakeLists.txt.release.diff
Modified: trunk/dports/graphics/glfw/Portfile
===================================================================
--- trunk/dports/graphics/glfw/Portfile 2016-08-22 12:54:30 UTC (rev 151802)
+++ trunk/dports/graphics/glfw/Portfile 2016-08-22 12:55:56 UTC (rev 151803)
@@ -18,17 +18,14 @@
# release
- github.setup glfw glfw 3.2
- revision 1
+ github.setup glfw glfw 3.2.1
+ checksums rmd160 5fb5988736a0a2812426907ab8d64b94eeacc010 \
+ sha256 34bc25f8111501eec35a52fd39fa50336a0c2e812d4a14454c7c946458ab015c
+
# bump the epoch because I moved the version from 20151012 to 3.1.2
+
epoch 1
- checksums rmd160 0b0e400f47b965af9fe6eb3eb7e373cb6efa105f \
- sha256 2d98746893b55a332d2861bfc525d91b557894318dc79de015c854a0ee818ed6
- # patch to fix install directory for cmake files and docs
-
- patchfiles-append patch-CMakeLists.txt.release.diff
-
conflicts glfw-devel
long_description ${description}: \
This port follows the release version of GLFW, which is typically updated every 6 months. If for some reason this port does not build or function as desired, try the ${name}-devel port.
@@ -37,15 +34,11 @@
# devel
- github.setup glfw glfw c18d3aecbc2022c0f57e1d287da707aaecbae3ae
- version 20160816
- checksums rmd160 b437b047d619de8bde22ad6f66d391ed31b71d26 \
- sha256 d9e914ce1c177ae519f91befcf3682554ba89fc5dabba1ffcc8e62bcef3b98bb
+ github.setup glfw glfw 9cd0c101f09ca1085d8e09536b20d7695827c937
+ version 20160818
+ checksums rmd160 8cf8dd1f88a0786e95beb3ee97e0bea62f77ec37 \
+ sha256 60317f02698b1170e525d932178578152f1727c86e8299bd311ac68d5658e42d
- # patch to fix install directory for cmake files and docs
-
- patchfiles-append patch-CMakeLists.txt.devel.diff
-
conflicts glfw
long_description ${description}: \
This port follows the GIT master version of GLFW, which is typically updated every few days to weeks.
@@ -56,6 +49,10 @@
patchfiles-append patch-src_CMakeLists.txt.diff
+# patch to fix install directory for cmake files and docs
+
+patchfiles-append patch-CMakeLists.txt.diff
+
# use the real home page, not github's
homepage http://www.glfw.org/
Deleted: trunk/dports/graphics/glfw/files/patch-CMakeLists.txt.devel.diff
===================================================================
--- trunk/dports/graphics/glfw/files/patch-CMakeLists.txt.devel.diff 2016-08-22 12:54:30 UTC (rev 151802)
+++ trunk/dports/graphics/glfw/files/patch-CMakeLists.txt.devel.diff 2016-08-22 12:55:56 UTC (rev 151803)
@@ -1,37 +0,0 @@
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -356,7 +356,11 @@
- #--------------------------------------------------------------------
- include(CMakePackageConfigHelpers)
-
--set(GLFW_CONFIG_PATH "lib${LIB_SUFFIX}/cmake/glfw3")
-+if (NOT GLFW_CMAKE_CONFIG_PATH)
-+ set(GLFW_CMAKE_CONFIG_PATH "lib${LIB_SUFFIX}")
-+endif()
-+
-+set(GLFW_CONFIG_PATH "${GLFW_CMAKE_CONFIG_PATH}/cmake/glfw3")
-
- configure_package_config_file(src/glfw3Config.cmake.in
- src/glfw3Config.cmake
-@@ -386,6 +390,9 @@
-
- if (DOXYGEN_FOUND AND GLFW_BUILD_DOCS)
- add_subdirectory(docs)
-+ if (NOT GLFW_DOCS_PATH)
-+ set(GLFW_DOCS_PATH "share/doc/glfw3/")
-+ endif()
- endif()
-
- #--------------------------------------------------------------------
-@@ -406,6 +413,11 @@
- install(FILES "${GLFW_BINARY_DIR}/src/glfw3.pc"
- DESTINATION "lib${LIB_SUFFIX}/pkgconfig")
-
-+ if (DOXYGEN_FOUND AND GLFW_BUILD_DOCS)
-+ install(FILES "${GLFW_BINARY_DIR}/docs/html"
-+ DESTINATION "${GLFW_DOCS_PATH}")
-+ endif()
-+
- # Only generate this target if no higher-level project already has
- if (NOT TARGET uninstall)
- configure_file(cmake_uninstall.cmake.in
Copied: trunk/dports/graphics/glfw/files/patch-CMakeLists.txt.diff (from rev 151802, trunk/dports/graphics/glfw/files/patch-CMakeLists.txt.devel.diff)
===================================================================
--- trunk/dports/graphics/glfw/files/patch-CMakeLists.txt.diff (rev 0)
+++ trunk/dports/graphics/glfw/files/patch-CMakeLists.txt.diff 2016-08-22 12:55:56 UTC (rev 151803)
@@ -0,0 +1,37 @@
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -356,7 +356,11 @@
+ #--------------------------------------------------------------------
+ include(CMakePackageConfigHelpers)
+
+-set(GLFW_CONFIG_PATH "lib${LIB_SUFFIX}/cmake/glfw3")
++if (NOT GLFW_CMAKE_CONFIG_PATH)
++ set(GLFW_CMAKE_CONFIG_PATH "lib${LIB_SUFFIX}")
++endif()
++
++set(GLFW_CONFIG_PATH "${GLFW_CMAKE_CONFIG_PATH}/cmake/glfw3")
+
+ configure_package_config_file(src/glfw3Config.cmake.in
+ src/glfw3Config.cmake
+@@ -386,6 +390,9 @@
+
+ if (DOXYGEN_FOUND AND GLFW_BUILD_DOCS)
+ add_subdirectory(docs)
++ if (NOT GLFW_DOCS_PATH)
++ set(GLFW_DOCS_PATH "share/doc/glfw3/")
++ endif()
+ endif()
+
+ #--------------------------------------------------------------------
+@@ -406,6 +413,11 @@
+ install(FILES "${GLFW_BINARY_DIR}/src/glfw3.pc"
+ DESTINATION "lib${LIB_SUFFIX}/pkgconfig")
+
++ if (DOXYGEN_FOUND AND GLFW_BUILD_DOCS)
++ install(FILES "${GLFW_BINARY_DIR}/docs/html"
++ DESTINATION "${GLFW_DOCS_PATH}")
++ endif()
++
+ # Only generate this target if no higher-level project already has
+ if (NOT TARGET uninstall)
+ configure_file(cmake_uninstall.cmake.in
Deleted: trunk/dports/graphics/glfw/files/patch-CMakeLists.txt.release.diff
===================================================================
--- trunk/dports/graphics/glfw/files/patch-CMakeLists.txt.release.diff 2016-08-22 12:54:30 UTC (rev 151802)
+++ trunk/dports/graphics/glfw/files/patch-CMakeLists.txt.release.diff 2016-08-22 12:55:56 UTC (rev 151803)
@@ -1,37 +0,0 @@
---- CMakeLists.txt.orig 2016-06-02 10:13:47.000000000 -0400
-+++ CMakeLists.txt 2016-06-02 15:10:42.000000000 -0400
-@@ -336,7 +336,11 @@
- #--------------------------------------------------------------------
- include(CMakePackageConfigHelpers)
-
--set(GLFW_CONFIG_PATH "lib${LIB_SUFFIX}/cmake/glfw3")
-+if (NOT GLFW_CMAKE_CONFIG_PATH)
-+ set(GLFW_CMAKE_CONFIG_PATH "lib${LIB_SUFFIX}")
-+endif()
-+
-+set(GLFW_CONFIG_PATH "${GLFW_CMAKE_CONFIG_PATH}/cmake/glfw3")
-
- configure_package_config_file(src/glfw3Config.cmake.in
- src/glfw3Config.cmake
-@@ -366,6 +370,9 @@
-
- if (DOXYGEN_FOUND AND GLFW_BUILD_DOCS)
- add_subdirectory(docs)
-+ if (NOT GLFW_DOCS_PATH)
-+ set(GLFW_DOCS_PATH "share/doc/glfw3/")
-+ endif()
- endif()
-
- #--------------------------------------------------------------------
-@@ -386,6 +393,11 @@
- install(FILES "${GLFW_BINARY_DIR}/src/glfw3.pc"
- DESTINATION "lib${LIB_SUFFIX}/pkgconfig")
-
-+ if (DOXYGEN_FOUND AND GLFW_BUILD_DOCS)
-+ install(FILES "${GLFW_BINARY_DIR}/docs/html"
-+ DESTINATION "${GLFW_DOCS_PATH}")
-+ endif()
-+
- # Only generate this target if no higher-level project already has
- if (NOT TARGET uninstall)
- configure_file(cmake_uninstall.cmake.in
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160822/7cb1a2b0/attachment-0001.html>
More information about the macports-changes
mailing list