Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/aur_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/aur_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/copr_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/copr_upload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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}
Expand All @@ -46,7 +50,7 @@ Development files for %{name}.


%prep
%autosetup -N -n %{name}%{micro_version}
%autosetup -N -n %{tar_name}

%build
MESON_OPTIONS=(
Expand Down
14 changes: 8 additions & 6 deletions COPR/scenefx/scenefx.rpkg.spec
Original file line number Diff line number Diff line change
@@ -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}

Expand All @@ -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}
Expand Down
14 changes: 7 additions & 7 deletions aur/scenefx-git/.SRCINFO
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
17 changes: 9 additions & 8 deletions aur/scenefx-git/PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
# Maintainer: Erik Reider <erik.reider@protonmail.com>

_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"
Expand All @@ -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")
Expand All @@ -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
}
Expand Down
16 changes: 9 additions & 7 deletions aur/scenefx-0.2/.SRCINFO → aur/scenefx0.5/.SRCINFO
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
21 changes: 12 additions & 9 deletions aur/scenefx-0.2/PKGBUILD → aur/scenefx0.5/PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
# Maintainer: Erik Reider <erik.reider@protonmail.com>

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"
Expand All @@ -11,8 +14,8 @@ depends=(
"libdrm"
"libglvnd"
"libpixman-1.so"
"libwlroots-0.18.so"
"wayland"
"wlroots${_wlroots_version}"
)
makedepends=(
"git"
Expand All @@ -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
}

Expand Down
Loading