From 329fa5da447bf8e14c07fd07de90137f4705d979 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mat=C3=ADas=20Fonzo?= Date: Wed, 15 Dec 2021 19:15:05 -0300 Subject: [PATCH] recipes: xorg/proto/xorgproto: Switch to meson build system MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Matías Fonzo --- recipes/xorg/proto/xorgproto/recipe | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/recipes/xorg/proto/xorgproto/recipe b/recipes/xorg/proto/xorgproto/recipe index 96c80353..89b64de4 100644 --- a/recipes/xorg/proto/xorgproto/recipe +++ b/recipes/xorg/proto/xorgproto/recipe @@ -20,7 +20,7 @@ set -e program=xorgproto version=2021.5 -release=1 +release=2 # Define a category for the output of the package name pkgcategory=xorg_proto @@ -57,17 +57,16 @@ build() # Set sane permissions chmod -R u+w,go-w,a+rX-s . - ./configure $configure_args \ - --libdir=/usr/lib${libSuffix} \ - --infodir=$infodir \ - --mandir=$mandir \ - --docdir=$docsdir \ - --enable-legacy \ - --without-xmlto \ - || true - - make -j${jobs} V=1 - make -j${jobs} DESTDIR="$destdir" install + rm -rf BUILD + mkdir BUILD + cd BUILD + + meson setup $configure_args -Dlegacy=true .. + + ninja -j${jobs} + DESTDIR="$destdir" ninja -j${jobs} install + + cd .. # This is provided by 'xorg/lib/libXvMC' currently rm "${destdir}/usr/include/X11/extensions/vldXvMC.h" -- 2.11.4.GIT