colord: Update wip/colord to 1.4.5

[Dan Cîrnaț <dan%alt.md@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Dan Cîrnaț <dan%alt.md@localhost>
Pushed By:	cirnatdan
Date:		Wed Nov 17 13:40:48 2021 +0100
Changeset:	58be4c5b0d8ea15a25183ca880c3403fc2bdbb4b

Modified Files:
	colord/Makefile
	colord/PLIST
	colord/distinfo
Added Files:
	colord/patches/patch-man_meson.build
Removed Files:
	colord/patches/patch-data_Makefile.am

Log Message:
colord: Update wip/colord to 1.4.5

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=58be4c5b0d8ea15a25183ca880c3403fc2bdbb4b

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 colord/Makefile                       | 34 +++++++-------
 colord/PLIST                          | 83 ++++++++++++++++++++++++++++++++---
 colord/distinfo                       |  8 ++--
 colord/patches/patch-data_Makefile.am | 13 ------
 colord/patches/patch-man_meson.build  | 12 +++++
 5 files changed, 110 insertions(+), 40 deletions(-)

diffs:
diff --git a/colord/Makefile b/colord/Makefile
index d746683e2c..b7985ebf91 100644
--- a/colord/Makefile
+++ b/colord/Makefile
@@ -1,7 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	colord-1.3.5
-PKGREVISION=	1
+DISTNAME=	colord-1.4.5
 CATEGORIES=	graphics gnome
 MASTER_SITES=	https://www.freedesktop.org/software/colord/releases/
 EXTRACT_SUFX=	.tar.xz
@@ -11,36 +10,39 @@ HOMEPAGE=	https://www.freedesktop.org/software/colord/
 COMMENT=	Device color profile management daemon
 LICENSE=	gnu-gpl-v2
 
-GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config gmake intltool autoconf aclocal automake
+USE_TOOLS+=	pkg-config intltool
 
 PKGCONFIG_OVERRIDE+=	lib/colorhug/colorhug.pc.in
 PKGCONFIG_OVERRIDE+=	lib/colord/colord.pc.in
 
-CONFIGURE_ARGS+=	--disable-gusb
-CONFIGURE_ARGS+=	--disable-udev
-CONFIGURE_ARGS+=	--disable-bash-completion
-CONFIGURE_ARGS+=	--disable-systemd-login
-CONFIGURE_ARGS+=	--disable-argyllcms-sensor # XXX wip
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} != "Linux"
+MESON_ARGS+=		-Dgusb=false
+MESON_ARGS+=		-Dudev=falsea
+.endif
+MESON_ARGS+=		-Dsystemd=false
+MESON_ARGS+=		-Dbash_completion=false
 
 PKGCONFIG_OVERRIDE+=	lib/colorhug/colorhug.pc.in
 PKGCONFIG_OVERRIDE+=	lib/colord/colord.pc.in
 
-CONF_DIR=	${PREFIX}/share/examples/colord
-CONF_FILES+=	${CONF_DIR}/org.freedesktop.ColorManager.conf \
-		${PKG_SYSCONFDIR}/dbus-1/system-services/org.freedesktop.ColorManager.conf
-
-pre-configure:
-	cd ${WRKSRC} && autoreconf
-
 BUILD_DEPENDS+=	gtk-doc-[0-9]*:../../textproc/gtk-doc
+BUILD_DEPENDS+=	docbook-xsl-ns-[0-9]*:../../wip/docbook-xsl-ns
 
 .include "options.mk"
 
+
+.if ${OPSYS} == "Linux"
+.include "../../wip/libgusb/buildlink3.mk"
+.include "../../wip/udev/buildlink3.mk"
+.include "../../wip/libgudev/buildlink3.mk"
+.endif
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../security/polkit/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
+.include "../../devel/meson/build.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/colord/PLIST b/colord/PLIST
index 01e6205965..21a2a03886 100644
--- a/colord/PLIST
+++ b/colord/PLIST
@@ -33,13 +33,42 @@ include/colord-1/colord/cd-sensor.h
 include/colord-1/colord/cd-spectrum.h
 include/colord-1/colord/cd-transform.h
 include/colord-1/colord/cd-version.h
-lib/colord-sensors/libcolord_sensor_dummy.la
-lib/libcolord.la
-lib/libcolordprivate.la
+include/colord-1/colorhug/ch-common.h
+include/colord-1/colorhug/ch-device-queue.h
+include/colord-1/colorhug/ch-device.h
+include/colord-1/colorhug/ch-hash.h
+include/colord-1/colorhug/ch-inhx32.h
+include/colord-1/colorhug/ch-math.h
+include/colord-1/colorhug/ch-version.h
+include/colord-1/colorhug/colorhug.h
+lib/colord-plugins/libcolord_sensor_camera.so
+lib/colord-plugins/libcolord_sensor_scanner.so
+lib/colord-sensors/libcolord_sensor_argyll.so
+lib/colord-sensors/libcolord_sensor_colorhug.so
+lib/colord-sensors/libcolord_sensor_dtp94.so
+lib/colord-sensors/libcolord_sensor_dummy.so
+lib/colord-sensors/libcolord_sensor_huey.so
+lib/girepository-1.0/Colord-1.0.typelib
+lib/girepository-1.0/Colorhug-1.0.typelib
+lib/libcolord.so
+lib/libcolord.so.2
+lib/libcolord.so.2.0.5
+lib/libcolordprivate.so
+lib/libcolordprivate.so.2
+lib/libcolordprivate.so.2.0.5
+lib/libcolorhug.so
+lib/libcolorhug.so.2
+lib/libcolorhug.so.2.0.5
 lib/pkgconfig/colord.pc
-lib/systemd/user/colord-session.service
+lib/pkgconfig/colorhug.pc
+lib/udev/rules.d/69-cd-sensors.rules
+lib/udev/rules.d/95-cd-devices.rules
 libexec/colord
 libexec/colord-session
+man/man1/cd-create-profile.1
+man/man1/cd-fix-profile.1
+man/man1/cd-it8.1
+man/man1/colormgr.1
 share/color/icc/colord/AdobeRGB1998.icc
 share/color/icc/colord/AppleRGB.icc
 share/color/icc/colord/BestRGB.icc
@@ -59,6 +88,7 @@ share/color/icc/colord/Gamma6500K.icc
 share/color/icc/colord/NTSC-RGB.icc
 share/color/icc/colord/PAL-RGB.icc
 share/color/icc/colord/ProPhotoRGB.icc
+share/color/icc/colord/Rec709.icc
 share/color/icc/colord/SMPTE-C-RGB.icc
 share/color/icc/colord/SwappedRedAndGreen.icc
 share/color/icc/colord/WideGamutRGB.icc
@@ -119,8 +149,47 @@ share/dbus-1/interfaces/org.freedesktop.ColorManager.Sensor.xml
 share/dbus-1/interfaces/org.freedesktop.ColorManager.xml
 share/dbus-1/services/org.freedesktop.ColorHelper.service
 share/dbus-1/system-services/org.freedesktop.ColorManager.service
-share/examples/colord/org.freedesktop.ColorManager.conf
+share/dbus-1/system.d/org.freedesktop.ColorManager.conf
+share/gir-1.0/Colord-1.0.gir
+share/gir-1.0/Colorhug-1.0.gir
 share/glib-2.0/schemas/org.freedesktop.ColorHelper.gschema.xml
+share/gtk-doc/html/colord/colord-CdClient.html
+share/gtk-doc/html/colord/colord-CdDevice.html
+share/gtk-doc/html/colord/colord-CdDom.html
+share/gtk-doc/html/colord/colord-CdEdid.html
+share/gtk-doc/html/colord/colord-CdIcc.html
+share/gtk-doc/html/colord/colord-CdIccStore.html
+share/gtk-doc/html/colord/colord-CdInterp.html
+share/gtk-doc/html/colord/colord-CdInterpAkima.html
+share/gtk-doc/html/colord/colord-CdInterpLinear.html
+share/gtk-doc/html/colord/colord-CdIt8.html
+share/gtk-doc/html/colord/colord-CdProfile.html
+share/gtk-doc/html/colord/colord-CdSensor.html
+share/gtk-doc/html/colord/colord-CdTransform.html
+share/gtk-doc/html/colord/colord-cd-client-sync.html
+share/gtk-doc/html/colord/colord-cd-color.html
+share/gtk-doc/html/colord/colord-cd-device-sync.html
+share/gtk-doc/html/colord/colord-cd-icc-utils.html
+share/gtk-doc/html/colord/colord-cd-it8-utils.html
+share/gtk-doc/html/colord/colord-cd-math.html
+share/gtk-doc/html/colord/colord-cd-profile-sync.html
+share/gtk-doc/html/colord/colord-cd-sensor-sync.html
+share/gtk-doc/html/colord/colord-cd-spectrum.html
+share/gtk-doc/html/colord/colord-cd-version.html
+share/gtk-doc/html/colord/colord.devhelp2
+share/gtk-doc/html/colord/home.png
+share/gtk-doc/html/colord/index.html
+share/gtk-doc/html/colord/ix01.html
+share/gtk-doc/html/colord/left-insensitive.png
+share/gtk-doc/html/colord/left.png
+share/gtk-doc/html/colord/libcolord.html
+share/gtk-doc/html/colord/libcolordprivate.html
+share/gtk-doc/html/colord/license.html
+share/gtk-doc/html/colord/right-insensitive.png
+share/gtk-doc/html/colord/right.png
+share/gtk-doc/html/colord/style.css
+share/gtk-doc/html/colord/up-insensitive.png
+share/gtk-doc/html/colord/up.png
 share/locale/as/LC_MESSAGES/colord.mo
 share/locale/bn_IN/LC_MESSAGES/colord.mo
 share/locale/ca/LC_MESSAGES/colord.mo
@@ -134,10 +203,12 @@ share/locale/es/LC_MESSAGES/colord.mo
 share/locale/eu/LC_MESSAGES/colord.mo
 share/locale/fi/LC_MESSAGES/colord.mo
 share/locale/fr/LC_MESSAGES/colord.mo
+share/locale/fur/LC_MESSAGES/colord.mo
 share/locale/gl/LC_MESSAGES/colord.mo
 share/locale/gu/LC_MESSAGES/colord.mo
 share/locale/he/LC_MESSAGES/colord.mo
 share/locale/hi/LC_MESSAGES/colord.mo
+share/locale/hr/LC_MESSAGES/colord.mo
 share/locale/hu/LC_MESSAGES/colord.mo
 share/locale/id/LC_MESSAGES/colord.mo
 share/locale/is/LC_MESSAGES/colord.mo
@@ -173,5 +244,3 @@ share/locale/zh_CN/LC_MESSAGES/colord.mo
 share/locale/zh_TW/LC_MESSAGES/colord.mo
 share/polkit-1/actions/org.freedesktop.color.policy
 @pkgdir var/lib/colord/icc
-${PLIST.introspection}lib/girepository-1.0/Colord-1.0.typelib
-${PLIST.introspection}share/gir-1.0/Colord-1.0.gir
diff --git a/colord/distinfo b/colord/distinfo
index 02d4006206..1900b95d84 100644
--- a/colord/distinfo
+++ b/colord/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-RMD160 (colord-1.3.5.tar.xz) = de68b32ae72ab37204197ccf68c6a7d40b6100c0
-SHA512 (colord-1.3.5.tar.xz) = a0084ad2c08ae88c8023b8bade68f6cf25e13c77a6a37ef127b2914e86b06e6a7a783f9ab3585243d975dbbe1120d5daae13bdb586aefe519bf675458683025f
-Size (colord-1.3.5.tar.xz) = 1263488 bytes
-SHA1 (patch-data_Makefile.am) = c41297c5631ad3ad536256a2c2581fc6da021192
+BLAKE2s (colord-1.4.5.tar.xz) = 9df8714f48db8158eebd31b255b6c692dbf2301411f2d5af1393538e8be467df
+SHA512 (colord-1.4.5.tar.xz) = b6cc8087ceff4a99b7d764087208cc72e1219d9f6bb52bd3e3eb13bb62e3c1e99aefef36237dceff46925ab7680c76795f59057b7a4d1c8a123de6270708e03c
+Size (colord-1.4.5.tar.xz) = 1869084 bytes
+SHA1 (patch-man_meson.build) = 5d89ed641cba7f0a16c57c0f5033926ba48c683d
diff --git a/colord/patches/patch-data_Makefile.am b/colord/patches/patch-data_Makefile.am
deleted file mode 100644
index 4a967f4bd9..0000000000
--- a/colord/patches/patch-data_Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- data/Makefile.am.orig	2016-02-17 13:31:21.000000000 +0000
-+++ data/Makefile.am
-@@ -9,7 +9,7 @@ SUBDIRS = 						\
- 	ti1
- 
- if HAVE_DAEMON
--dbusdir = $(sysconfdir)/dbus-1/system.d
-+dbusdir = $(datadir)/examples/colord
- dist_dbus_DATA = org.freedesktop.ColorManager.conf
- 
- dbusservicemaindir = $(datadir)/dbus-1/system-services
diff --git a/colord/patches/patch-man_meson.build b/colord/patches/patch-man_meson.build
new file mode 100644
index 0000000000..b319d271e5
--- /dev/null
+++ b/colord/patches/patch-man_meson.build
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- man/meson.build.orig	2020-11-02 10:51:09.800456000 +0000
++++ man/meson.build
+@@ -1,6 +1,6 @@
+ xsltproc = find_program('xsltproc')
+ 
+-stylesheet_url = 'http://docbook.sourceforge.net/release/xsl-ns/current/manpages/docbook.xsl'
++stylesheet_url = 'http://cdn.docbook.org/release/xsl/current/manpages/docbook.xsl'
+ ret = run_command(xsltproc, '--nonet', stylesheet_url)
+ if ret.returncode() != 0
+   error('Cannot build man pages without docbook-xsl-ns')