From 0cd7f75f1068bb3e0acb63d5879a1eb249b144c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 5 May 2018 15:08:33 +0200 Subject: [PATCH] colord: add build option gusb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since libgusb now hard depends on gobject-introspection, it can no longer be cross compiled. Not having cross colord-devel would require us to cross build gtk+3 without it. Signed-off-by: Jürgen Buchmüller --- srcpkgs/colord/template | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/srcpkgs/colord/template b/srcpkgs/colord/template index f401dc63c2..89c1c9f770 100644 --- a/srcpkgs/colord/template +++ b/srcpkgs/colord/template @@ -5,7 +5,7 @@ revision=1 build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile --with-udevrulesdir=/usr/lib/udev/rules.d --with-daemon-user=colord - --enable-polkit --enable-gusb --enable-udev --enable-sane + --enable-polkit $(vopt_enable gusb) --enable-udev --enable-sane --disable-argyllcms-sensor $(vopt_enable gir introspection) --disable-systemd-login --enable-vala" conf_files="/etc/dbus-1/system.d/org.freedesktop.ColorManager.conf" @@ -17,24 +17,25 @@ make_dirs=" short_desc="System daemon for managing color devices" maintainer="Juan RP " homepage="http://www.freedesktop.org/software/colord" -license="GPL-2" +license="GPL-2.0-only" distfiles="$homepage/releases/$pkgname-$version.tar.xz" checksum=2daa8ffd2a532d7094927cd1a4af595b8310cea66f7707edcf6ab743460feed2 -hostmakedepends="pkg-config intltool docbook2x gobject-introspection" -makedepends="vala-devel libgudev-devel polkit-devel lcms2-devel dbus-devel - libusb-devel libgusb-devel sqlite-devel sane-devel eudev-libudev-devel bash-completion" +hostmakedepends="docbook2x gobject-introspection intltool pkg-config" +makedepends="bash-completion lcms2-devel libgudev-devel polkit-devel sane-devel + sqlite-devel vala-devel $(vopt_if gusb 'libusb-devel libgusb-devel')" if [ "$CROSS_BUILD" ]; then hostmakedepends+=" automake libtool gettext-devel glib-devel gtk-doc colord" fi # Package build options -build_options="gir" +build_options="gir gusb" +desc_option_gusb="Enable support for libgusb" -# Disable gir for cross builds. +# Disable gir and gusb for cross builds. if [ -z "$CROSS_BUILD" ]; then - build_options_default+=" gir" + build_options_default="gir gusb" fi pre_configure() {