diff --git a/.github/workflows/build-packages.yaml b/.github/workflows/build-packages.yaml index 37a6a78c..7870c0a7 100644 --- a/.github/workflows/build-packages.yaml +++ b/.github/workflows/build-packages.yaml @@ -10,11 +10,9 @@ jobs: build-packages: strategy: matrix: - target-os: [ debian-12, ubuntu-2204, ubuntu-2404, fedora-40, fedora-41, fedora-42, arch, opensuse-tumbleweed ] + target-os: [ debian-12, ubuntu-2204, ubuntu-2404, fedora-41, fedora-42, arch, opensuse-tumbleweed ] recipe: [ lact, lact-headless ] include: - - target-os: fedora-40 - recipe: lact-libadwaita - target-os: fedora-41 recipe: lact-libadwaita - target-os: fedora-42 diff --git a/.pkger.yml b/.pkger.yml index b03f0cd5..20f33659 100644 --- a/.pkger.yml +++ b/.pkger.yml @@ -11,12 +11,6 @@ images: - name: debian-12 target: deb os: Debian - - name: fedora-39 - target: rpm - os: Fedora - - name: fedora-40 - target: rpm - os: Fedora - name: fedora-41 target: rpm - name: fedora-42 diff --git a/pkg/fedora-spec/lact-headless.spec b/pkg/fedora-spec/lact-headless.spec index b60b556c..db534eec 100644 --- a/pkg/fedora-spec/lact-headless.spec +++ b/pkg/fedora-spec/lact-headless.spec @@ -7,8 +7,8 @@ URL: https://github.com/ilya-zlobintsev/LACT Source0: https://github.com/ilya-zlobintsev/LACT/archive/refs/tags/v0.7.4.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: rust cargo gcc libdrm-devel dbus ocl-icd-devel curl make clang git vulkan-tools -Requires: libdrm ocl-icd-devel hwdata vulkan-tools +BuildRequires: rust cargo gcc libdrm-devel dbus OpenCL-ICD-Loader-devel curl make clang git vulkan-tools +Requires: libdrm libOpenCL.so.1 hwdata vulkan-tools %description GPU control utility diff --git a/pkg/fedora-spec/lact-libadwaita.spec b/pkg/fedora-spec/lact-libadwaita.spec index 8f01f552..736d274f 100644 --- a/pkg/fedora-spec/lact-libadwaita.spec +++ b/pkg/fedora-spec/lact-libadwaita.spec @@ -7,8 +7,8 @@ URL: https://github.com/ilya-zlobintsev/LACT Source0: https://github.com/ilya-zlobintsev/LACT/archive/refs/tags/v0.7.4.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: rust cargo gtk4-devel gcc libdrm-devel libadwaita-devel dbus ocl-icd-devel curl make clang git vulkan-tools -Requires: gtk4 libdrm libadwaita ocl-icd-devel hwdata vulkan-tools +BuildRequires: rust cargo gtk4-devel gcc libdrm-devel libadwaita-devel dbus OpenCL-ICD-Loader-devel curl make clang git vulkan-tools +Requires: gtk4 libdrm libadwaita libOpenCL.so.1 hwdata vulkan-tools %description GPU control utility diff --git a/pkg/fedora-spec/lact.spec b/pkg/fedora-spec/lact.spec index e546a890..cc232d7a 100644 --- a/pkg/fedora-spec/lact.spec +++ b/pkg/fedora-spec/lact.spec @@ -7,8 +7,8 @@ URL: https://github.com/ilya-zlobintsev/LACT Source0: https://github.com/ilya-zlobintsev/LACT/archive/refs/tags/v0.7.4.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: rust cargo gtk4-devel gcc libdrm-devel dbus ocl-icd-devel curl make clang git vulkan-tools -Requires: gtk4 libdrm ocl-icd-devel hwdata vulkan-tools +BuildRequires: rust cargo gtk4-devel gcc libdrm-devel dbus OpenCL-ICD-Loader-devel curl make clang git vulkan-tools +Requires: gtk4 libdrm libOpenCL.so.1 hwdata vulkan-tools %description GPU control utility diff --git a/pkg/images/fedora-40/Dockerfile b/pkg/images/fedora-40/Dockerfile deleted file mode 100644 index 2bbec80a..00000000 --- a/pkg/images/fedora-40/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -FROM quay.io/fedora/fedora:40 diff --git a/pkg/recipes/lact-headless/recipe.yml b/pkg/recipes/lact-headless/recipe.yml index 42a8af25..b77696bf 100644 --- a/pkg/recipes/lact-headless/recipe.yml +++ b/pkg/recipes/lact-headless/recipe.yml @@ -13,13 +13,14 @@ metadata: depends: all: [ hwdata, vulkan-tools ] debian-12+ubuntu-2204+ubuntu-2404: [ libdrm-amdgpu1, libdrm2, ocl-icd-opencl-dev ] - fedora-40+fedora-41+fedora-42+rhel-8+rhel-9: [ libdrm, ocl-icd-devel ] + fedora-41+fedora-42+rhel-8+rhel-9: [ libdrm, libOpenCL.so.1 ] arch: [ libdrm, ocl-icd ] - opensuse-tumbleweed: [ libdrm, ocl-icd-devel ] + opensuse-tumbleweed: [ libdrm, libOpenCL.so.1 ] build_depends: all: [ curl, make, clang, git, vulkan-tools ] debian-12+ubuntu-2204+ubuntu-2404: [ pkg-config, build-essential, libdrm-dev, dbus, ocl-icd-opencl-dev ] - fedora-40+fedora-41+fedora-42+rhel-8+rhel-9: [ gcc, libdrm-devel, dbus, ocl-icd-devel ] + fedora-41+fedora-42: [ gcc, libdrm-devel, dbus, OpenCL-ICD-Loader-devel ] + rhel-8+rhel-9: [ gcc, libdrm-devel, dbus, ocl-icd-devel ] arch: [ libdrm, dbus, ocl-icd ] opensuse-tumbleweed: [ libdrm-devel, ocl-icd-devel ] all_images: true diff --git a/pkg/recipes/lact-libadwaita/recipe.yml b/pkg/recipes/lact-libadwaita/recipe.yml index 24a36970..5340cd10 100644 --- a/pkg/recipes/lact-libadwaita/recipe.yml +++ b/pkg/recipes/lact-libadwaita/recipe.yml @@ -12,12 +12,12 @@ metadata: conflicts: [ lact, lact-headless ] depends: all: [ hwdata, vulkan-tools ] - fedora-40+fedora-41+fedora-42: [ gtk4, libdrm, libadwaita ocl-icd-devel ] + fedora-41+fedora-42: [ gtk4, libdrm, libadwaita libOpenCL.so.1 ] arch: [ gtk4, libadwaita, ocl-icd ] - opensuse-tumbleweed: [ libdrm, libadwaita, ocl-icd-devel ] + opensuse-tumbleweed: [ libdrm, libadwaita, libOpenCL.so.1 ] build_depends: all: [ curl, make, clang, git, vulkan-tools ] - fedora-40+fedora-41+fedora-42: [ gtk4-devel, gcc, libdrm-devel, libadwaita-devel, dbus, ocl-icd-devel ] + fedora-41+fedora-42: [ gtk4-devel, gcc, libdrm-devel, libadwaita-devel, dbus, OpenCL-ICD-Loader-devel ] arch: [ gtk4, libadwaita, dbus, ocl-icd ] opensuse-tumbleweed: [ libdrm-devel, libadwaita-devel, ocl-icd-devel ] all_images: true diff --git a/pkg/recipes/lact/recipe.yml b/pkg/recipes/lact/recipe.yml index 89a0d035..ae420581 100644 --- a/pkg/recipes/lact/recipe.yml +++ b/pkg/recipes/lact/recipe.yml @@ -13,13 +13,13 @@ metadata: depends: all: [ hwdata, vulkan-tools ] debian-12+ubuntu-2204+ubuntu-2404: [ libgtk-4-1, libdrm2, libdrm-amdgpu1, ocl-icd-opencl-dev ] - fedora-40+fedora-41+fedora-42: [ gtk4, libdrm, ocl-icd-devel ] + fedora-41+fedora-42: [ gtk4, libdrm, libOpenCL.so.1 ] arch: [ gtk4, ocl-icd ] - opensuse-tumbleweed: [ gtk4, ocl-icd-devel ] + opensuse-tumbleweed: [ gtk4, libOpenCL.so.1 ] build_depends: all: [ curl, make, clang, git, vulkan-tools ] debian-12+ubuntu-2204+ubuntu-2404: [ libgtk-4-dev, pkg-config, build-essential, libdrm-dev, dbus, ocl-icd-opencl-dev ] - fedora-40+fedora-41+fedora-42: [ gtk4-devel, gcc, libdrm-devel, dbus, ocl-icd-devel ] + fedora-41+fedora-42: [ gtk4-devel, gcc, libdrm-devel, dbus, OpenCL-ICD-Loader-devel ] arch: [ gtk4, dbus, ocl-icd ] opensuse-tumbleweed: [ gtk4-devel, libdrm-devel, ocl-icd-devel ] all_images: true