update scenefx and swayfx to use proper deps

Author: WillPower3309

.github/workflows/aur_build.yml

@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pkgname: [ swayfx, swayfx-git, scenefx-0.1, scenefx-0.2, scenefx, scenefx-git ]
+        pkgname: [ swayfx, swayfx-git, scenefx-0.1, scenefx-0.2, scenefx-0.3, scenefx-git ]
 
     name: Test PKGBUILD ${{matrix.pkgname}}
     runs-on: ubuntu-latest

.github/workflows/aur_publish.yml

@@ -29,7 +29,7 @@ jobs:
 
           - pkgname: scenefx-0.1
           - pkgname: scenefx-0.2
-          - pkgname: scenefx
+          - pkgname: scenefx-0.3
           - pkgname: scenefx-git
 
     runs-on: ubuntu-latest

aur/scenefx/.SRCINFO renamed to aur/scenefx-0.3/.SRCINFO

@@ -1,7 +1,7 @@
-pkgbase = scenefx
+pkgbase = scenefx0.3
 	pkgdesc = A drop-in replacement for the wlroots scene API that allows wayland compositors to render surfaces with eye-candy effects
 	pkgver = 0.3
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/wlrfx/scenefx
 	arch = x86_64
 	license = MIT
@@ -13,12 +13,12 @@ pkgbase = scenefx
 	depends = libdrm
 	depends = libglvnd
 	depends = libpixman-1.so
-	depends = libwlroots-0.18.so
+	depends = wlroots0.18
 	depends = wayland
 	provides = libscenefx-0.3.so
 	conflicts = scenefx-git
-	options = debug
-	source = scenefx-0.3.tar.gz::https://github.com/wlrfx/scenefx/archive/refs/tags/0.3.tar.gz
+	replaces = scenefx
+	source = scenefx0.3.tar.gz::https://github.com/wlrfx/scenefx/archive/refs/tags/0.3.tar.gz
 	sha512sums = SKIP
 
-pkgname = scenefx
+pkgname = scenefx0.3

aur/scenefx/PKGBUILD renamed to aur/scenefx-0.3/PKGBUILD

@@ -1,8 +1,9 @@
 # Maintainer: Erik Reider <[email protected]>
 
-pkgname=scenefx
+pkgname=scenefx0.3
+_pkgname=scenefx
 pkgver="0.3"
-pkgrel=1
+pkgrel=2
 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"
@@ -11,7 +12,7 @@ depends=(
 	"libdrm"
 	"libglvnd"
 	"libpixman-1.so"
-	"libwlroots-0.18.so"
+	"wlroots0.18"
 	"wayland"
 )
 makedepends=(
@@ -24,8 +25,8 @@ makedepends=(
 optdepends=()
 provides=("libscenefx-${pkgver}.so")
 conflicts=("scenefx-git")
-options=("debug")
-source=("scenefx-${pkgver}.tar.gz::${url}/archive/refs/tags/$pkgver.tar.gz")
+replaces=("${_pkgname}")
+source=("${pkgname}.tar.gz::${url}/archive/refs/tags/$pkgver.tar.gz")
 sha512sums=("SKIP")
 
 build() {

aur/swayfx/.SRCINFO

@@ -1,7 +1,7 @@
 pkgbase = swayfx
 	pkgdesc = SwayFX: Sway, but with eye candy!
 	pkgver = 0.5.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/WillPower3309/swayfx
 	install = sway.install
 	arch = i686
@@ -22,9 +22,9 @@ pkgbase = swayfx
 	depends = libxkbcommon.so
 	depends = pango
 	depends = pcre2
-	depends = libscenefx-0.3.so
+	depends = scenefx0.3
 	depends = ttf-font
-	depends = libwlroots-0.18.so
+	depends = wlroots0.18
 	optdepends = brightnessctl: Brightness adjustment tool used in the default configuration
 	optdepends = foot: Terminal emulator used in the default configuration
 	optdepends = i3status: Status line generation
@@ -40,13 +40,10 @@ pkgbase = swayfx
 	optdepends = xorg-xwayland: X11 support
 	optdepends = xdg-desktop-portal-gtk: Default xdg-desktop-portal for file picking
 	optdepends = xdg-desktop-portal-wlr: xdg-desktop-portal backend
-	provides = sway
-	provides = swayfx
 	provides = wayland-compositor
 	conflicts = sway
 	conflicts = swayfx
 	conflicts = swayfx-git
-	options = debug
 	backup = etc/sway/config
 	source = swayfx-0.5.1.tar.gz::https://github.com/WillPower3309/swayfx/archive/refs/tags/0.5.1.tar.gz
 	source = 50-systemd-user.conf

aur/swayfx/PKGBUILD

@@ -1,15 +1,11 @@
 # Maintainer: Erik Reider <[email protected]>
 pkgname="swayfx"
 pkgver=0.5.1
-pkgrel=1
-license=("MIT")
+pkgrel=2
 pkgdesc="SwayFX: Sway, but with eye candy!"
-makedepends=(
-	"git"
-	"meson"
-	"scdoc"
-	"wayland-protocols"
-)
+arch=("i686" "x86_64")
+url="https://github.com/WillPower3309/swayfx"
+license=("MIT")
 depends=(
 	"cairo"
 	"gdk-pixbuf2"
@@ -22,10 +18,18 @@ depends=(
 	"libxkbcommon.so"
 	"pango"
 	"pcre2"
-	"libscenefx-0.3.so"
+    "scenefx0.3"
 	"ttf-font"
-	"libwlroots-0.18.so"
+    "wlroots0.18"
 )
+makedepends=(
+	"git"
+	"meson"
+	"scdoc"
+	"wayland-protocols"
+)
+provides=("wayland-compositor")
+backup=(etc/sway/config)
 optdepends=(
 	"brightnessctl: Brightness adjustment tool used in the default configuration"
 	"foot: Terminal emulator used in the default configuration"
@@ -43,35 +47,26 @@ optdepends=(
 	"xdg-desktop-portal-gtk: Default xdg-desktop-portal for file picking"
 	"xdg-desktop-portal-wlr: xdg-desktop-portal backend"
 )
-backup=(etc/sway/config)
-arch=("i686" "x86_64")
-url="https://github.com/WillPower3309/swayfx"
+conflicts=("sway" "swayfx" "swayfx-git")
+install=sway.install
 source=("swayfx-${pkgver}.tar.gz::${url}/archive/refs/tags/$pkgver.tar.gz"
 	50-systemd-user.conf
 	sway-portals.conf)
+
 sha512sums=(
 	"a057e660d1ab885d181c61d02fac82c2ffe784b772bff03676dbeaa3355b1b3fb0c809162fdb1a5b34fec5379ba580b91f99586a4d1b046e7ded82d62835f8b7"
 	"d5f9aadbb4bbef067c31d4c8c14dad220eb6f3e559e9157e20e1e3d47faf2f77b9a15e52519c3ffc53dc8a5202cb28757b81a4b3b0cc5dd50a4ddc49e03fe06e"
 	"790741df028822bf4d83170dea57e1c63f7d7938cf31969e4cd347b0fc07330322b603c9ec0091b7a3f425132bed9dee6f261074cc273555120858beaaaf5da1")
-provides=("sway" "swayfx" "wayland-compositor")
-conflicts=("sway" "swayfx" "swayfx-git")
-options=(debug)
-install=sway.install
 
 build() {
-	arch-meson \
-		-Dwerror=false \
-		-Dsd-bus-provider=libsystemd \
-		"swayfx-${pkgver}" build
-	meson compile -C build
+    mkdir -p build
+    arch-meson build "$pkgname" -D sd-bus-provider=libsystemd -D werror=false -D b_ndebug=true
+    ninja -C build
 }
 
 package() {
+	DESTDIR="$pkgdir" ninja -C build install
+	install -Dm644 "$pkgname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 	install -Dm644 50-systemd-user.conf -t "$pkgdir/etc/sway/config.d/"
 	install -Dm644 sway-portals.conf "$pkgdir/usr/share/xdg-desktop-portal/sway-portals.conf"
-
-	DESTDIR="$pkgdir" meson install -C build
-
-	cd "swayfx-${pkgver}"
-	install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }