From c91bcb157c1fc605f310266667e732eb84e0be91 Mon Sep 17 00:00:00 2001
From: Davide Beatrici <git@davidebeatrici.dev>
Date: Fri, 9 Apr 2021 19:09:10 +0200
Subject: [freeglut] Don't enforce x64 when the compiler is 64 bit (#16911)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [freeglut] Don't enforce x64 when the compiler is 64 bit

This fixes compilation for ARM64.

* [freeglut] Update manifest

* Update ports/freeglut/CONTROL

* Update versions/f-/freeglut.json

* Update versions/baseline.json

* Update versions/baseline.json

* Update versions/f-/freeglut.json

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
---
 ports/freeglut/CONTROL                  |  3 ++-
 ports/freeglut/no_x64_enforcement.patch | 17 +++++++++++++++++
 ports/freeglut/portfile.cmake           |  1 +
 versions/baseline.json                  |  4 ++--
 versions/f-/freeglut.json               |  5 +++++
 5 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100755 ports/freeglut/no_x64_enforcement.patch
 mode change 100644 => 100755 ports/freeglut/portfile.cmake

diff --git a/ports/freeglut/CONTROL b/ports/freeglut/CONTROL
index 452615768..f4abd33bd 100644
--- a/ports/freeglut/CONTROL
+++ b/ports/freeglut/CONTROL
@@ -1,4 +1,5 @@
 Source: freeglut
-Version: 3.2.1-4
+Version: 3.2.1
+Port-Version: 5
 Homepage: https://sourceforge.net/projects/freeglut/
 Description: Open source implementation of GLUT with source and binary backwards compatibility.
diff --git a/ports/freeglut/no_x64_enforcement.patch b/ports/freeglut/no_x64_enforcement.patch
new file mode 100755
index 000000000..d98332366
--- /dev/null
+++ b/ports/freeglut/no_x64_enforcement.patch
@@ -0,0 +1,17 @@
+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:
diff --git a/ports/freeglut/portfile.cmake b/ports/freeglut/portfile.cmake
old mode 100644
new mode 100755
index 4ec2382ae..8a872e6b6
--- a/ports/freeglut/portfile.cmake
+++ b/ports/freeglut/portfile.cmake
@@ -9,6 +9,7 @@ vcpkg_from_sourceforge(
         macOS_Xquartz.patch
         gcc10.patch
         fix-debug-macro.patch
+        no_x64_enforcement.patch
 )
 
 if(NOT VCPKG_TARGET_IS_WINDOWS)
diff --git a/versions/baseline.json b/versions/baseline.json
index 8014b992a..2630c5eb7 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2049,8 +2049,8 @@
       "port-version": 0
     },
     "freeglut": {
-      "baseline": "3.2.1-4",
-      "port-version": 0
+      "baseline": "3.2.1",
+      "port-version": 5
     },
     "freeimage": {
       "baseline": "3.18.0",
diff --git a/versions/f-/freeglut.json b/versions/f-/freeglut.json
index eff22f2c7..4cf5987f1 100644
--- a/versions/f-/freeglut.json
+++ b/versions/f-/freeglut.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "bfc1c37b44246e2a3c8bfead99af1d14a2103453",
+      "version-string": "3.2.1",
+      "port-version": 5
+    },
     {
       "git-tree": "e74a294251de6c8168d8c7015a497a9a0dd91185",
       "version-string": "3.2.1-4",
-- 
cgit v1.2.3