diff options
| author | Xuanrui Qi | 2024-04-27 23:57:39 +0900 |
|---|---|---|
| committer | Xuanrui Qi | 2024-04-27 23:57:39 +0900 |
| commit | 2d1325df721f70c1760615b3837a94e57c4fad6b (patch) | |
| tree | 8eccd1c9adba13989d16b2229a4de12b4b5f72be | |
| parent | 6cd71a07d98db1934516f93c5c6f03450aeb9a49 (diff) | |
| download | aur-2d1325df721f70c1760615b3837a94e57c4fad6b.tar.gz | |
Fix the PKGBUILD to build on 24.1 tree
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 25 |
2 files changed, 14 insertions, 19 deletions
@@ -1,6 +1,6 @@ pkgbase = xorg-xwayland-git pkgdesc = Run X clients under Wayland (git version) - pkgver = 23.0.99.901.r3.g546812382 + pkgver = 24.0.99.901.r102.g08113b892 pkgrel = 1 url = https://xorg.freedesktop.org arch = x86_64 @@ -8,19 +8,15 @@ pkgbase = xorg-xwayland-git license = custom makedepends = meson makedepends = git - makedepends = xorgproto-git + makedepends = xorgproto makedepends = xtrans - makedepends = pixman makedepends = libxkbfile - makedepends = libxfont2 makedepends = dbus makedepends = xorg-font-util makedepends = wayland makedepends = wayland-protocols makedepends = libdrm - makedepends = libepoxy makedepends = systemd - makedepends = egl-wayland depends = nettle depends = libegl depends = libepoxy @@ -2,7 +2,7 @@ # Contributor: AndyRTR <andyrtr@archlinux.org> pkgname=xorg-xwayland-git -pkgver=23.0.99.901.r3.g546812382 +pkgver=24.0.99.901.r102.g08113b892 pkgrel=1 arch=('x86_64') license=('custom') @@ -12,23 +12,25 @@ pkgdesc="Run X clients under Wayland (git version)" depends=('nettle' 'libegl' 'libepoxy' 'systemd-libs' 'libxfont2' 'pixman' 'xorg-server-common' 'libxcvt') makedepends=('meson' 'git' - 'xorgproto-git' 'xtrans' - 'pixman' 'libxkbfile' 'libxfont2' 'dbus' + 'xorgproto' + 'xtrans' + 'libxkbfile' 'dbus' 'xorg-font-util' - 'wayland' 'wayland-protocols' - 'libdrm' 'libepoxy' + 'wayland' + 'wayland-protocols' + 'libdrm' 'systemd' - 'egl-wayland' ) source=("xserver::git+https://gitlab.freedesktop.org/xorg/xserver.git") sha256sums=('SKIP') + provides=('xorg-xwayland' 'xorg-server-xwayland' 'xorg-server-xwayland-git') conflicts=('xorg-xwayland' 'xorg-server-xwayland' 'xorg-server-xwayland-git') replaces=('xorg-server-xwayland-git') pkgver() { cd xserver - local branch=origin/xwayland-23.1 + local branch=origin/xwayland-24.1 local head=$(git rev-parse --short HEAD) local tag=$(git describe --abbrev=0 "$branch") local revisions=$(git rev-list "${tag}..HEAD" --count) @@ -39,9 +41,9 @@ build() { # Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf # With them, module fail to load with undefined symbol. # See https://bugs.archlinux.org/task/55102 / https://bugs.archlinux.org/task/54845 -# export CFLAGS=${CFLAGS/-fno-plt} -# export CXXFLAGS=${CXXFLAGS/-fno-plt} -# export LDFLAGS=${LDFLAGS/,-z,now} + # export CFLAGS=${CFLAGS/-fno-plt} + # export CXXFLAGS=${CXXFLAGS/-fno-plt} + # export LDFLAGS=${LDFLAGS/,-z,now} arch-meson xserver build \ -D ipv6=true \ @@ -51,7 +53,6 @@ build() { -D xorg=false \ -D xephyr=false \ -D xwayland=true \ - -D xwayland_eglstream=true \ -D xwin=false \ -D xquartz=false \ -D glamor=true \ @@ -61,8 +62,6 @@ build() { -D xkb_dir=/usr/share/X11/xkb \ -D xkb_output_dir=/var/lib/xkb - # Print config - meson configure build ninja -C build } |