From af721653e641a1d3192f97ce14aed65c5ad01a3c Mon Sep 17 00:00:00 2001 From: Erik Reider <35975961+ErikReider@users.noreply.github.com> Date: Tue, 24 Jun 2025 11:35:23 +0200 Subject: [PATCH 1/4] Added scenefx-0.3 --- .github/workflows/copr_build.yml | 2 +- .github/workflows/copr_upload.yml | 2 +- COPR/scenefx-0.3/scenefx-0.3.rpkg.spec | 87 ++++++++++++++++++++++++++ 3 files changed, 89 insertions(+), 2 deletions(-) create mode 100644 COPR/scenefx-0.3/scenefx-0.3.rpkg.spec diff --git a/.github/workflows/copr_build.yml b/.github/workflows/copr_build.yml index 0159c14..1fffe1e 100644 --- a/.github/workflows/copr_build.yml +++ b/.github/workflows/copr_build.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - pkgname: [ scenefx-0.1, scenefx-0.2, scenefx ] + pkgname: [ scenefx-0.1, scenefx-0.2, scenefx-0.3, scenefx ] name: Build RPM ${{matrix.pkgname}} container: fedora:latest runs-on: ubuntu-latest diff --git a/.github/workflows/copr_upload.yml b/.github/workflows/copr_upload.yml index 472617b..dcd92c1 100644 --- a/.github/workflows/copr_upload.yml +++ b/.github/workflows/copr_upload.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - pkgname: [ scenefx-0.1, scenefx-0.2, scenefx, swayfx ] + pkgname: [ scenefx-0.1, scenefx-0.2, scenefx-0.3, scenefx, swayfx ] name: Upload ${{matrix.pkgname}} runs-on: ubuntu-latest steps: diff --git a/COPR/scenefx-0.3/scenefx-0.3.rpkg.spec b/COPR/scenefx-0.3/scenefx-0.3.rpkg.spec new file mode 100644 index 0000000..3196801 --- /dev/null +++ b/COPR/scenefx-0.3/scenefx-0.3.rpkg.spec @@ -0,0 +1,87 @@ +# vim: syntax=spec + +# Excludes the micro version, like "0.4" +%global tag 0.3 +# Includes the micro version, like "0.4.1" +%global tag_full 0.3 +# The Source0 tar file name +%global tar_name scenefx-%{tag_full} + +Name: scenefx-%{tag_full} +Version: %{tag_full} +Release: 1%{?dist} +Summary: A drop-in replacement for the wlroots scene API that allows wayland compositors to render surfaces with eye-candy effects +License: MIT +URL: https://github.com/wlrfx/scenefx +Source0: %{url}/archive/refs/tags/%{tag_full}.tar.gz + + +BuildRequires: gcc +BuildRequires: glslang +BuildRequires: gnupg2 +BuildRequires: meson >= 0.59.0 + +BuildRequires: pkgconfig(wlroots-0.18) +BuildRequires: pkgconfig(egl) +BuildRequires: pkgconfig(gbm) >= 17.1.0 +BuildRequires: pkgconfig(glesv2) +BuildRequires: pkgconfig(hwdata) +BuildRequires: pkgconfig(libdrm) >= 2.4.122 +BuildRequires: pkgconfig(pixman-1) >= 0.42.0 +BuildRequires: pkgconfig(wayland-client) +BuildRequires: pkgconfig(wayland-protocols) >= 1.35 +BuildRequires: pkgconfig(wayland-scanner) +BuildRequires: pkgconfig(wayland-server) >= 1.23 + +%description +%{summary} + + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} == %{version}-%{release} +# for examples +Suggests: gcc +Suggests: meson >= 0.58.0 +Suggests: pkgconfig(wayland-egl) + +%description devel +Development files for %{name}. + + +%prep +%autosetup -N -n %{tar_name} + +%build +MESON_OPTIONS=( + # Disable options requiring extra/unpackaged dependencies + -Dexamples=false + -Dwerror=false +) + +%{meson} "${MESON_OPTIONS[@]}" +%{meson_build} + + +%install +%{meson_install} + + +%check +%{meson_test} + + +%files +%license LICENSE +%doc README.md +%{_libdir}/libscenefx-%{tag}.so + + +%files devel +%{_includedir}/scenefx-%{tag}/scenefx +%{_libdir}/libscenefx-%{tag}.so +%{_libdir}/pkgconfig/scenefx-%{tag}.pc + + +# Changelog will be empty until you make first annotated Git tag. +# %changelog From 1e0cddedb91f5610d865da69d31762460415e620 Mon Sep 17 00:00:00 2001 From: Erik Reider <35975961+ErikReider@users.noreply.github.com> Date: Tue, 24 Jun 2025 11:36:12 +0200 Subject: [PATCH 2/4] Updated scenefx to 0.4.1 --- COPR/scenefx/scenefx.rpkg.spec | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/COPR/scenefx/scenefx.rpkg.spec b/COPR/scenefx/scenefx.rpkg.spec index 45610c9..7e6f3b8 100644 --- a/COPR/scenefx/scenefx.rpkg.spec +++ b/COPR/scenefx/scenefx.rpkg.spec @@ -1,32 +1,37 @@ # vim: syntax=spec -%global tag 0.3 +# Excludes the micro version, like "0.4" +%global tag 0.4 +# Includes the micro version, like "0.4.1" +%global tag_full 0.4.1 +# The Source0 tar file name +%global tar_name scenefx-%{tag_full} Name: scenefx -Version: %{tag} -Release: 4%{?dist} +Version: %{tag_full} +Release: 1%{?dist} Summary: A drop-in replacement for the wlroots scene API that allows wayland compositors to render surfaces with eye-candy effects License: MIT URL: https://github.com/wlrfx/scenefx -Source0: %{url}/archive/refs/tags/%{tag}.tar.gz +Source0: %{url}/archive/refs/tags/%{tag_full}.tar.gz BuildRequires: gcc BuildRequires: glslang BuildRequires: gnupg2 -BuildRequires: meson >= 0.59.0 +BuildRequires: meson >= 1.3 -BuildRequires: pkgconfig(wlroots-0.18) +BuildRequires: pkgconfig(wlroots-0.19) BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(gbm) >= 17.1.0 BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig(hwdata) BuildRequires: pkgconfig(libdrm) >= 2.4.122 -BuildRequires: pkgconfig(pixman-1) >= 0.42.0 +BuildRequires: pkgconfig(pixman-1) >= 0.43.0 BuildRequires: pkgconfig(wayland-client) -BuildRequires: pkgconfig(wayland-protocols) >= 1.35 +BuildRequires: pkgconfig(wayland-protocols) >= 1.41 BuildRequires: pkgconfig(wayland-scanner) -BuildRequires: pkgconfig(wayland-server) >= 1.23 +BuildRequires: pkgconfig(wayland-server) >= 1.23.1 %description %{summary} @@ -45,7 +50,7 @@ Development files for %{name}. %prep -%autosetup -N +%autosetup -N -n %{tar_name} %build MESON_OPTIONS=( From 62a48709c861f660c629c742bf3ca12602031afb Mon Sep 17 00:00:00 2001 From: Erik Reider <35975961+ErikReider@users.noreply.github.com> Date: Tue, 24 Jun 2025 11:36:27 +0200 Subject: [PATCH 3/4] Updated swayfx to 0.5.2 --- COPR/swayfx/swayfx.rpkg.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/COPR/swayfx/swayfx.rpkg.spec b/COPR/swayfx/swayfx.rpkg.spec index 7d78622..24fb86d 100644 --- a/COPR/swayfx/swayfx.rpkg.spec +++ b/COPR/swayfx/swayfx.rpkg.spec @@ -2,13 +2,13 @@ ### CHANGE THESE VARIABLES BEFORE RELEASE: # Change to current Sway base version! -%global SwayBaseVersion 1.10.1 +%global sway_base_version 1.11 # Change to current SwayFX tag! -%global tag 0.5.1 +%global tag 0.5.2 Name: swayfx Version: %{tag} -Release: 4%{?dist} +Release: 1%{?dist} Summary: SwayFX: Sway, but with eye candy! License: MIT URL: https://github.com/WillPower3309/swayfx @@ -23,7 +23,7 @@ Source101: sway-portals.conf BuildRequires: gcc-c++ BuildRequires: gnupg2 -BuildRequires: meson >= 0.60.0 +BuildRequires: meson >= 1.3 BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(glesv2) @@ -40,10 +40,10 @@ BuildRequires: pkgconfig(pixman-1) BuildRequires: pkgconfig(scdoc) BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-cursor) -BuildRequires: pkgconfig(wayland-server) >= 1.21.0 -BuildRequires: pkgconfig(wayland-protocols) >= 1.24 -BuildRequires: pkgconfig(scenefx-0.3) -BuildRequires: pkgconfig(wlroots-0.18) +BuildRequires: pkgconfig(wayland-server) >= 1.23.1 +BuildRequires: pkgconfig(wayland-protocols) >= 1.41 +BuildRequires: pkgconfig(scenefx-0.4) +BuildRequires: pkgconfig(wlroots-0.19) BuildRequires: pkgconfig(xcb) BuildRequires: pkgconfig(xcb-icccm) BuildRequires: pkgconfig(xkbcommon) >= 1.5.0 @@ -55,7 +55,7 @@ Suggests: %{name}-config-upstream Conflicts: sway -Provides: sway = %{SwayBaseVersion} +Provides: sway = %{sway_base_version} %description SwayFX: Sway, but with eye candy! From 623103e2d217723b3a89f26ff84531972d493ca7 Mon Sep 17 00:00:00 2001 From: Erik Reider <35975961+ErikReider@users.noreply.github.com> Date: Tue, 24 Jun 2025 11:36:37 +0200 Subject: [PATCH 4/4] Removed scenefx-0.1 --- .github/workflows/copr_build.yml | 2 +- .github/workflows/copr_upload.yml | 2 +- COPR/scenefx-0.1/scenefx-0.1.rpkg.spec | 86 -------------------------- 3 files changed, 2 insertions(+), 88 deletions(-) delete mode 100644 COPR/scenefx-0.1/scenefx-0.1.rpkg.spec diff --git a/.github/workflows/copr_build.yml b/.github/workflows/copr_build.yml index 1fffe1e..3114bf5 100644 --- a/.github/workflows/copr_build.yml +++ b/.github/workflows/copr_build.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - pkgname: [ scenefx-0.1, scenefx-0.2, scenefx-0.3, scenefx ] + pkgname: [ scenefx-0.2, scenefx-0.3, scenefx ] name: Build RPM ${{matrix.pkgname}} container: fedora:latest runs-on: ubuntu-latest diff --git a/.github/workflows/copr_upload.yml b/.github/workflows/copr_upload.yml index dcd92c1..66dcf11 100644 --- a/.github/workflows/copr_upload.yml +++ b/.github/workflows/copr_upload.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - pkgname: [ scenefx-0.1, scenefx-0.2, scenefx-0.3, scenefx, swayfx ] + pkgname: [ scenefx-0.2, scenefx-0.3, scenefx, swayfx ] name: Upload ${{matrix.pkgname}} runs-on: ubuntu-latest steps: diff --git a/COPR/scenefx-0.1/scenefx-0.1.rpkg.spec b/COPR/scenefx-0.1/scenefx-0.1.rpkg.spec deleted file mode 100644 index e18ca5d..0000000 --- a/COPR/scenefx-0.1/scenefx-0.1.rpkg.spec +++ /dev/null @@ -1,86 +0,0 @@ -# vim: syntax=spec - -### CHANGE THESE VARIABLES BEFORE RELEASE: -# Change to current SceneFX tag! -%global tag 0.1 -# Version of the .so library -%global abi_ver 1 - -Name: scenefx-%{tag} -Version: %{tag} -Release: 1%{?dist} -Summary: A drop-in replacement for the wlroots scene API that allows wayland compositors to render surfaces with eye-candy effects -License: MIT -URL: https://github.com/wlrfx/scenefx -Source0: %{url}/archive/refs/tags/%{tag}.tar.gz - - -BuildRequires: gcc -BuildRequires: glslang -BuildRequires: gnupg2 -BuildRequires: meson >= 0.59.0 - -BuildRequires: (pkgconfig(wlroots) >= 0.17.0 with pkgconfig(wlroots) < 0.18) -BuildRequires: pkgconfig(egl) -BuildRequires: pkgconfig(gbm) >= 17.1.0 -BuildRequires: pkgconfig(glesv2) -BuildRequires: pkgconfig(hwdata) -BuildRequires: pkgconfig(libdrm) >= 2.4.114 -BuildRequires: pkgconfig(pixman-1) >= 0.42.0 -BuildRequires: pkgconfig(wayland-client) -BuildRequires: pkgconfig(wayland-protocols) >= 1.32 -BuildRequires: pkgconfig(wayland-scanner) -BuildRequires: pkgconfig(wayland-server) >= 1.22 - -%description -%{summary} - - -%package devel -Summary: Development files for %{name} -Requires: %{name}%{?_isa} == %{version}-%{release} -# for examples -Suggests: gcc -Suggests: meson >= 0.58.0 -Suggests: pkgconfig(wayland-egl) - -%description devel -Development files for %{name}. - - -%prep -%autosetup -N -n %{name} - -%build -MESON_OPTIONS=( - # Disable options requiring extra/unpackaged dependencies - -Dexamples=false - -Dwerror=false -) - -%{meson} "${MESON_OPTIONS[@]}" -%{meson_build} - - -%install -%{meson_install} - - -%check -%{meson_test} - - -%files -%license LICENSE -%doc README.md -%{_libdir}/libscenefx.so.%{abi_ver}{,.*} - - -%files devel -%{_includedir}/scenefx -%{_libdir}/libscenefx.so -%{_libdir}/pkgconfig/scenefx.pc - - -# Changelog will be empty until you make first annotated Git tag. -# %changelog