Skip to content

Commit 30203e8

Browse files
dcommanderdcommander
committed
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.
1 parent 4de5d83 commit 30203e8

7 files changed

Lines changed: 23 additions & 12 deletions

File tree

‎ChangeLog.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ This allows applications, such as Chrome/Chromium, to fail gracefully or use a
4444
different API (such as EGL/X11) if the VirtualGL Faker is unable to emulate
4545
GLX.
4646

47+
9. The VirtualGL Client now runs on Macs with Apple silicon CPUs (without
48+
requiring Rosetta 2.)
49+
4750

4851
3.0.90 (3.1 beta1)
4952
==================

‎cmakescripts/BuildPackages.cmake‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,13 @@ string(REGEX REPLACE "/" ":" CMAKE_INSTALL_MACPREFIX ${CMAKE_INSTALL_PREFIX})
140140
string(REGEX REPLACE "^:" "" CMAKE_INSTALL_MACPREFIX
141141
${CMAKE_INSTALL_MACPREFIX})
142142

143+
if(CMAKE_OSX_ARCHITECTURES)
144+
string(REGEX REPLACE ";" "," MACOS_HOST_ARCHITECTURES
145+
"${CMAKE_OSX_ARCHITECTURES}")
146+
else()
147+
set(MACOS_HOST_ARCHITECTURES ${CPU_TYPE})
148+
endif()
149+
143150
configure_file(release/makemacpkg.in pkgscripts/makemacpkg)
144151
configure_file(release/Distribution.xml.in pkgscripts/Distribution.xml)
145152
configure_file(release/uninstall.in pkgscripts/uninstall)

‎doc/index.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
55
<meta name="language" content="en">
6-
<meta name="date" content="2023-03-15T07:55:15">
6+
<meta name="date" content="2023-03-15T08:59:00">
77
<meta name="generator" content="deplate.rb 0.8.5">
88
<title>User&rsquo;s Guide for VirtualGL 3.1</title>
99
<link rel="start" href="index.html" title="Frontpage">
@@ -614,16 +614,16 @@ <h2 id="hd004002">4.2&nbsp;Mac/x86</h2>
614614
</tr>
615615
</thead>
616616
<tr class="standard">
617-
<td class="high standard">Recommended CPU</td>
618-
<td class="standard">Any 64-bit Intel-based Mac</td>
617+
<td class="high standard">CPU</td>
618+
<td class="standard">64-bit Intel or Apple silicon required</td>
619619
</tr>
620620
<tr class="standard">
621621
<td class="high standard">O/S</td>
622-
<td class="standard">OS X/macOS 10.7 &ldquo;Lion&rdquo; or later</td>
622+
<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>
623623
</tr>
624624
<tr class="standard">
625625
<td class="high standard">Other Software</td>
626-
<td class="standard"><span class="remote"><a href="http://xquartz.macosforge.org" class="remote">XQuartz</a></span><a name="idx0012"></a></td>
626+
<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>
627627
</tr>
628628
</table>
629629
</div>

‎doc/sysreq.txt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,15 @@
5050
** Mac/x86
5151

5252
|| || Client (if using the VGL Transport) ||
53-
| Recommended CPU \
54-
| Any 64-bit Intel-based Mac \
53+
| CPU \
54+
| 64-bit Intel or Apple silicon required \
5555
|
5656
| O/S \
57-
| OS X/macOS 10.7 "Lion" or later \
57+
| OS X/macOS 10.9 "Mavericks" or later (Intel); macOS 11 "Big Sur" or later \
58+
(Apple silicon) \
5859
|
5960
| Other Software \
60-
| [[http://xquartz.macosforge.org][XQuartz]] \
61+
| [[http://xquartz.macosforge.org][XQuartz]] 2.8.0 or later \
6162
|
6263
#OPT: hiCol=first
6364

‎release/Distribution.xml.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
enable_currentUserHome="false"
1010
enable_localSystem="true"
1111
/>
12-
<options customize="never" />
12+
<options customize="never" hostArchitectures="@MACOS_HOST_ARCHITECTURES@" />
1313
<choices-outline>
1414
<line choice="default">
1515
<line choice="@PKGID@"/>

‎release/Welcome.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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.
1+
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.

‎release/makemacpkg.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ if [ "$PREFIX" = "@CMAKE_INSTALL_DEFAULT_PREFIX@" ]; then
7878
ln -fs /Library/Documentation/$PKGNAME $PKGROOT/$PREFIX/doc
7979
fi
8080
install -m 644 @CMAKE_BINARY_DIR@/pkgscripts/uninstall.applescript $TMPDIR
81-
osacompile -t APPL -a x86_64 -o "$TMPDIR/Uninstall $PROJECT.app" $TMPDIR/uninstall.applescript
81+
osacompile -t APPL -o "$TMPDIR/Uninstall $PROJECT.app" $TMPDIR/uninstall.applescript
8282
if [ "$MACOS_APP_CERT_NAME" != "" ]; then
8383
codesign -f -s "$MACOS_APP_CERT_NAME" --timestamp "$TMPDIR/Uninstall $PROJECT.app"
8484
codesign -vv "$TMPDIR/Uninstall $PROJECT.app"

0 commit comments

Comments
 (0)