From d51bc95ce3b7dfbc892fe83cd6c964498fb40a27 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sun, 9 Feb 2025 15:44:31 -0500 Subject: [PATCH 01/10] F42 --- container.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/container.yaml b/container.yaml index e652fe3..4baa37f 100644 --- a/container.yaml +++ b/container.yaml @@ -1,10 +1,10 @@ flatpak: id: org.fedoraproject.Platform.GL.default build-extension: true - runtime-version: f41 - name: f41/mesa + runtime-version: f42 + name: f42/mesa component: mesa-flatpak - branch: f41 + branch: f42 packages: - mesa-libd3d - mesa-libEGL From 2fdfbb81a7c69d4cbcc9e76ba8edb462325347b1 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 26 Feb 2025 17:12:57 -0500 Subject: [PATCH 02/10] Update for mesa-25.0 and llvm relocation --- container.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/container.yaml b/container.yaml index 4baa37f..adb0da3 100644 --- a/container.yaml +++ b/container.yaml @@ -9,7 +9,6 @@ flatpak: - mesa-libd3d - mesa-libEGL - mesa-libGL - - mesa-libglapi - mesa-libOpenCL - mesa-libTeflon - mesa-dri-drivers @@ -30,11 +29,12 @@ flatpak: - sed cleanup-commands: | mkdir -p /app/lib /app/share - for l in libclang-cpp libdrm_* libEGL_mesa libgallium-* libglapi \ - libGLX_mesa libLLVM libLLVMSPIRVLib libMesaOpenCL libRusticlOpenCL \ + for l in libdrm_* libEGL_mesa libgallium-* \ + libGLX_mesa libLLVMSPIRVLib libMesaOpenCL libRusticlOpenCL \ libteflon libVkLayer_MESA* libvulkan_* libsensors ; \ do mv /usr/lib64/$l.so* /app/lib/; \ done + mv /usr/lib64/llvm19/lib/lib{clang-cpp,LLVM}* /app/lib/ case $(arch) in aarch64|x86_64) mv /usr/lib64/libpowervr_rogue.so* /app/lib/ ;; esac mv /usr/lib64/{clc,d3d,dri,gallium-pipe,gbm,vdpau}/ /app/lib/ mv /usr/share/{drirc.d,glvnd,vulkan}/ /etc/OpenCL /app/share/ From 3964d7b778409084a2aa372f672c34bffd6b8718 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 10 Mar 2025 15:02:19 -0400 Subject: [PATCH 03/10] Update for LLVM 20 --- container.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container.yaml b/container.yaml index adb0da3..5dfa131 100644 --- a/container.yaml +++ b/container.yaml @@ -34,7 +34,7 @@ flatpak: libteflon libVkLayer_MESA* libvulkan_* libsensors ; \ do mv /usr/lib64/$l.so* /app/lib/; \ done - mv /usr/lib64/llvm19/lib/lib{clang-cpp,LLVM}* /app/lib/ + mv /usr/lib64/llvm*/lib/lib{clang-cpp,LLVM}* /app/lib/ case $(arch) in aarch64|x86_64) mv /usr/lib64/libpowervr_rogue.so* /app/lib/ ;; esac mv /usr/lib64/{clc,d3d,dri,gallium-pipe,gbm,vdpau}/ /app/lib/ mv /usr/share/{drirc.d,glvnd,vulkan}/ /etc/OpenCL /app/share/ From 6d9690db08f8bc5073397a0e01dc2ee593847e27 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sun, 30 Mar 2025 00:24:14 -0400 Subject: [PATCH 04/10] Add mesa-flatpak-config --- container.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/container.yaml b/container.yaml index 5dfa131..a723ea8 100644 --- a/container.yaml +++ b/container.yaml @@ -15,6 +15,7 @@ flatpak: - mesa-va-drivers - mesa-vdpau-drivers - mesa-vulkan-drivers + - mesa-flatpak-config # basic dependencies - libdrm - lm_sensors-libs From 9312124d5e9718a0344349cd3d25a8542196e7dd Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 2 Apr 2025 17:30:34 -0400 Subject: [PATCH 05/10] Add rocm-opencl OpenCL is lumped together with OpenGL in flatpak extensions (both default and nvidia), and the ICD loaders only support a single vendors directory (unlike vulkan, which allows both GL and VulkanLayer extensions). --- container.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/container.yaml b/container.yaml index a723ea8..c5b1b45 100644 --- a/container.yaml +++ b/container.yaml @@ -24,6 +24,10 @@ flatpak: - libclc - llvm-libs - spirv-llvm-translator + # ROCm (not mesa, but OpenCL is lumped together with OpenCL) + - name: rocm-opencl + platforms: + only: [x86_64] # for cleanup-commands (part of runtime) - coreutils-single - findutils @@ -36,7 +40,10 @@ flatpak: do mv /usr/lib64/$l.so* /app/lib/; \ done mv /usr/lib64/llvm*/lib/lib{clang-cpp,LLVM}* /app/lib/ - case $(arch) in aarch64|x86_64) mv /usr/lib64/libpowervr_rogue.so* /app/lib/ ;; esac + case $(arch) in \ + x86_64) mv /usr/lib64/lib{amd_comgr,amdocl64,cltrace,hsa-runtime64,numa}.so.* /app/lib/ ;;& \ + aarch64|x86_64) mv /usr/lib64/libpowervr_rogue.so* /app/lib/ ;; \ + esac mv /usr/lib64/{clc,d3d,dri,gallium-pipe,gbm,vdpau}/ /app/lib/ mv /usr/share/{drirc.d,glvnd,vulkan}/ /etc/OpenCL /app/share/ ln -s lib/vdpau share/glvnd share/OpenCL share/vulkan /app/ From 1aafb9564770c7e080d2f0cad363da499863f7fd Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sun, 29 Jun 2025 18:12:29 -0400 Subject: [PATCH 06/10] LLVM reverted the prefix change https://pagure.io/fesco/issue/3414 https://src.fedoraproject.org/rpms/llvm/c/595c2a20d256bf8e3b2ac8687c0029b42e64878d --- container.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/container.yaml b/container.yaml index c5b1b45..7243530 100644 --- a/container.yaml +++ b/container.yaml @@ -24,7 +24,7 @@ flatpak: - libclc - llvm-libs - spirv-llvm-translator - # ROCm (not mesa, but OpenCL is lumped together with OpenCL) + # ROCm (not mesa, but OpenCL is lumped together with OpenGL) - name: rocm-opencl platforms: only: [x86_64] @@ -39,7 +39,7 @@ flatpak: libteflon libVkLayer_MESA* libvulkan_* libsensors ; \ do mv /usr/lib64/$l.so* /app/lib/; \ done - mv /usr/lib64/llvm*/lib/lib{clang-cpp,LLVM}* /app/lib/ + mv /usr/lib64/lib{clang-cpp,LLVM}* /app/lib/ case $(arch) in \ x86_64) mv /usr/lib64/lib{amd_comgr,amdocl64,cltrace,hsa-runtime64,numa}.so.* /app/lib/ ;;& \ aarch64|x86_64) mv /usr/lib64/libpowervr_rogue.so* /app/lib/ ;; \ From 6a91773a2b54a6f8c18f84c11ec0a123803531a4 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 29 Jul 2025 22:27:55 -0400 Subject: [PATCH 07/10] Update for mesa 25.1 Clover was disabled in advance of its being dropped upstream. --- container.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container.yaml b/container.yaml index 7243530..dccb866 100644 --- a/container.yaml +++ b/container.yaml @@ -35,7 +35,7 @@ flatpak: cleanup-commands: | mkdir -p /app/lib /app/share for l in libdrm_* libEGL_mesa libgallium-* \ - libGLX_mesa libLLVMSPIRVLib libMesaOpenCL libRusticlOpenCL \ + libGLX_mesa libLLVMSPIRVLib libRusticlOpenCL \ libteflon libVkLayer_MESA* libvulkan_* libsensors ; \ do mv /usr/lib64/$l.so* /app/lib/; \ done From fdddf6bb8485a3b7b96384cea64c2fa66a8cd9de Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 29 Jul 2025 22:34:44 -0400 Subject: [PATCH 08/10] gallium-pipe was also for Clover --- container.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container.yaml b/container.yaml index dccb866..ff4ba27 100644 --- a/container.yaml +++ b/container.yaml @@ -44,7 +44,7 @@ flatpak: x86_64) mv /usr/lib64/lib{amd_comgr,amdocl64,cltrace,hsa-runtime64,numa}.so.* /app/lib/ ;;& \ aarch64|x86_64) mv /usr/lib64/libpowervr_rogue.so* /app/lib/ ;; \ esac - mv /usr/lib64/{clc,d3d,dri,gallium-pipe,gbm,vdpau}/ /app/lib/ + mv /usr/lib64/{clc,d3d,dri,gbm,vdpau}/ /app/lib/ mv /usr/share/{drirc.d,glvnd,vulkan}/ /etc/OpenCL /app/share/ ln -s lib/vdpau share/glvnd share/OpenCL share/vulkan /app/ sed -i -e 's|/usr/lib64/|&GL/default/lib/|' /app/share/vulkan/icd.d/* From 6db1d2da226c0f51d5a80b1009686274474be3ca Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 19 Aug 2025 16:02:51 -0400 Subject: [PATCH 09/10] Drop mesa-libd3d This is being removed from mesa 25.2.0. --- container.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/container.yaml b/container.yaml index ff4ba27..d3e8765 100644 --- a/container.yaml +++ b/container.yaml @@ -6,7 +6,6 @@ flatpak: component: mesa-flatpak branch: f42 packages: - - mesa-libd3d - mesa-libEGL - mesa-libGL - mesa-libOpenCL @@ -44,7 +43,7 @@ flatpak: x86_64) mv /usr/lib64/lib{amd_comgr,amdocl64,cltrace,hsa-runtime64,numa}.so.* /app/lib/ ;;& \ aarch64|x86_64) mv /usr/lib64/libpowervr_rogue.so* /app/lib/ ;; \ esac - mv /usr/lib64/{clc,d3d,dri,gbm,vdpau}/ /app/lib/ + mv /usr/lib64/{clc,dri,gbm,vdpau}/ /app/lib/ mv /usr/share/{drirc.d,glvnd,vulkan}/ /etc/OpenCL /app/share/ ln -s lib/vdpau share/glvnd share/OpenCL share/vulkan /app/ sed -i -e 's|/usr/lib64/|&GL/default/lib/|' /app/share/vulkan/icd.d/* From d573bea27bbc4f7be4defdd4a89c2085744ff3aa Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 16 Sep 2025 01:12:12 -0400 Subject: [PATCH 10/10] Switch to per-version branches --- container.yaml | 50 -------------------------------------------------- 1 file changed, 50 deletions(-) delete mode 100644 container.yaml diff --git a/container.yaml b/container.yaml deleted file mode 100644 index d3e8765..0000000 --- a/container.yaml +++ /dev/null @@ -1,50 +0,0 @@ -flatpak: - id: org.fedoraproject.Platform.GL.default - build-extension: true - runtime-version: f42 - name: f42/mesa - component: mesa-flatpak - branch: f42 - packages: - - mesa-libEGL - - mesa-libGL - - mesa-libOpenCL - - mesa-libTeflon - - mesa-dri-drivers - - mesa-va-drivers - - mesa-vdpau-drivers - - mesa-vulkan-drivers - - mesa-flatpak-config - # basic dependencies - - libdrm - - lm_sensors-libs - # OpenCL dependencies - - clang-libs - - libclc - - llvm-libs - - spirv-llvm-translator - # ROCm (not mesa, but OpenCL is lumped together with OpenGL) - - name: rocm-opencl - platforms: - only: [x86_64] - # for cleanup-commands (part of runtime) - - coreutils-single - - findutils - - sed - cleanup-commands: | - mkdir -p /app/lib /app/share - for l in libdrm_* libEGL_mesa libgallium-* \ - libGLX_mesa libLLVMSPIRVLib libRusticlOpenCL \ - libteflon libVkLayer_MESA* libvulkan_* libsensors ; \ - do mv /usr/lib64/$l.so* /app/lib/; \ - done - mv /usr/lib64/lib{clang-cpp,LLVM}* /app/lib/ - case $(arch) in \ - x86_64) mv /usr/lib64/lib{amd_comgr,amdocl64,cltrace,hsa-runtime64,numa}.so.* /app/lib/ ;;& \ - aarch64|x86_64) mv /usr/lib64/libpowervr_rogue.so* /app/lib/ ;; \ - esac - mv /usr/lib64/{clc,dri,gbm,vdpau}/ /app/lib/ - mv /usr/share/{drirc.d,glvnd,vulkan}/ /etc/OpenCL /app/share/ - ln -s lib/vdpau share/glvnd share/OpenCL share/vulkan /app/ - sed -i -e 's|/usr/lib64/|&GL/default/lib/|' /app/share/vulkan/icd.d/* - find /app -print