diff --git a/x11/library/wayland/actions.py b/x11/library/wayland/actions.py index 479458436b..a305d99362 100644 --- a/x11/library/wayland/actions.py +++ b/x11/library/wayland/actions.py @@ -8,25 +8,28 @@ from pisi.actionsapi import autotools from pisi.actionsapi import pisitools from pisi.actionsapi import shelltools +from pisi.actionsapi import mesontools from pisi.actionsapi import get Libdir = "/usr/lib32" if get.buildTYPE() == "emul32" else "/usr/lib" bindir = "/usr/bin32" if get.buildTYPE() == "emul32" else "/usr/bin" def setup(): - autotools.autoreconf("-vif") - autotools.configure("--disable-documentation \ - --libdir=%s \ - --bindir=%s \ - --disable-static" % (Libdir, bindir)) + options = "-Ddocumentation=false \ + --libdir=%s \ + --bindir=%s \ + " % (Libdir, bindir) - pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") + if get.buildTYPE() == "emul32": + options += " -Ddocumentation=false \ + " + mesontools.configure(options) def build(): - autotools.make() + mesontools.build() def install(): - autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + mesontools.install() if get.buildTYPE() == "emul32": pisitools.removeDir("/usr/bin32") diff --git a/x11/library/wayland/pspec.xml b/x11/library/wayland/pspec.xml index cd2ec93adb..2f1e7bcb21 100644 --- a/x11/library/wayland/pspec.xml +++ b/x11/library/wayland/pspec.xml @@ -12,9 +12,10 @@ library Wayland Compositor Infrastructure Wayland is a protocol for a compositor to talk to its clients as well as a C library implementation of that protocol. - https://wayland.freedesktop.org/releases/wayland-1.19.0.tar.xz + https://wayland.freedesktop.org/releases/wayland-1.20.0.tar.xz xmlto + meson docbook-xsl libffi-devel expat-devel @@ -114,6 +115,13 @@ + + 2021-12-11 + 1.20.0 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2021-04-27 1.19.0