[freeglut] update to 3.6.0 (#44202)

Co-authored-by: Mengna-Li <v-limengna@microsoft.com>

ports/freeglut/gles.patch

@@ -1,22 +0,0 @@
-diff --git a/src/fg_geometry.c b/src/fg_geometry.c
-index ee7cc89..ea42f72 100644
---- a/src/fg_geometry.c
-+++ b/src/fg_geometry.c
-@@ -44,7 +44,7 @@
- 
- /* declare for drawing using the different OpenGL versions here so we can
-    have a nice code order below */
--#ifndef GL_VERSION_1_1
-+#if !(defined(GL_VERSION_1_1) || defined(GL_VERSION_ES_CM_1_0))
- static void fghDrawGeometryWire10(GLfloat *varr, GLfloat *narr, GLushort *iarr,
- 		GLsizei nparts, GLsizei npartverts, GLenum prim, GLushort *iarr2,
- 		GLsizei nparts2, GLsizei npartverts2);
-@@ -222,7 +222,7 @@ void fghDrawGeometrySolid(GLfloat *vertices, GLfloat *normals, GLfloat *textcs,
-     }
- }
- 
--#ifndef GL_VERSION_1_1
-+#if !(defined(GL_VERSION_1_1) || defined(GL_VERSION_ES_CM_1_0))
- static void fghDrawGeometryWire10(GLfloat *varr, GLfloat *narr, GLushort *iarr,
- 		GLsizei nparts, GLsizei npartverts, GLenum prim, GLushort *iarr2,
- 		GLsizei nparts2, GLsizei npartverts2)

ports/freeglut/no_x64_enforcement.patch

@@ -1,17 +0,0 @@
-diff --git a/CMakeLists.txt.orig b/CMakeLists.txt
-index 6f403af..d1ba4e7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -418,12 +418,6 @@ IF(WIN32)
-         IF(FREEGLUT_REPLACE_GLUT)
-             SET_TARGET_PROPERTIES(freeglut_static PROPERTIES OUTPUT_NAME ${LIBNAME})
-         ENDIF()
--        # need to set machine:x64 for linker, at least for VC10, and
--        # doesn't hurt for older compilers:
--        # http://public.kitware.com/Bug/view.php?id=11240#c22768
--        IF (CMAKE_CL_64)
--            SET_TARGET_PROPERTIES(freeglut_static PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64")
--        ENDIF()
-     ENDIF()
- ELSE()
-     # on UNIX we need to make sure:

ports/freeglut/portfile.cmake

@@ -2,14 +2,12 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO FreeGLUTProject/freeglut
     REF "v${VERSION}"
-    SHA512 4bb6d6c086bac7a9c0ec78062dce58987555785abe6375f462ee249f65210a964a28fb10ba7ee8a42d7fafb00eb8d196eb403d65d255f02f88467369c187228b
+    SHA512 9be8dcc266daacc21aa0e11261bfe864260de6802e98e7dc84964904df4a89e52960eba94d58f4c18fc1f0ff3f13810d59fc33313c2a6e3f07d18f0b50b95849
     HEAD_REF master
     PATCHES
         android.patch
-        gles.patch # amends https://github.com/freeglut/freeglut/commit/093a5a46
         x11-dependencies-export.patch
         fix-debug-macro.patch
-        no_x64_enforcement.patch
         windows-output-name.patch
 )
 
@@ -65,4 +63,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/glut")
 
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")

ports/freeglut/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "freeglut",
-  "version": "3.4.0",
-  "port-version": 3,
+  "version": "3.6.0",
   "description": "A free OpenGL utility toolkit, the open-sourced alternative to the GLUT library.",
   "homepage": "https://sourceforge.net/projects/freeglut/",
   "license": null,

ports/freeglut/windows-output-name.patch

@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 98d07c9..5b79f06 100644
+index 99957a1..9a5fb2b 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -436,12 +436,12 @@ IF(WIN32)
+@@ -533,12 +533,12 @@ IF(WIN32)
      LIST(APPEND LIBS winmm gdi32)
      IF(FREEGLUT_BUILD_SHARED_LIBS)
          TARGET_COMPILE_DEFINITIONS(freeglut PRIVATE FREEGLUT_EXPORTS)
@@ -15,10 +15,10 @@ index 98d07c9..5b79f06 100644
 -            SET_TARGET_PROPERTIES(freeglut_static PROPERTIES OUTPUT_NAME ${LIBNAME})
 +            SET_TARGET_PROPERTIES(freeglut_static PROPERTIES OUTPUT_NAME freeglut)
          ENDIF()
-     ENDIF()
- ELSE()
+         # need to set machine:x64 for linker, at least for VC10, and
+         # doesn't hurt for older compilers:
 diff --git a/include/GL/freeglut_std.h b/include/GL/freeglut_std.h
-index a5efb3b..6bdcdfb 100644
+index e5da4ce..4eea6eb 100644
 --- a/include/GL/freeglut_std.h
 +++ b/include/GL/freeglut_std.h
 @@ -71,9 +71,9 @@

versions/baseline.json

@@ -2913,8 +2913,8 @@
       "port-version": 4
     },
     "freeglut": {
-      "baseline": "3.4.0",
-      "port-version": 3
+      "baseline": "3.6.0",
+      "port-version": 0
     },
     "freeimage": {
       "baseline": "3.18.0",

versions/f-/freeglut.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "501dfdaa34842155768b87802ae16c0d99baa820",
+      "version": "3.6.0",
+      "port-version": 0
+    },
     {
       "git-tree": "b222b77ede99ed4a9cfa085f32609a746340ee9d",
       "version": "3.4.0",