Merge pull request #2334 from ehfd/gl

Update information about OpenGL due to libglvnd

docs/maintainer/knowledge_base.md

@@ -697,12 +697,7 @@ practice has been deprecated.) To add a new CDT, make a PR on the
 
 1. When there are system specific configurations are used by the library.
    Some examples include:
-   1. OpenGL: if we provided the OpenGL loader library `libglvnd`.
-      and the user's system is not using `libglvnd`, then we cannot load the vendor-specific
-      implementations losing out on accelerator/hardware optimized performance.
-      (This is only on old distributions and we may finally be able to package `libglvnd`
-      ourselves)
-   2. linux-pam: This is a library that allows pluggable authentication modules and the
+   1. linux-pam: This is a library that allows pluggable authentication modules and the
       configuration files for these modules usually live in `/etc/pam.d`. The issue is that
       the pluggable modules live in a distro specific location. For example:
       `/usr/lib/x86_64-linux-gnu/security/`. The default modules are built into the
@@ -730,41 +725,19 @@ practice has been deprecated.) To add a new CDT, make a PR on the
    run OpenCL because we have a conda packaged installation, but if there is a system wide
    implementation that is accelerated by specific hardware, we can use those.
 
-In conda-forge the primary usages of CDTs is currently for packages that link against libGL.
-
 <a id="libgl"></a>
 
-#### libGL
+### libGL
 
-In addition to the required compilers `{{ compiler('c') }}` and/or `{{ compiler('cxx') }}`,
-the following CDT packages are required for linking against libGL:
+Note that packages dependent on OpenGL and/or libGL should no longer use CDTs. Instead, use the host dependency `libgl-devel` from the [libglvnd-feedstock](https://github.com/conda-forge/libglvnd-feedstock).
 
 ```yaml
 requirements:
-  build:
-    - {{ cdt('mesa-libgl-devel') }}  # [linux]
-    - {{ cdt('mesa-dri-drivers') }}  # [linux]
-    - {{ cdt('libselinux') }}  # [linux]
-    - {{ cdt('libxdamage') }}  # [linux]
-    - {{ cdt('libxxf86vm') }}  # [linux]
-    - {{ cdt('libxext') }}     # [linux]
   host:
-    - xorg-libxfixes  # [linux]
-```
-
-If you need a fully functional binary in the test phase, you have to also provide the shared
-libraries via `yum_requirements.txt` (see [yum_requirements.txt](#yum-deps)).
-
-```text
-mesa-libGL
-mesa-dri-drivers
-libselinux
-libXdamage
-libXxf86vm
-libXext
+    - libgl-devel  # [linux]
 ```
 
-You will need to re-render the feedstock after making these changes.
+Other OpenGL API variants such as `libegl-devel`, `libgles-devel`, `libglx-devel`, and `libopengl-devel` are also available, and will automatically add non-development `run_exports` dependencies.
 
 <a id="linking-numpy"></a>
 

docs/maintainer/maintainer_faq.md

@@ -131,7 +131,15 @@ Error:
 ImportError: libGL.so.1: cannot open shared object file: No such file or directory
 ```
 
-If you saw this error while building a package in your feedstock, create a [yum_requirements.txt](knowledge_base.md#yum-deps) file and add `mesa-libGL`. See also [CDTs: `libgl`](./knowledge_base.md#libgl).
+If you saw this error while building a package in your feedstock, add the Linux host dependency `libgl-devel`, provided by the [libglvnd-feedstock](https://github.com/conda-forge/libglvnd-feedstock).
+
+```yaml
+requirements:
+  host:
+    - libgl-devel  # [linux]
+```
+
+Other OpenGL API variants such as `libegl-devel`, `libgles-devel`, `libglx-devel`, and `libopengl-devel` are also available, and will automatically add non-development `run_exports` dependencies.
 
 If you are seeing this error after installing a package locally, then you are missing an [OpenGL](https://en.wikipedia.org/wiki/OpenGL) provider in your system dependencies. This is more likely to happen in headless systems with no graphics (servers, Docker images, etc). To fix it, you must install a provider like [Mesa](https://www.mesa3d.org/) with your system package manager.