From e637f121b90bbce6605b4eecc16f79227036372a Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Fri, 9 Jan 2026 21:21:00 +0100 Subject: [PATCH] [freeglut] update to 3.8.0 (#49314) Signed-off-by: Vitalii Koshura --- ports/freeglut/cmake-version.patch | 10 ---------- ports/freeglut/portfile.cmake | 11 ++--------- ports/freeglut/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/f-/freeglut.json | 5 +++++ 5 files changed, 10 insertions(+), 23 deletions(-) delete mode 100644 ports/freeglut/cmake-version.patch diff --git a/ports/freeglut/cmake-version.patch b/ports/freeglut/cmake-version.patch deleted file mode 100644 index 34a951bd31..0000000000 --- a/ports/freeglut/cmake-version.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9a5fb2b..a9ddfea 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --CMAKE_MINIMUM_REQUIRED(VERSION 3.1 FATAL_ERROR) -+CMAKE_MINIMUM_REQUIRED(VERSION 3.1...3.5 FATAL_ERROR) - PROJECT(freeglut LANGUAGES C) - - if (POLICY CMP0072) diff --git a/ports/freeglut/portfile.cmake b/ports/freeglut/portfile.cmake index 29df67d179..f5171cd83e 100755 --- a/ports/freeglut/portfile.cmake +++ b/ports/freeglut/portfile.cmake @@ -1,22 +1,14 @@ -vcpkg_download_distfile(fgPlatformDestroyContext_PATCH - URLS https://github.com/freeglut/freeglut/commit/800772e993a3ceffa01ccf3fca449d3279cde338.diff?full_index=1 - FILENAME FreeGLUTProject-freeglut-800772e.diff - SHA512 08a20f3c2d3e093c9cdc973a021600e9e6169d37c035bc4c64480f23cb8a3338514087c68a2bbc4ffd7a9febe542f5d0172a638357a02c2f0af93d3273f5717e -) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO FreeGLUTProject/freeglut REF "v${VERSION}" - SHA512 9be8dcc266daacc21aa0e11261bfe864260de6802e98e7dc84964904df4a89e52960eba94d58f4c18fc1f0ff3f13810d59fc33313c2a6e3f07d18f0b50b95849 + SHA512 5e891e838a11ffbd5c2aea1f39004be6a0ccc1da11d661a37302c316734e0986ed86622f174ae91f40572ce9d0fbe9c43e0976ee8636f2de25aa8e1ecf256785 HEAD_REF master PATCHES android.patch x11-dependencies-export.patch fix-debug-macro.patch windows-output-name.patch - cmake-version.patch - ${fgPlatformDestroyContext_PATCH} ) if(VCPKG_TARGET_IS_OSX) @@ -67,6 +59,7 @@ endif() # Clean file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/glut") diff --git a/ports/freeglut/vcpkg.json b/ports/freeglut/vcpkg.json index 651fa10a4e..25e92bf77d 100644 --- a/ports/freeglut/vcpkg.json +++ b/ports/freeglut/vcpkg.json @@ -1,7 +1,6 @@ { "name": "freeglut", - "version": "3.6.0", - "port-version": 2, + "version": "3.8.0", "description": "A free OpenGL utility toolkit, the open-sourced alternative to the GLUT library.", "homepage": "https://sourceforge.net/projects/freeglut/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index ed642cd2c5..24fd40bf72 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3101,8 +3101,8 @@ "port-version": 4 }, "freeglut": { - "baseline": "3.6.0", - "port-version": 2 + "baseline": "3.8.0", + "port-version": 0 }, "freeimage": { "baseline": "3.18.0", diff --git a/versions/f-/freeglut.json b/versions/f-/freeglut.json index ecd34c0b94..d12a7ed34a 100644 --- a/versions/f-/freeglut.json +++ b/versions/f-/freeglut.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eadbd61aa08b1cd9936cf34a2869e31931080530", + "version": "3.8.0", + "port-version": 0 + }, { "git-tree": "b9f6fc472c94ac7554d55be6c9e6b4bca923fbfd", "version": "3.6.0",