Update meson build script and follow packaging recommendations

This commit is contained in:
Antonin Décimo 2021-02-16 00:35:26 +01:00
parent c0649147b5
commit 4c5a42c6c2
2 changed files with 10 additions and 20 deletions

View File

@ -1,12 +1,11 @@
pkgbase = wlroots-hidpi-git pkgbase = wlroots-hidpi-git
pkgdesc = Modular Wayland compositor library, with XWayland HiDPI (git version) pkgdesc = Modular Wayland compositor library, with XWayland HiDPI (git version)
pkgver = 0.12.0.r324.gb9e9e0e1 pkgver = 0.12.0.r342.g38ec1c0e
pkgrel = 1 pkgrel = 1
url = https://github.com/swaywm/wlroots url = https://github.com/swaywm/wlroots
arch = x86_64 arch = x86_64
license = custom:MIT license = custom:MIT
makedepends = meson makedepends = meson
makedepends = ninja
makedepends = git makedepends = git
makedepends = wayland-protocols makedepends = wayland-protocols
makedepends = xorgproto makedepends = xorgproto

View File

@ -1,7 +1,7 @@
# Maintainer: Antonin Décimo <antonin dot decimo at gmail dot com> # Maintainer: Antonin Décimo <antonin dot decimo at gmail dot com>
# Contributor: Adrian Perez de Castro <aperez@igalia.com> # Contributor: Adrian Perez de Castro <aperez@igalia.com>
pkgname=wlroots-hidpi-git pkgname=wlroots-hidpi-git
pkgver=0.12.0.r324.gb9e9e0e1 pkgver=0.12.0.r342.g38ec1c0e
pkgrel=1 pkgrel=1
license=(custom:MIT) license=(custom:MIT)
pkgdesc='Modular Wayland compositor library, with XWayland HiDPI (git version)' pkgdesc='Modular Wayland compositor library, with XWayland HiDPI (git version)'
@ -14,7 +14,7 @@ conflicts=(wlroots wlroots-git)
options=(debug) options=(debug)
depends=(systemd wayland opengl-driver libxcb xcb-util-errors depends=(systemd wayland opengl-driver libxcb xcb-util-errors
xcb-util-renderutil xcb-util-wm pixman libinput libxkbcommon) xcb-util-renderutil xcb-util-wm pixman libinput libxkbcommon)
makedepends=(meson ninja git wayland-protocols xorgproto) makedepends=(meson git wayland-protocols xorgproto)
source=("${pkgname}::git+${url}" source=("${pkgname}::git+${url}"
# "xwayland_hidpi.diff::https://github.com/swaywm/wlroots/pull/2064.diff" # "xwayland_hidpi.diff::https://github.com/swaywm/wlroots/pull/2064.diff"
"xwayland_hidpi.diff::https://github.com/swaywm/wlroots/compare/master...MisterDA:xwayland_hidpi.diff" "xwayland_hidpi.diff::https://github.com/swaywm/wlroots/compare/master...MisterDA:xwayland_hidpi.diff"
@ -37,24 +37,15 @@ prepare () {
} }
build () { build () {
cd "${pkgname}" arch-meson \
rm -rf build
meson build \
--prefix /usr \
--buildtype debug \
-Dlogind=enabled \
-Dlogind-provider=systemd \ -Dlogind-provider=systemd \
-Dxcb-errors=enabled \ -Dlibseat=disabled \
-Dxcb-icccm=enabled \ -Dwerror=false \
-Dxwayland=enabled \ "${pkgname}" build
-Dx11-backend=enabled \ meson compile -C build
-Dexamples=false
ninja -C build
} }
package () { package () {
cd "${pkgname}" DESTDIR="${pkgdir}" meson install -C build
DESTDIR="${pkgdir}" ninja -C build install install -Dm644 "${pkgname}/"LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
} }