aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ports/glfw3/CONTROL2
-rw-r--r--ports/glfw3/fix-config.patch24
-rw-r--r--ports/glfw3/portfile.cmake23
3 files changed, 4 insertions, 45 deletions
diff --git a/ports/glfw3/CONTROL b/ports/glfw3/CONTROL
index 6c99ef4a7..e51362d2a 100644
--- a/ports/glfw3/CONTROL
+++ b/ports/glfw3/CONTROL
@@ -1,4 +1,4 @@
Source: glfw3
-Version: 3.3-3
+Version: 3.3.1
Homepage: https://github.com/glfw/glfw
Description: GLFW is a free, Open Source, multi-platform library for OpenGL, OpenGL ES and Vulkan application development. It provides a simple, platform-independent API for creating windows, contexts and surfaces, reading input, handling events, etc.
diff --git a/ports/glfw3/fix-config.patch b/ports/glfw3/fix-config.patch
deleted file mode 100644
index 181d7d91b..000000000
--- a/ports/glfw3/fix-config.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3c0f625..0c985cf 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -319,7 +319,8 @@ set(GLFW_CONFIG_PATH "${CMAKE_INSTALL_LIBDIR}/cmake/glfw3")
- configure_package_config_file(src/glfw3Config.cmake.in
- src/glfw3Config.cmake
- INSTALL_DESTINATION "${GLFW_CONFIG_PATH}"
-- NO_CHECK_REQUIRED_COMPONENTS_MACRO)
-+ NO_CHECK_REQUIRED_COMPONENTS_MACRO
-+ PATH_VARS CMAKE_INSTALL_INCLUDEDIR)
-
- write_basic_package_version_file(src/glfw3ConfigVersion.cmake
- VERSION ${GLFW_VERSION_FULL}
-diff --git a/src/glfw3Config.cmake.in b/src/glfw3Config.cmake.in
-index 1fa200e..861df93 100644
---- a/src/glfw3Config.cmake.in
-+++ b/src/glfw3Config.cmake.in
-@@ -1 +1,5 @@
-+@PACKAGE_INIT@
-+
-+set_and_check(glfw_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
-+
- include("${CMAKE_CURRENT_LIST_DIR}/glfw3Targets.cmake")
diff --git a/ports/glfw3/portfile.cmake b/ports/glfw3/portfile.cmake
index 5b399134b..fef1bdf2e 100644
--- a/ports/glfw3/portfile.cmake
+++ b/ports/glfw3/portfile.cmake
@@ -1,16 +1,12 @@
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO glfw/glfw
- REF 3.3
- SHA512 e74bb7ba0c1c3a524a193c4fb5a2d13ba0e75f8e309612ea19cdcc944859d6e2fe29d8b2e3db76236e1011b637564ddd5f4a176dcccfeb84d09bda060f08f774
+ REF 3.3.1
+ SHA512 f9376002314eae5518ca63738cf1558433007dbf628fb6093a6f54c330f72d85e0ac30049877c50bc99f029e3eb6f69e69508f412d1ec9bdde0ac721dbbeba1e
HEAD_REF master
- PATCHES
- fix-config.patch
)
-if(NOT VCPKG_TARGET_IS_WINDOWS)
+if(VCPKG_TARGET_IS_LINUX)
message(
"GLFW3 currently requires the following libraries from the system package manager:
xinerama
@@ -36,19 +32,6 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/glfw3)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
- if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/glfw3.dll OR EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/glfw3.dll)
- file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
- file(RENAME ${CURRENT_PACKAGES_DIR}/lib/glfw3.dll ${CURRENT_PACKAGES_DIR}/bin/glfw3.dll)
- file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/glfw3.dll ${CURRENT_PACKAGES_DIR}/debug/bin/glfw3.dll)
- foreach(_conf release debug)
- file(READ ${CURRENT_PACKAGES_DIR}/share/glfw3/glfw3Targets-${_conf}.cmake _contents)
- string(REPLACE "lib/glfw3.dll" "bin/glfw3.dll" _contents "${_contents}")
- file(WRITE ${CURRENT_PACKAGES_DIR}/share/glfw3/glfw3Targets-${_conf}.cmake "${_contents}")
- endforeach()
- endif()
-endif()
-
file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
vcpkg_copy_pdbs()