From 1b2d9ca04e014a696c3bb01a20de76e7d4a36597 Mon Sep 17 00:00:00 2001 From: Rasmus Thomsen Date: Thu, 14 Feb 2019 16:44:14 +0100 Subject: [PATCH] mutter: enable cross/gir closes #8715 --- srcpkgs/mutter/template | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template index ad90e70b75d..1056301deec 100644 --- a/srcpkgs/mutter/template +++ b/srcpkgs/mutter/template @@ -3,9 +3,10 @@ pkgname=mutter version=3.30.2 revision=2 build_style=gnu-configure +build_helper="gir" configure_args="--disable-schemas-compile --disable-static --enable-egl-device --enable-remote-desktop" -hostmakedepends="glib-devel gobject-introspection pkg-config zenity" +hostmakedepends="glib-devel pkg-config zenity wayland-devel" makedepends="elogind-devel glib-devel gnome-desktop-devel json-glib-devel libglib-devel libSM-devel libXtst-devel libcanberra-devel libinput-devel MesaLib-devel pipewire-devel startup-notification-devel wayland-protocols" @@ -17,26 +18,20 @@ homepage="https://wiki.gnome.org/Projects/Mutter/" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=df24dcc0b866fc6bffbfc82881a84bd7cc9c641e4124d2545c368c0b10e12363 shlib_provides="libmutter-clutter-3.so libmutter-cogl-3.so libmutter-cogl-pango-3.so" -nocross=https://build.voidlinux.eu/builders/armv7l_builder/builds/1295/steps/shell_3/logs/stdio -# Package build options -build_options="gir" -# Disable gir for cross builds. -if [ -z "$CROSS_BUILD" ]; then - build_options_default="gir" -fi +case "$XBPS_TARGET_MACHINE" in + i686-musl|x86_64-musl) ;; + *-musl) broken="gobject-introspection" ;; +esac mutter-devel_package() { - depends="gsettings-desktop-schemas>=3.16 gtk+3-devel>=3.16 - clutter-devel>=1.22 libX11-devel libXtst-devel - mutter>=${version}_${revision}" + depends="gsettings-desktop-schemas gtk+3-devel clutter-devel libX11-devel + libXtst-devel mutter-${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - if [ "$build_option_gir" ]; then - vmove "usr/lib/mutter/*.gir" - fi + vmove "usr/lib/mutter/*.gir" vmove "usr/lib/*.so" } }