Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/workflows/sanity_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,13 @@ jobs:
python3 -m pip install license-expression
python3 -m pip install --pre meson

- name: Work around runner-images issue 9966
run: |
brew list -1 | grep python@ | while read formula; do
brew unlink $formula
brew link --overwrite $formula
done

- name: Restore sources
uses: actions/cache/restore@v4
with:
Expand Down
1 change: 1 addition & 0 deletions releases.json
Original file line number Diff line number Diff line change
Expand Up @@ -988,6 +988,7 @@
"glut"
],
"versions": [
"3.4.0-4",
"3.4.0-3",
"3.4.0-2",
"3.4.0-1"
Expand Down
18 changes: 18 additions & 0 deletions subprojects/packagefiles/freeglut/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
'c',
version: '3.4.0',
license: 'MIT',
meson_version: '>= 0.58.0',

Check notice on line 26 in subprojects/packagefiles/freeglut/meson.build

View workflow job for this annotation

GitHub Actions / Ubuntu (x86_64)

Minimum Meson version is 0.58.0

0.47.0: dict 0.58.0: str.replace
)

cc = meson.get_compiler('c')
Expand Down Expand Up @@ -67,12 +67,30 @@
'src/fg_window.c',
)

dep_glu = dependency(
'glu',
required: false,
)
# GLU is part of OpenGL.Framework, which is available through
# dependency('gl') below.
if not dep_glu.found() and host_machine.system() != 'darwin'
_glu_name = 'GLU'
if host_machine.system() == 'windows'
_glu_name = 'glu32'
endif
dep_glu = cc.find_library(
_glu_name,
has_headers: 'GL/glu.h',
)
endif

freeglut_deps = [
cc.find_library(
'm',
required: false,
),
dependency('gl'),
dep_glu,
]

if host_system == 'windows'
Expand Down
Loading