teldra
/
vp-build
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

colord: update to 1.4.3.

This commit is contained in:
Rasmus Thomsen 2018-09-23 16:17:02 +02:00 committed by maxice8
parent 28a3577323
commit 98f3f7cb17
3 changed files with 245 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

199
srcpkgs/colord/patches/add-introspection-switch.patch Normal file
View File

@ -0,0 +1,199 @@
--- lib/colord/meson.build
+++ lib/colord/meson.build
@@ -146,61 +146,63 @@ pkgg.generate(
description : 'colord is a system daemon for managing color devices',
)
-libcolord_girtarget = gnome.generate_gir(colord,
- sources : [
- 'cd-client.c',
- 'cd-client.h',
- 'cd-client-sync.c',
- 'cd-client-sync.h',
- 'cd-color.c',
- 'cd-color.h',
- 'cd-edid.c',
- 'cd-edid.h',
- 'cd-device.c',
- 'cd-device.h',
- 'cd-device-sync.c',
- 'cd-device-sync.h',
- 'cd-enum.c',
- 'cd-enum.h',
- 'cd-icc.c',
- 'cd-icc.h',
- 'cd-it8.c',
- 'cd-it8.h',
- 'cd-math.c',
- 'cd-math.h',
- 'cd-profile.c',
- 'cd-profile.h',
- 'cd-profile-sync.c',
- 'cd-profile-sync.h',
- 'cd-sensor.c',
- 'cd-sensor.h',
- 'cd-sensor-sync.c',
- 'cd-sensor-sync.h',
- 'cd-spectrum.c',
- 'cd-spectrum.h',
- ],
- nsversion : '1.0',
- namespace : 'Colord',
- symbol_prefix : 'cd',
- identifier_prefix : 'Cd',
- export_packages : 'colord',
- extra_args : [
- '--c-include=colord.h',
- ],
- link_with : colordprivate,
- dependencies : [
- gio,
- glib,
- lcms,
- ],
- includes : [
- 'Gio-2.0',
- 'GObject-2.0',
- ],
- install : true
-)
-libcolord_gir = libcolord_girtarget[0]
-libcolord_typelib = libcolord_girtarget[1]
+if get_option('introspection')
+ libcolord_girtarget = gnome.generate_gir(colord,
+ sources : [
+ 'cd-client.c',
+ 'cd-client.h',
+ 'cd-client-sync.c',
+ 'cd-client-sync.h',
+ 'cd-color.c',
+ 'cd-color.h',
+ 'cd-edid.c',
+ 'cd-edid.h',
+ 'cd-device.c',
+ 'cd-device.h',
+ 'cd-device-sync.c',
+ 'cd-device-sync.h',
+ 'cd-enum.c',
+ 'cd-enum.h',
+ 'cd-icc.c',
+ 'cd-icc.h',
+ 'cd-it8.c',
+ 'cd-it8.h',
+ 'cd-math.c',
+ 'cd-math.h',
+ 'cd-profile.c',
+ 'cd-profile.h',
+ 'cd-profile-sync.c',
+ 'cd-profile-sync.h',
+ 'cd-sensor.c',
+ 'cd-sensor.h',
+ 'cd-sensor-sync.c',
+ 'cd-sensor-sync.h',
+ 'cd-spectrum.c',
+ 'cd-spectrum.h',
+ ],
+ nsversion : '1.0',
+ namespace : 'Colord',
+ symbol_prefix : 'cd',
+ identifier_prefix : 'Cd',
+ export_packages : 'colord',
+ extra_args : [
+ '--c-include=colord.h',
+ ],
+ link_with : colordprivate,
+ dependencies : [
+ gio,
+ glib,
+ lcms,
+ ],
+ includes : [
+ 'Gio-2.0',
+ 'GObject-2.0',
+ ],
+ install : true
+ )
+ libcolord_gir = libcolord_girtarget[0]
+ libcolord_typelib = libcolord_girtarget[1]
+endif
if get_option('vapi')
gnome.generate_vapi('colord',
--- lib/colorhug/meson.build
+++ lib/colorhug/meson.build
@@ -73,36 +73,38 @@ pkgg.generate(
description : 'ColorHug is a simple display hardware colorimeter',
)
-libcolorhug_gir = gnome.generate_gir(colorhug,
- sources : [
- 'ch-common.c',
- 'ch-common.h',
- 'ch-device.c',
- 'ch-device.h',
- 'ch-device-queue.c',
- 'ch-device-queue.h',
- 'ch-hash.c',
- 'ch-hash.h',
- ],
- nsversion : '1.0',
- namespace : 'Colorhug',
- symbol_prefix : 'ch',
- identifier_prefix : 'Ch',
- export_packages : 'colorhug',
- link_with : colorhug,
- dependencies : [
- gio,
- glib,
- lcms,
- ],
- includes : [
- 'Gio-2.0',
- 'GObject-2.0',
- 'GUsb-1.0',
- libcolord_gir,
- ],
- install : true
-)
+if get_option('introspection')
+ libcolorhug_gir = gnome.generate_gir(colorhug,
+ sources : [
+ 'ch-common.c',
+ 'ch-common.h',
+ 'ch-device.c',
+ 'ch-device.h',
+ 'ch-device-queue.c',
+ 'ch-device-queue.h',
+ 'ch-hash.c',
+ 'ch-hash.h',
+ ],
+ nsversion : '1.0',
+ namespace : 'Colorhug',
+ symbol_prefix : 'ch',
+ identifier_prefix : 'Ch',
+ export_packages : 'colorhug',
+ link_with : colorhug,
+ dependencies : [
+ gio,
+ glib,
+ lcms,
+ ],
+ includes : [
+ 'Gio-2.0',
+ 'GObject-2.0',
+ 'GUsb-1.0',
+ libcolord_gir,
+ ],
+ install : true
+ )
+endif
if get_option('tests')
testdatadir = join_paths(meson.source_root(), 'data', 'tests')
--- meson_options.txt
+++ meson_options.txt
@@ -14,3 +14,4 @@ option('daemon_user', type : 'string', value : 'root', description : 'User for r
option('pnp_ids', type : 'string', value : '', description : 'Location of pnp.ids if hwdb is not available')
option('man', type : 'boolean', value : true, description : 'Generate man pages')
option('docs', type : 'boolean', value : true, description : 'Generate documentation')
+option('introspection', type : 'boolean', value : true, description : 'Generation gobject-introspection related files')

24
srcpkgs/colord/patches/use-host-utils.patch Normal file
View File

@ -0,0 +1,24 @@
--- data/cmf/meson.build
+++ data/cmf/meson.build
@@ -1,3 +1,7 @@
+if meson.is_cross_build()
+ cd_idt8 = find_program('cd-it8')
+endif
+
foreach arg: [ 'CIE1964-10deg-XYZ', 'CIE1931-2deg-XYZ' ]
custom_target(arg,
input: arg + '.csv',
--- data/profiles/meson.build
+++ data/profiles/meson.build
@@ -47,6 +47,10 @@ if get_option('print_profiles')
icc_profiles += icc_print_profiles
endif
+if meson.is_cross_build()
+ cd_create_profile = find_program('cd-create-profile')
+endif
+
generated_iccs = []
foreach arg: icc_profiles
xml_i18n = i18n.merge_file(

50
srcpkgs/colord/template
View File

@ -1,50 +1,42 @@
# Template file for 'colord'
pkgname=colord
version=1.3.5
revision=3
build_style=gnu-configure
configure_args="--disable-static --disable-schemas-compile
--with-udevrulesdir=/usr/lib/udev/rules.d --with-daemon-user=colord
--enable-polkit $(vopt_enable gusb) --enable-udev --enable-sane
--disable-argyllcms-sensor $(vopt_enable gir introspection)
$(vopt_enable gir vala) --disable-systemd-login"
conf_files="/etc/dbus-1/system.d/org.freedesktop.ColorManager.conf"
version=1.4.3
revision=1
build_style=meson
# man pages fail to generate
configure_args="-Dsystemd=false -Dsane=true -Dargyllcms_sensor=false -Dman=false
-Ddaemon_user=colord -Ddocs=false $(vopt_bool gir introspection)
$(vopt_bool vala vapi)"
hostmakedepends="glib-devel pkg-config $(vopt_if gir gobject-introspection)"
makedepends="bash-completion lcms2-devel libgudev-devel libgusb-devel
polkit-devel sane-devel sqlite-devel $(vopt_if vala vala-devel)"
system_accounts="colord"
colord_homedir="/var/lib/colord"
make_dirs="
/var/lib/colord 0755 colord colord
/var/lib/colord/icc 0755 colord colord"
short_desc="System daemon for managing color devices"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://www.freedesktop.org/software/colord"
maintainer="Rasmus Thomsen <rasmus.thomsen@protonmail.com>"
homepage="https://www.freedesktop.org/software/colord"
license="GPL-2.0-only"
distfiles="$homepage/releases/$pkgname-$version.tar.xz"
checksum=2daa8ffd2a532d7094927cd1a4af595b8310cea66f7707edcf6ab743460feed2
hostmakedepends="docbook2x gobject-introspection intltool pkg-config"
makedepends="bash-completion lcms2-devel libgudev-devel polkit-devel sane-devel
sqlite-devel $(vopt_if gir 'vala-devel') $(vopt_if gusb 'libusb-devel libgusb-devel')"
distfiles="${homepage}/releases/${pkgname}-${version}.tar.xz"
checksum=9a8e669ee1ea31632bee636cc57353f703c2ea9b64cd6e02bbaabe9a1e549df7
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" automake libtool gettext-devel glib-devel gtk-doc colord"
hostmakedepends+="colord glib-devel"
fi
# Package build options
build_options="gir gusb"
desc_option_gusb="Enable support for libgusb"
build_options="gir vala"
# Disable gir and gusb for cross builds.
if [ -z "$CROSS_BUILD" ]; then
build_options_default="gir gusb"
build_options_default="gir vala"
fi
pre_configure() {
if [ "$CROSS_BUILD" ]; then
# Use host utils instead.
sed -e 's,$(CD_IT8),cd-it8,g' -i data/cmf/Makefile.am data/illuminant/Makefile.am
sed -e 's,$(CD_CREATE_PROFILE),cd-create-profile,g' -i data/profiles/Makefile.am
NOCONFIGURE=1 ./autogen.sh
fi
do_check() {
# assertion failed (cd_edid_get_vendor_name (edid) == "LG"): (NULL == "LG")
:
}
libcolord_package() {
@ -65,6 +57,8 @@ colord-devel_package() {
vmove "usr/lib/*.so"
if [ "$build_option_gir" ]; then
vmove usr/share/gir-1.0
fi
if [ "$build_option_vala" ]; then
vmove usr/share/vala
fi
}