Officially support Macs with Apple silicon CPUs

Note that this changes our official minimum supported O/S from 10.7 "Lion" to 10.9 "Mavericks". However, the official macOS binaries have actually required Mavericks since VirtualGL 3.0, since they were built against XQuartz 2.8.x.
VirtualGL · Mar 15, 2023 · 30203e8 · 30203e8
1 parent 4de5d83
commit 30203e8
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 12 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -44,6 +44,9 @@ This allows applications, such as Chrome/Chromium, to fail gracefully or use a
 different API (such as EGL/X11) if the VirtualGL Faker is unable to emulate
 GLX.
 
+9. The VirtualGL Client now runs on Macs with Apple silicon CPUs (without
+requiring Rosetta 2.)
+
 
 3.0.90 (3.1 beta1)
 ==================

diff --git a/cmakescripts/BuildPackages.cmake b/cmakescripts/BuildPackages.cmake
@@ -140,6 +140,13 @@ string(REGEX REPLACE "/" ":" CMAKE_INSTALL_MACPREFIX ${CMAKE_INSTALL_PREFIX})
 string(REGEX REPLACE "^:" "" CMAKE_INSTALL_MACPREFIX
  ${CMAKE_INSTALL_MACPREFIX})
 
+if(CMAKE_OSX_ARCHITECTURES)
+ string(REGEX REPLACE ";" "," MACOS_HOST_ARCHITECTURES
+ "${CMAKE_OSX_ARCHITECTURES}")
+else()
+ set(MACOS_HOST_ARCHITECTURES ${CPU_TYPE})
+endif()
+
 configure_file(release/makemacpkg.in pkgscripts/makemacpkg)
 configure_file(release/Distribution.xml.in pkgscripts/Distribution.xml)
 configure_file(release/uninstall.in pkgscripts/uninstall)

diff --git a/doc/index.html b/doc/index.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
 <meta name="language" content="en">
-<meta name="date" content="2023-03-15T07:55:15">
+<meta name="date" content="2023-03-15T08:59:00">
 <meta name="generator" content="deplate.rb 0.8.5">
 <title>User&rsquo;s Guide for VirtualGL 3.1</title>
 <link rel="start" href="index.html" title="Frontpage">
@@ -614,16 +614,16 @@ <h2 id="hd004002">4.2&nbsp;Mac/x86</h2>
  </tr>
  </thead>
  <tr class="standard">
- <td class="high standard">Recommended CPU</td>
- <td class="standard">Any 64-bit Intel-based Mac</td>
+ <td class="high standard">CPU</td>
+ <td class="standard">64-bit Intel or Apple silicon required</td>
  </tr>
  <tr class="standard">
  <td class="high standard">O/S</td>
- <td class="standard">OS X/macOS 10.7 &ldquo;Lion&rdquo; or later</td>
+ <td class="standard">OS X/macOS 10.9 &ldquo;Mavericks&rdquo; or later (Intel); macOS 11 &ldquo;Big Sur&rdquo; or later (Apple silicon)</td>
  </tr>
  <tr class="standard">
  <td class="high standard">Other Software</td>
- <td class="standard"><span class="remote"><a href="http://xquartz.macosforge.org" class="remote">XQuartz</a></span><a name="idx0012"></a></td>
+ <td class="standard"><span class="remote"><a href="http://xquartz.macosforge.org" class="remote">XQuartz</a></span><a name="idx0012"></a> 2.8.0 or later</td>
  </tr>
 </table>
 </div>

diff --git a/doc/sysreq.txt b/doc/sysreq.txt
@@ -50,14 +50,15 @@
 ** Mac/x86
 
 || || Client (if using the VGL Transport) ||
-| Recommended CPU \
- | Any 64-bit Intel-based Mac \
+| CPU \
+ | 64-bit Intel or Apple silicon required \
  |
 | O/S \
- | OS X/macOS 10.7 "Lion" or later \
+ | OS X/macOS 10.9 "Mavericks" or later (Intel); macOS 11 "Big Sur" or later \
+ (Apple silicon) \
  |
 | Other Software \
- | [[http://xquartz.macosforge.org][XQuartz]] \
+ | [[http://xquartz.macosforge.org][XQuartz]] 2.8.0 or later \
  |
 #OPT: hiCol=first
 

diff --git a/release/Distribution.xml.in b/release/Distribution.xml.in
@@ -9,7 +9,7 @@
  enable_currentUserHome="false"
  enable_localSystem="true"
  />
- <options customize="never" />
+ <options customize="never" hostArchitectures="@MACOS_HOST_ARCHITECTURES@" />
  <choices-outline>
  <line choice="default">
  <line choice="@PKGID@"/>

diff --git a/release/Welcome.txt b/release/Welcome.txt
@@ -1 +1 @@
-This package will install the VirtualGL Client for Intel-based Mac computers. To remove VirtualGL, use the VirtualGL uninstaller application, which can be found in the same archive as this package or in the "VirtualGL" Applications folder.
+This package will install the VirtualGL Client for Macs with Intel or Apple silicon CPUs. To remove VirtualGL, use the VirtualGL uninstaller application, which can be found in the same archive as this package or in the "VirtualGL" Applications folder.
diff --git a/release/makemacpkg.in b/release/makemacpkg.in
@@ -78,7 +78,7 @@ if [ "$PREFIX" = "@CMAKE_INSTALL_DEFAULT_PREFIX@" ]; then
  ln -fs /Library/Documentation/$PKGNAME $PKGROOT/$PREFIX/doc
 fi
 install -m 644 @CMAKE_BINARY_DIR@/pkgscripts/uninstall.applescript $TMPDIR
-osacompile -t APPL -a x86_64 -o "$TMPDIR/Uninstall $PROJECT.app" $TMPDIR/uninstall.applescript
+osacompile -t APPL -o "$TMPDIR/Uninstall $PROJECT.app" $TMPDIR/uninstall.applescript
 if [ "$MACOS_APP_CERT_NAME" != "" ]; then
  codesign -f -s "$MACOS_APP_CERT_NAME" --timestamp "$TMPDIR/Uninstall $PROJECT.app"
  codesign -vv "$TMPDIR/Uninstall $PROJECT.app"