From 38fff3ace9dfb22dce83bb88c30c0af3c41565d4 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 17 Oct 2019 00:10:29 +0200 Subject: [PATCH] cheese: fix cross --- srcpkgs/cheese/template | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/srcpkgs/cheese/template b/srcpkgs/cheese/template index 9570435260d..e6d1e05dbc1 100644 --- a/srcpkgs/cheese/template +++ b/srcpkgs/cheese/template @@ -3,9 +3,11 @@ pkgname=cheese version=3.34.0 revision=1 build_style=meson +configure_args="-Dgtk_doc=$(vopt_if gtk_doc 'true' 'false') + -Dman=$(vopt_if gtk_doc 'true' 'false')" build_helper="gir" -hostmakedepends="gdk-pixbuf glib-devel gtk-doc itstool pkg-config - $(vopt_if gir 'gobject-introspection') vala" +hostmakedepends="gdk-pixbuf glib-devel itstool pkg-config vala librsvg + $(vopt_if gtk_doc 'gtk-doc') $(vopt_if gir 'gobject-introspection')" makedepends="clutter-gst3-devel clutter-gtk-devel gnome-desktop-devel gst-plugins-good1 libXtst-devel libcanberra-devel libgee08-devel librsvg-devel" depends="clutter-gst clutter-gtk desktop-file-utils gnome-video-effects @@ -16,11 +18,14 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Cheese" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=d1865600ac88012e136b1ec3db72a4634f57bc2035895277be792bb078627e73 -nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/18665/steps/shell_3/logs/stdio" -build_options="gir" +build_options="gir gtk_doc" build_options_default="gir" +if [ -z "$CROSS_BUILD" ]; then + build_options_default+=" gtk_doc" +fi + libcheese_package() { short_desc+=" - shared libraries" pkg_install() { @@ -45,6 +50,8 @@ cheese-devel_package() { if [ "$build_option_gir" ]; then vmove usr/share/gir-1.0 fi - vmove usr/share/gtk-doc + if [ "$build_option_gtk_doc" ]; then + vmove usr/share/gtk-doc + fi } }