From 54f762e14b81871cb5b0e8d9a5dd3b025edf6c1e Mon Sep 17 00:00:00 2001 From: Marcin Bojara Date: Tue, 7 Jan 2020 23:14:09 +0100 Subject: [PATCH] libdrm: use mesontools --- x11/library/libdrm/actions.py | 21 ++++----------------- x11/library/libdrm/pspec.xml | 1 + 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/x11/library/libdrm/actions.py b/x11/library/libdrm/actions.py index cf16141836..eed036aa2a 100644 --- a/x11/library/libdrm/actions.py +++ b/x11/library/libdrm/actions.py @@ -4,28 +4,15 @@ # See the file http://www.gnu.org/licenses/gpl.txt from pisi.actionsapi import get -from pisi.actionsapi import autotools from pisi.actionsapi import pisitools +from pisi.actionsapi import mesontools from pisi.actionsapi import shelltools def setup(): - #pisitools.dosed("configure.ac", "pthread-stubs", deleteLine=True) - autotools.autoreconf("-fi") - options = " --enable-udev" - - if get.buildTYPE() == "_emul32": - options += " --libdir=/usr/lib32" - - autotools.configure(options) - - pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") + mesontools.configure("-Dudev=true -Dvalgrind=true") def build(): - autotools.make() + mesontools.build() def install(): - autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - if get.buildTYPE() == "_emul32": - return - - #pisitools.dodoc("README") + mesontools.install() diff --git a/x11/library/libdrm/pspec.xml b/x11/library/libdrm/pspec.xml index a90fa3a77d..863fb4d002 100644 --- a/x11/library/libdrm/pspec.xml +++ b/x11/library/libdrm/pspec.xml @@ -19,6 +19,7 @@ libxslt-devel docbook-xsl valgrind + meson