diff --git a/.github/workflows/aur_build.yml b/.github/workflows/aur_build.yml index 446f5ab..efc6447 100644 --- a/.github/workflows/aur_build.yml +++ b/.github/workflows/aur_build.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - pkgname: [ swayfx, swayfx-git, scenefx-0.2, scenefx0.3, scenefx0.4, scenefx-git ] + pkgname: [ swayfx, swayfx-git, scenefx0.3, scenefx0.4, scenefx0.5, scenefx-git ] name: Test PKGBUILD ${{matrix.pkgname}} runs-on: ubuntu-latest diff --git a/.github/workflows/aur_publish.yml b/.github/workflows/aur_publish.yml index 0e30a33..3b5bc1d 100644 --- a/.github/workflows/aur_publish.yml +++ b/.github/workflows/aur_publish.yml @@ -29,9 +29,9 @@ jobs: ./aur/swayfx-git/50-systemd-user.conf ./aur/swayfx-git/sway.install - - pkgname: scenefx-0.2 - pkgname: scenefx0.3 - pkgname: scenefx0.4 + - pkgname: scenefx0.5 - pkgname: scenefx-git runs-on: ubuntu-latest diff --git a/.github/workflows/copr_build.yml b/.github/workflows/copr_build.yml index 3114bf5..5470a14 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.2, scenefx-0.3, scenefx ] + pkgname: [ scenefx-0.3, scenefx-0.4, scenefx ] name: Build RPM ${{matrix.pkgname}} container: fedora:latest runs-on: ubuntu-latest @@ -58,7 +58,7 @@ jobs: container: fedora:latest runs-on: ubuntu-latest env: - scenefx_version: "scenefx" + scenefx_version: "scenefx-0.4" steps: - name: Install tooling for source RPM build run: | diff --git a/.github/workflows/copr_upload.yml b/.github/workflows/copr_upload.yml index 66dcf11..ee46c36 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.2, scenefx-0.3, scenefx, swayfx ] + pkgname: [ scenefx-0.3, scenefx-0.4, scenefx, swayfx ] name: Upload ${{matrix.pkgname}} runs-on: ubuntu-latest steps: diff --git a/COPR/scenefx-0.2/scenefx-0.2.rpkg.spec b/COPR/scenefx-0.4/scenefx-0.4.rpkg.spec similarity index 70% rename from COPR/scenefx-0.2/scenefx-0.2.rpkg.spec rename to COPR/scenefx-0.4/scenefx-0.4.rpkg.spec index cb4e9da..4f45a73 100644 --- a/COPR/scenefx-0.2/scenefx-0.2.rpkg.spec +++ b/COPR/scenefx-0.4/scenefx-0.4.rpkg.spec @@ -1,33 +1,37 @@ # vim: syntax=spec -%global tag 0.2 -%global micro_version .1 - -Name: scenefx-%{tag} -Version: %{tag}%{micro_version} -Release: 4%{?dist} +# 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-%{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}%{micro_version}.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} @@ -46,7 +50,7 @@ Development files for %{name}. %prep -%autosetup -N -n %{name}%{micro_version} +%autosetup -N -n %{tar_name} %build MESON_OPTIONS=( diff --git a/COPR/scenefx/scenefx.rpkg.spec b/COPR/scenefx/scenefx.rpkg.spec index 7e6f3b8..b7d787f 100644 --- a/COPR/scenefx/scenefx.rpkg.spec +++ b/COPR/scenefx/scenefx.rpkg.spec @@ -1,9 +1,9 @@ # vim: syntax=spec # Excludes the micro version, like "0.4" -%global tag 0.4 +%global tag 0.5 # Includes the micro version, like "0.4.1" -%global tag_full 0.4.1 +%global tag_full 0.5 # The Source0 tar file name %global tar_name scenefx-%{tag_full} @@ -21,17 +21,19 @@ BuildRequires: glslang BuildRequires: gnupg2 BuildRequires: meson >= 1.3 -BuildRequires: pkgconfig(wlroots-0.19) +BuildRequires: pkgconfig(wlroots-0.20) BuildRequires: pkgconfig(egl) -BuildRequires: pkgconfig(gbm) >= 17.1.0 +BuildRequires: pkgconfig(gbm) >= 21.1 BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig(hwdata) -BuildRequires: pkgconfig(libdrm) >= 2.4.122 -BuildRequires: pkgconfig(pixman-1) >= 0.43.0 +BuildRequires: pkgconfig(lcms2) +BuildRequires: pkgconfig(libdrm) >= 2.4.129 +BuildRequires: pkgconfig(pixman-1) >= 0.46.0 BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-protocols) >= 1.41 BuildRequires: pkgconfig(wayland-scanner) BuildRequires: pkgconfig(wayland-server) >= 1.23.1 +BuildRequires: pkgconfig(xkbcommon) >= 1.8.0 %description %{summary} diff --git a/aur/scenefx-git/.SRCINFO b/aur/scenefx-git/.SRCINFO index 71804a8..52de23b 100644 --- a/aur/scenefx-git/.SRCINFO +++ b/aur/scenefx-git/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = scenefx-git pkgdesc = A drop-in replacement for the wlroots scene API that allows wayland compositors to render surfaces with eye-candy effects - pkgver = r269.87c0e8b - pkgrel = 4 + pkgver = r313.37ccd72 + pkgrel = 1 url = https://github.com/wlrfx/scenefx arch = x86_64 license = MIT @@ -10,13 +10,13 @@ pkgbase = scenefx-git makedepends = meson makedepends = ninja makedepends = wayland-protocols - depends = libglvnd - depends = wayland depends = libdrm + depends = libglvnd depends = libpixman-1.so - depends = libwlroots-0.19.so - provides = libscenefx-0.4.so - conflicts = scenefx0.4 + depends = libwlroots-0.20.so + depends = wayland + provides = libscenefx-0.5.so + conflicts = scenefx0.5 conflicts = scenefx options = debug source = scenefx::git+https://github.com/wlrfx/scenefx.git diff --git a/aur/scenefx-git/PKGBUILD b/aur/scenefx-git/PKGBUILD index 147b433..d763fa4 100644 --- a/aur/scenefx-git/PKGBUILD +++ b/aur/scenefx-git/PKGBUILD @@ -1,20 +1,21 @@ # Maintainer: Erik Reider -_base_version=0.4 +_base_version=0.5 +_wlroots_version=0.20 pkgname="scenefx-git" -pkgver=r269.87c0e8b -pkgrel=4 +pkgver=r313.37ccd72 +pkgrel=1 license=("MIT") pkgdesc="A drop-in replacement for the wlroots scene API that allows wayland compositors to render surfaces with eye-candy effects" url="https://github.com/wlrfx/scenefx" arch=("x86_64") depends=( - "libglvnd" - "wayland" "libdrm" + "libglvnd" "libpixman-1.so" - "libwlroots-0.19.so" + "libwlroots-${_wlroots_version}.so" + "wayland" ) makedepends=( "git" @@ -25,7 +26,7 @@ makedepends=( ) optdepends=() provides=("libscenefx-$_base_version.so") -conflicts=("scenefx0.4" "scenefx") +conflicts=("scenefx${_base_version}" "scenefx") options=("debug") source=("${pkgname%-*}::git+${url}.git") sha512sums=("SKIP") @@ -36,7 +37,7 @@ pkgver() { } build() { - export PKG_CONFIG_PATH='/usr/lib/wlroots0.19/pkgconfig' + export PKG_CONFIG_PATH="/usr/lib/wlroots${_wlroots_version}/pkgconfig" arch-meson -Dwerror=false "scenefx" build meson compile -C build } diff --git a/aur/scenefx-0.2/.SRCINFO b/aur/scenefx0.5/.SRCINFO similarity index 63% rename from aur/scenefx-0.2/.SRCINFO rename to aur/scenefx0.5/.SRCINFO index 87f9e08..b0030fa 100644 --- a/aur/scenefx-0.2/.SRCINFO +++ b/aur/scenefx0.5/.SRCINFO @@ -1,6 +1,6 @@ -pkgbase = scenefx-0.2 +pkgbase = scenefx0.5 pkgdesc = A drop-in replacement for the wlroots scene API that allows wayland compositors to render surfaces with eye-candy effects - pkgver = 0.2.1 + pkgver = 0.5 pkgrel = 1 url = https://github.com/wlrfx/scenefx arch = x86_64 @@ -13,12 +13,14 @@ pkgbase = scenefx-0.2 depends = libdrm depends = libglvnd depends = libpixman-1.so - depends = libwlroots-0.18.so depends = wayland - provides = libscenefx-0.2.so + depends = wlroots0.20 + provides = libscenefx-0.5.so conflicts = scenefx-git - options = debug - source = scenefx-0.2.1.tar.gz::https://github.com/wlrfx/scenefx/archive/refs/tags/0.2.1.tar.gz + conflicts = scenefx + replaces = scenefx + options = !debug + source = scenefx0.5.tar.gz::https://github.com/wlrfx/scenefx/archive/refs/tags/0.5.tar.gz sha512sums = SKIP -pkgname = scenefx-0.2 +pkgname = scenefx0.5 diff --git a/aur/scenefx-0.2/PKGBUILD b/aur/scenefx0.5/PKGBUILD similarity index 62% rename from aur/scenefx-0.2/PKGBUILD rename to aur/scenefx0.5/PKGBUILD index c767c93..d2db582 100644 --- a/aur/scenefx-0.2/PKGBUILD +++ b/aur/scenefx0.5/PKGBUILD @@ -1,7 +1,10 @@ # Maintainer: Erik Reider -pkgname=scenefx-0.2 -pkgver="0.2.1" +_base_version=0.5 +_wlroots_version=0.20 + +pkgname=scenefx0.5 +pkgver="0.5" pkgrel=1 license=("MIT") pkgdesc="A drop-in replacement for the wlroots scene API that allows wayland compositors to render surfaces with eye-candy effects" @@ -11,8 +14,8 @@ depends=( "libdrm" "libglvnd" "libpixman-1.so" - "libwlroots-0.18.so" "wayland" + "wlroots${_wlroots_version}" ) makedepends=( "git" @@ -21,15 +24,15 @@ makedepends=( "ninja" "wayland-protocols" ) -optdepends=() -provides=("libscenefx-${pkgver%.*}.so") -conflicts=("scenefx-git") -options=("debug") -source=("scenefx-${pkgver}.tar.gz::${url}/archive/refs/tags/$pkgver.tar.gz") +provides=("libscenefx-0.5.so") +conflicts=("scenefx-git" "scenefx") +replaces=("scenefx") +options=("!debug") +source=("${pkgname}.tar.gz::${url}/archive/refs/tags/$pkgver.tar.gz") sha512sums=("SKIP") build() { - arch-meson -Dwerror=false "scenefx-${pkgver}" build + arch-meson "scenefx-${pkgver}" build meson compile -C build }