Skip to content
Snippets Groups Projects
Commit 2f8c5abf authored by Wouter Deconinck's avatar Wouter Deconinck
Browse files

feat: use system opengl and glx

parent 35fc24da
No related branches found
No related tags found
No related merge requests found
...@@ -41,6 +41,8 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ ...@@ -41,6 +41,8 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
less \ less \
libcbor-xs-perl \ libcbor-xs-perl \
libjson-xs-perl \ libjson-xs-perl \
libopengl0 \
libglx0 \
locales \ locales \
lua-posix \ lua-posix \
make \ make \
......
...@@ -57,6 +57,7 @@ RUN declare -A target=( \ ...@@ -57,6 +57,7 @@ RUN declare -A target=( \
&& target=${target[${TARGETPLATFORM}]} \ && target=${target[${TARGETPLATFORM}]} \
&& spack config --scope site add "packages:all:require:[target=${target}]" \ && spack config --scope site add "packages:all:require:[target=${target}]" \
&& spack config --scope site add "packages:all:target:[${target}]" \ && spack config --scope site add "packages:all:target:[${target}]" \
&& spack external find --scope site llvm \
&& spack config blame packages \ && spack config blame packages \
&& spack config --scope user add "config:suppress_gpg_warnings:true" \ && spack config --scope user add "config:suppress_gpg_warnings:true" \
&& spack config --scope user add "config:build_jobs:${jobs}" \ && spack config --scope user add "config:build_jobs:${jobs}" \
......
...@@ -149,6 +149,9 @@ packages: ...@@ -149,6 +149,9 @@ packages:
lcov: lcov:
require: require:
- '@1.16' - '@1.16'
libglx:
require:
- opengl
lhapdf: lhapdf:
require: require:
- '@6.5.1' - '@6.5.1'
...@@ -159,7 +162,7 @@ packages: ...@@ -159,7 +162,7 @@ packages:
mesa: mesa:
require: require:
- '@22.1.6' - '@22.1.6'
- +glx -llvm +opengl +opengles +osmesa - +glx +llvm +opengl +opengles +osmesa
nlohmann-json: nlohmann-json:
require: require:
- '@3.11.2' - '@3.11.2'
...@@ -175,6 +178,10 @@ packages: ...@@ -175,6 +178,10 @@ packages:
require: require:
- '@7.7.1' - '@7.7.1'
- +application_framework -vtk - +application_framework -vtk
opengl:
externals:
- spec: opengl@4.6
prefix: /usr
osg-ca-certs: osg-ca-certs:
require: require:
- '@1.109.igtf.1.117' - '@1.109.igtf.1.117'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment