Remove libglvnd-core-devel

conda-forge · Aug 11, 2024 · 4733b25 · 4733b25
1 parent b6fc026
commit 4733b25
Showing 1 changed file with 15 additions and 43 deletions.
diff --git a/recipes/libglvnd/meta.yaml b/recipes/libglvnd/meta.yaml
@@ -39,16 +39,26 @@ outputs:
         # Shared libraries (change in any SOVER means we need to react on run-export)
         - test -f $PREFIX/lib/libGLdispatch.so.0
 
-  - name: libglvnd-core-devel
+  - name: libglvnd-devel
     files:
+      - lib/libGLdispatch.so
       - lib/pkgconfig/libglvnd.pc
       - include/glvnd
+    build:
+      run_exports:
+        - {{ pin_subpackage('libglvnd', max_pin='x') }}
+    requirements:
+      build:
+        - {{ stdlib('c') }}
+      host:
+        - {{ pin_subpackage('libglvnd', exact=True) }}
+      run:
+        - {{ pin_subpackage('libglvnd', exact=True) }}
     test:
+      requires:
+        - pkg-config
       commands:
-        # The libglvnd-core-devel package is a bootstrap trick
-        # for Mesa which wants to build against the libglvnd
-        # headers but does not link against any of its libraries
-        - test -f $PREFIX/lib/pkgconfig/libglvnd.pc
+        - pkg-config --print-errors libglvnd
         - test -f $PREFIX/include/glvnd/GLdispatchABI.h
         - test -f $PREFIX/include/glvnd/libeglabi.h
         - test -f $PREFIX/include/glvnd/libglxabi.h
@@ -294,44 +304,6 @@ outputs:
         - test -f $PREFIX/include/GLES3/gl3ext.h
         - test -f $PREFIX/include/GLES3/gl3platform.h
 
-  - name: libglvnd-devel
-    files:
-      - lib/libGLdispatch.so
-    build:
-      run_exports:
-        - {{ pin_subpackage('libglvnd', max_pin='x') }}
-      ignore_run_exports_from:
-        # Only need the headers during development build
-        - libopengl-devel
-        - libglx-devel
-        - libgl-devel
-        - libegl-devel
-        - libgles-devel
-    requirements:
-      build:
-        - {{ stdlib('c') }}
-      host:
-        - {{ pin_subpackage('libglvnd', exact=True) }}
-        - {{ pin_subpackage('libglvnd-core-devel', exact=True) }}
-        - {{ pin_subpackage('libopengl-devel', exact=True) }}
-        - {{ pin_subpackage('libglx-devel', exact=True) }}
-        - {{ pin_subpackage('libgl-devel', exact=True) }}
-        - {{ pin_subpackage('libegl-devel', exact=True) }}
-        - {{ pin_subpackage('libgles-devel', exact=True) }}
-      run:
-        - {{ pin_subpackage('libglvnd', exact=True) }}
-        - {{ pin_subpackage('libglvnd-core-devel', exact=True) }}
-        - {{ pin_subpackage('libopengl-devel', exact=True) }}
-        - {{ pin_subpackage('libglx-devel', exact=True) }}
-        - {{ pin_subpackage('libgl-devel', exact=True) }}
-        - {{ pin_subpackage('libegl-devel', exact=True) }}
-        - {{ pin_subpackage('libgles-devel', exact=True) }}
-    test:
-      requires:
-        - pkg-config
-      commands:
-        - pkg-config --print-errors libglvnd
-
 about:
   home: https://gitlab.freedesktop.org/glvnd/libglvnd
   license: LicenseRef-libglvnd