From 2f8c5abf690e5e11ed525526f972b26876130ac2 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Thu, 9 Nov 2023 20:43:12 +0000
Subject: [PATCH] feat: use system opengl and glx
---
containers/debian/base.Dockerfile | 2 ++
containers/jug/dev.Dockerfile | 1 +
spack-environment/packages.yaml | 9 ++++++++-
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/containers/debian/base.Dockerfile b/containers/debian/base.Dockerfile
index 7f3642415..7e3a80b7a 100644
--- a/containers/debian/base.Dockerfile
+++ b/containers/debian/base.Dockerfile
@@ -41,6 +41,8 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
less \
libcbor-xs-perl \
libjson-xs-perl \
+ libopengl0 \
+ libglx0 \
locales \
lua-posix \
make \
diff --git a/containers/jug/dev.Dockerfile b/containers/jug/dev.Dockerfile
index 649fbbd62..a54379b4e 100644
--- a/containers/jug/dev.Dockerfile
+++ b/containers/jug/dev.Dockerfile
@@ -57,6 +57,7 @@ RUN declare -A target=( \
&& target=${target[${TARGETPLATFORM}]} \
&& spack config --scope site add "packages:all:require:[target=${target}]" \
&& spack config --scope site add "packages:all:target:[${target}]" \
+ && spack external find --scope site llvm \
&& spack config blame packages \
&& spack config --scope user add "config:suppress_gpg_warnings:true" \
&& spack config --scope user add "config:build_jobs:${jobs}" \
diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml
index 768817c00..6182e8ef0 100644
--- a/spack-environment/packages.yaml
+++ b/spack-environment/packages.yaml
@@ -149,6 +149,9 @@ packages:
lcov:
require:
- '@1.16'
+ libglx:
+ require:
+ - opengl
lhapdf:
require:
- '@6.5.1'
@@ -159,7 +162,7 @@ packages:
mesa:
require:
- '@22.1.6'
- - +glx -llvm +opengl +opengles +osmesa
+ - +glx +llvm +opengl +opengles +osmesa
nlohmann-json:
require:
- '@3.11.2'
@@ -175,6 +178,10 @@ packages:
require:
- '@7.7.1'
- +application_framework -vtk
+ opengl:
+ externals:
+ - spec: opengl@4.6
+ prefix: /usr
osg-ca-certs:
require:
- '@1.109.igtf.1.117'
--
GitLab