public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [flatpaks/flatpak-runtime] f45: Add CL extension support
@ 2026-09-11 14:43 Yaakov Selkowitz
  0 siblings, 0 replies; only message in thread
From: Yaakov Selkowitz @ 2026-09-11 14:43 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : flatpaks/flatpak-runtime
Branch : f45
Commit : 86dabfc37e0cc81ebf518977efbba7d024bd8b56
Author : Yaakov Selkowitz <yselkowi@redhat.com>
Date   : 2026-03-02T23:08:05-05:00
Stats  : +39/-12 in 3 file(s)
URL    : https://src.fedoraproject.org/flatpaks/flatpak-runtime/c/86dabfc37e0cc81ebf518977efbba7d024bd8b56?branch=f45

Log:
Add CL extension support

---
diff --git a/container-sdk.in.yaml b/container-sdk.in.yaml
index 7d81e5c..ae8098d 100644
--- a/container-sdk.in.yaml
+++ b/container-sdk.in.yaml
@@ -6,11 +6,19 @@ flatpak:
     branch: @RELEASE@
     runtime: @ID_PREFIX@.Platform
     add-extensions:
+        @ID_PREFIX@.Platform.CL:
+            directory: lib64/OpenCL
+            add-ld-path: lib
+            merge-dirs: lib/clc;vendors
+            subdirectories: true
+            autodelete: false
+            no-autodownload: true
+            download-if: active-gl-driver
         @ID_PREFIX@.Platform.GL:
             directory: lib64/GL
             versions: @RELEASE@;1.4
             add-ld-path: lib
-            merge-dirs: egl/egl_external_platform.d;glvnd/egl_vendor.d;lib/clc;lib/dri;lib/gbm;OpenCL/vendors;vdpau;vulkan/explicit_layer.d;vulkan/icd.d;vulkan/implicit_layer.d
+            merge-dirs: egl/egl_external_platform.d;glvnd/egl_vendor.d;lib/dri;lib/gbm;vdpau;vulkan/explicit_layer.d;vulkan/icd.d;vulkan/implicit_layer.d
             subdirectories: true
             autodelete: false
             no-autodownload: true
@@ -21,7 +29,7 @@ flatpak:
             directory: lib64/GL
             version: '1.4'
             add-ld-path: lib
-            merge-dirs: egl/egl_external_platform.d;glvnd/egl_vendor.d;lib/gbm;OpenCL/vendors;vulkan/icd.d;vulkan/implicit_layer.d
+            merge-dirs: egl/egl_external_platform.d;glvnd/egl_vendor.d;lib/gbm;vulkan/icd.d;vulkan/implicit_layer.d
             subdirectories: true
             autodelete: false
             no-autodownload: true
@@ -115,11 +123,16 @@ flatpak:
         # https://gitlab.com/freedesktop-sdk/freedesktop-sdk/-/issues/857
         sed -e '/~\/\.asoundrc/d' -e 's|/alsa/asoundrc|/asound.conf|' /usr/share/alsa/alsa.conf
 
+        # Create symlinks to expected locations from CL extensions
+        rm -fr /etc/OpenCL/vendors
+        ln -s ../../lib64/OpenCL/vendors /etc/OpenCL/
+        ln -s OpenCL/lib/clc /usr/lib64/
+
         # Create symlinks to expected locations from GL extensions
-        rm -fr /etc/{egl,glvnd,OpenCL,vulkan}
-        rm -fr /usr/lib64/{clc,dri,gbm,vdpau}/
-        ln -s ../lib64/GL/{egl,glvnd,OpenCL,vulkan} /etc/
-        ln -s GL/lib/{clc,dri,gbm} GL/vdpau /usr/lib64/
+        rm -fr /etc/{egl,glvnd,vulkan}
+        rm -fr /usr/lib64/{dri,gbm,vdpau}/
+        ln -s ../lib64/GL/{egl,glvnd,vulkan} /etc/
+        ln -s GL/lib/{dri,gbm} GL/vdpau /usr/lib64/
         # Provide driver implementations with GL extensions
         rm -f /usr/lib64/libdrm_*.so*
 

diff --git a/container.in.yaml b/container.in.yaml
index 1deb1c3..6d22518 100644
--- a/container.in.yaml
+++ b/container.in.yaml
@@ -6,11 +6,19 @@ flatpak:
     branch: @RELEASE@
     sdk: @ID_PREFIX@.Sdk
     add-extensions:
+        @ID_PREFIX@.Platform.CL:
+            directory: lib64/OpenCL
+            add-ld-path: lib
+            merge-dirs: lib/clc;vendors
+            subdirectories: true
+            autodelete: false
+            no-autodownload: true
+            download-if: active-gl-driver
         @ID_PREFIX@.Platform.GL:
             directory: lib64/GL
             versions: @RELEASE@;1.4
             add-ld-path: lib
-            merge-dirs: egl/egl_external_platform.d;glvnd/egl_vendor.d;lib/clc;lib/dri;lib/gbm;OpenCL/vendors;vdpau;vulkan/explicit_layer.d;vulkan/icd.d;vulkan/implicit_layer.d
+            merge-dirs: egl/egl_external_platform.d;glvnd/egl_vendor.d;lib/dri;lib/gbm;vdpau;vulkan/explicit_layer.d;vulkan/icd.d;vulkan/implicit_layer.d
             subdirectories: true
             autodelete: false
             no-autodownload: true
@@ -21,7 +29,7 @@ flatpak:
             directory: lib64/GL
             version: '1.4'
             add-ld-path: lib
-            merge-dirs: egl/egl_external_platform.d;glvnd/egl_vendor.d;lib/gbm;OpenCL/vendors;vulkan/icd.d;vulkan/implicit_layer.d
+            merge-dirs: egl/egl_external_platform.d;glvnd/egl_vendor.d;lib/gbm;vulkan/icd.d;vulkan/implicit_layer.d
             subdirectories: true
             autodelete: false
             no-autodownload: true
@@ -110,11 +118,16 @@ flatpak:
         # https://gitlab.com/freedesktop-sdk/freedesktop-sdk/-/issues/857
         sed -e '/~\/\.asoundrc/d' -e 's|/alsa/asoundrc|/asound.conf|' /usr/share/alsa/alsa.conf
 
+        # Create symlinks to expected locations from CL extensions
+        rm -fr /etc/OpenCL/vendors
+        ln -s ../../lib64/OpenCL/vendors /etc/OpenCL/
+        ln -s OpenCL/lib/clc /usr/lib64/
+
         # Create symlinks to expected locations from GL extensions
-        rm -fr /etc/{egl,glvnd,OpenCL,vulkan}
-        rm -fr /usr/lib64/{clc,dri,gbm,vdpau}/
-        ln -s ../lib64/GL/{egl,glvnd,OpenCL,vulkan} /etc/
-        ln -s GL/lib/{clc,dri,gbm} GL/vdpau /usr/lib64/
+        rm -fr /etc/{egl,glvnd,vulkan}
+        rm -fr /usr/lib64/{dri,gbm,vdpau}/
+        ln -s ../lib64/GL/{egl,glvnd,vulkan} /etc/
+        ln -s GL/lib/{dri,gbm} GL/vdpau /usr/lib64/
         # Provide driver implementations with GL extensions
         rm -f /usr/lib64/libdrm_*.so*
 

diff --git a/package-notes.txt b/package-notes.txt
index 7cf375f..649ab98 100644
--- a/package-notes.txt
+++ b/package-notes.txt
@@ -57,6 +57,7 @@ lua: EB: same SRPM as lua-libs which is a dependency of rpm, and because of that
 lua-devel: EB_SDK: same SRPM as lua-libs which is a dependency of rpm, and because of that cannot be built for /app as rpm in koji buildroots can't use libraries installed in /app
 lz4-libs: W: libarchive
 mailcap: EB: provides /etc/mime.types
+opencl-filesystem: E: required by OpenCL ICDs
 p11-kit-client: EB: provides p11-kit-client.so to make certificates work in container
 pinentry-gnome3: E
 pipewire-jack-audio-connection-kit: EB

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-09-11 14:43 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-11 14:43 [flatpaks/flatpak-runtime] f45: Add CL extension support Yaakov Selkowitz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox