pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/graphics/colord
Module Name: pkgsrc
Committed By: vins
Date: Sun Apr 26 14:48:57 UTC 2026
Modified Files:
pkgsrc/graphics/colord: Makefile PLIST buildlink3.mk distinfo
pkgsrc/graphics/colord/patches: patch-client_cd-util.c
patch-src_cd-main.c
Added Files:
pkgsrc/graphics/colord: PLIST.Linux options.mk
pkgsrc/graphics/colord/patches: patch-client_meson.build
patch-client_run.sh patch-data_meson.build
patch-lib_colord_cd-edid.c patch-man_meson.build patch-meson.build
patch-meson__options.txt patch-src_cd-sensor.c
patch-src_cd-sensor.h patch-src_meson.build
patch-src_plugins_meson.build
Removed Files:
pkgsrc/graphics/colord/patches: patch-configure.ac
patch-data_Makefile.am patch-lib_colord_cd-icc-store.c
patch-src_Makefile.am patch-src_Makefile.in
Log Message:
graphics/colord: update to 1.4.8
# pkgsrc changes
* Switch to meson.
* Enable gusb and gudev support, among others.
* Install bash completions and man pages.
* Move some stuff to options.mk to make it optional.
* Patch to allow build on systems without libudev support.
* Use SUBST instead of patching to replace hard-coded paths.
# upstream changes (since 1.3.5)
Version 1.4.8
~~~~~~~~~~~~~
Released: 2025-06-23
New Features:
- Add AppStream metainfo XML with hardware provide info (Petter Reinholdtsen)
- Add support for -Dsystemd_root_prefix to make local building easier (Richard Hughes)
- Install sysusers.d config file if configured user is not root (Luca Boccassi)
Bugfixes:
- Add the source attribute for each man page (Xi Ruoyao)
- Drop component type from AppStream metadata XML to avoid parsing error (Petter Reinholdtsen)
- Fix a critical warning when running the self tests (Richard Hughes)
- Fix USB scanners not working with RestrictAddressFamilies (Ferdinand Bachmann)
- Fix writing to the database with ProtectSystem=strict (Richard Hughes)
- Properly set the status to CD_SESSION_STATUS_RUNNING (Laurent Bigonville)
- Use g_ascii_strtod instead of atof() (Laurent Bigonville)
- Use sqlite3_errmsg() to avoid getting a mutable error message (psykose, Richard Hughes)
Version 1.4.7
~~~~~~~~~~~~~
Released: 2024-01-22
Bugfixes:
- Add various hardenings to the systemd service (Johannes Segitz)
- Always close the ICC profile when loading fails (Jonas Ådahl)
- Avoid destructing LCMS plugin twice with lcms 2.14 (Sam James)
- Do not make state files executable in tmpfiles.d/colord.conf (Roshan Shariff)
- Fix a double free spotted by Coverity (Richard Hughes)
- Fix an error check when parsing the DTP94 data (Richard Hughes)
- Fix a -Wincompatible-pointer-types warning (Richard Hughes)
- Fix potential crash when reading from broken Huey hardware (Richard Hughes)
- Set FILE_OFFSET_BITS explicitly (Sam James)
- Use a 64-bit time_t (Sam James)
- Use thread context for Gamut Alarm codes (Martin Owens)
Version 1.4.6
~~~~~~~~~~~~~
Released: 2022-02-16
Bugfixes:
- Add missing copyright notices (Aaron Plattner)
- Add Spyder X entry (Misha Gusarov)
- Document where to send patches (Misha Gusarov)
- Don't use exact floating point comparisons (Christopher James Halse Rogers)
- Drop option for removed reverse engineering tools (Mingcong Bai)
- Drop references to hughski.com (Paul Wise)
- Fix a small memory leak in sqlite3_exec() (Zero0one1)
- Fix typo in device-removed signal documentation (Jeremy Cline)
- Make introspection optional in meson (David Michael)
Version 1.4.5
~~~~~~~~~~~~~
Released: 2020-11-02
New Features:
- Add cd_icc_create_default_full (Aaron Plattner)
- Add cd_icc_utils_get_adaptation_matrix (Aaron Plattner)
- Add cd_mat33_is_finite (Aaron Plattner)
- Add support for datacolor SpyderX (Richard Brown)
Bugfixes:
- Check for errors from more sqlite calls (Ross Burton)
- Fix cd_icc_load_data() annotation for the data array (Elmar Hoffmann)
- Fix cd-sensor-dummy (Christopher James Halse Rogers)
- Fix more annotation for data arrays (Elmar Hoffmann)
- Fix owner and permissions on existing state files (Will Thompson)
- Fix segfault due to dereferencing NULL pointer (Simon Munton)
- Make the build reproductible (Laurent Bigonville)
- Refactor opening of mapping database and try again if fails (Ross Burton)
Version 1.4.4
~~~~~~~~~~~~~
Released: 2019-03-08
New Features:
- Actually install the installed tests (Richard Hughes)
- Allow building without the daemon (Richard Hughes)
Bugfixes:
- Consistently search for spotread in $PATH (Christopher James Halse Rogers)
- Don't hard-require spotread to build argyll sensor (Christopher James Halse Rogers)
- Fix linker argument checks (Ting-Wei Lan)
- Include C header in Colorhug-1.0.gir (Tomasz Miąsko)
- Pass -DCD_COMPILATION to gir compiler (maxice8)
- Port manpages to xsltproc and DocBook 5 (Jan Tojnar)
Version 1.4.3
~~~~~~~~~~~~~
Released: 2018-04-18
Bugfixes:
- Make cd_color_get_blackbody_rgb_full safer (Jan Alexander Steffens)
- Update style of Meson build options (Soapux)
- Update warning about running daemon as root (Soapux)
Version 1.4.2
~~~~~~~~~~~~~
Released: 2018-03-12
New Features:
- Add cd_icc_set_created (Christopher James Halse Rogers)
- Add --enable-timestamps option for CREATED header (Jérémy Bobbio)
Bugfixes:
- Avoid buffer overflow when reading profile_id (Richard Hughes)
- Fix the detection of duplicate EDIDs (Richard Hughes)
- Make udev hwdb optional by using pnp.ids as fallback (Ting-Wei Lan)
- Raise _XOPEN_SOURCE to 700 to enable C99 on FreeBSD (Ting-Wei Lan)
- Refactor build directory selection (Jan Tojnar)
- Set cd-create-profile date to SOURCE_DATE_EPOCH (Christopher James Halse Rogers)
Version 1.4.1
~~~~~~~~~~~~~
Released: 2017-08-21
Bugfixes:
- Add back the meson -Denable-systemd=false configure argument (Richard Hughes)
- Add the fallback rules for older PolicyKit versions (Richard Hughes)
- Define PATH_MAX if not available (Emmanuele Bassi)
- Enable C99 support in meson.build (Philip Withnall)
- Include all the files in the GIR target (Richard Hughes)
- Include the correct file when using Colord-1.0.gir (Richard Hughes)
- Use appropriate feature macro for realpath() (Emmanuele Bassi, Philip Withnall)
- Use gio-2.0 when generating the VAPI (Ernestas Kulik)
Version 1.4.0
~~~~~~~~~~~~~
Released: 2017-08-09
New Features:
- Port to the Meson build system (Richard Hughes)
- Enable Travis CI for Fedora 25 and Debian Stretch (Richard Hughes)
- Make PolicyKit, gusb and udev a hard requirement (Richard Hughes)
Bugfixes:
- Add some experimental tools for the HueyCOLOR sensor as found in the P70 (Richard Hughes)
- Conditionally build documentation and man pages (Emmanuele Bassi)
- Correctly build the ICC transfer curve for Rec709 (Richard Hughes)
- Do not build the examples as part of the regular build (Richard Hughes)
- Do not spin the Huey LEDs when the sensor is embedded (Richard Hughes)
- Do not use /tmp to create profiles (Richard Hughes)
- Fix the version numbers in cd-version.h to reflect reality (Ben Iofel, Emmanuele Bassi)
- Get the Huey status before trying to unlock (Richard Hughes)
- Use a different Huey unlock code on the W700 laptop (Richard Hughes)
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/graphics/colord/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/colord/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/colord/PLIST.Linux \
pkgsrc/graphics/colord/options.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/colord/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/colord/distinfo
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/graphics/colord/patches/patch-client_cd-util.c
cvs rdiff -u -r0 -r1.1 \
pkgsrc/graphics/colord/patches/patch-client_meson.build \
pkgsrc/graphics/colord/patches/patch-client_run.sh \
pkgsrc/graphics/colord/patches/patch-data_meson.build \
pkgsrc/graphics/colord/patches/patch-lib_colord_cd-edid.c \
pkgsrc/graphics/colord/patches/patch-man_meson.build \
pkgsrc/graphics/colord/patches/patch-meson.build \
pkgsrc/graphics/colord/patches/patch-meson__options.txt \
pkgsrc/graphics/colord/patches/patch-src_cd-sensor.c \
pkgsrc/graphics/colord/patches/patch-src_cd-sensor.h \
pkgsrc/graphics/colord/patches/patch-src_meson.build \
pkgsrc/graphics/colord/patches/patch-src_plugins_meson.build
cvs rdiff -u -r1.1 -r0 pkgsrc/graphics/colord/patches/patch-configure.ac \
pkgsrc/graphics/colord/patches/patch-data_Makefile.am \
pkgsrc/graphics/colord/patches/patch-lib_colord_cd-icc-store.c \
pkgsrc/graphics/colord/patches/patch-src_Makefile.am \
pkgsrc/graphics/colord/patches/patch-src_Makefile.in
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/colord/patches/patch-src_cd-main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/graphics/colord/Makefile
diff -u pkgsrc/graphics/colord/Makefile:1.28 pkgsrc/graphics/colord/Makefile:1.29
--- pkgsrc/graphics/colord/Makefile:1.28 Wed Jan 7 08:47:15 2026
+++ pkgsrc/graphics/colord/Makefile Sun Apr 26 14:48:56 2026
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2026/01/07 08:47:15 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2026/04/26 14:48:56 vins Exp $
-DISTNAME= colord-1.3.5
-PKGREVISION= 23
+DISTNAME= colord-1.4.8
CATEGORIES= graphics gnome
-MASTER_SITES= https://www.freedesktop.org/software/colord/releases/
+MASTER_SITES= https://www.freedesktop.org/software/colord/releases/ \
+ http://ftp.slackware.com/pub/slackware/slackware64-current/source/l/colord/
EXTRACT_SUFX= .tar.xz
MAINTAINER= youri%NetBSD.org@localhost
@@ -11,62 +11,80 @@ HOMEPAGE= https://www.freedesktop.org/so
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 msgfmt
-
-COLORD_USER= colord
-COLORD_GROUP= colord
-PKG_GROUPS+= ${COLORD_GROUP}
-PKG_USERS+= ${COLORD_USER}:${COLORD_GROUP}
-BUILD_DEFS+= VARBASE
-
-PKGCONFIG_OVERRIDE+= lib/colorhug/colorhug.pc.in
-PKGCONFIG_OVERRIDE+= lib/colord/colord.pc.in
+USE_TOOLS+= pkg-config intltool msgfmt
+USE_PKGLOCALEDIR= yes
-# XXX dependency for man pages missing from pkgsrc
-CONFIGURE_ENV+= ac_cv_path_DOCBOOK2MAN=no
-
-CONFIGURE_ARGS+= --disable-gusb
-CONFIGURE_ARGS+= --disable-udev
-CONFIGURE_ARGS+= --disable-bash-completion
-CONFIGURE_ARGS+= --disable-systemd-login
-CONFIGURE_ARGS+= --disable-argyllcms-sensor # XXX not useful?
-CONFIGURE_ARGS+= --disable-print-profiles
-CONFIGURE_ARGS+= --with-daemon-user=colord
-CONFIGURE_ARGS+= --localstatedir=${VARBASE}
-
-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.d/org.freedesktop.ColorManager.conf
-
-SUBST_CLASSES+= prefix
-SUBST_MESSAGE.prefix= Fix prefix
-SUBST_STAGE.prefix= pre-configure
-SUBST_FILES.prefix= lib/colord/cd-icc-store.c
-SUBST_FILES.prefix+= src/cd-main.c
-SUBST_FILES.prefix+= client/cd-util.c
-SUBST_VARS.prefix= PREFIX VARBASE
-
-INSTALLATION_DIRS+= share/vala/vapi
+BUILD_DEFS+= VARBASE
+SHAREDIR= ${PREFIX}/share
+EGDIR= ${SHAREDIR}/examples/colord
-pre-configure:
- cd ${WRKSRC} && autoreconf
+USE_PKGLOCALEDIR= yes
-TOOL_DEPENDS+= gtk-doc-[0-9]*:../../textproc/gtk-doc
+COLORD_USER= colord
+COLORD_GROUP= colord
+PKG_GROUPS+= ${COLORD_GROUP}
+PKG_USERS+= ${COLORD_USER}:${COLORD_GROUP}
+PKG_GECOS.colord= ColorManager daemon
+PKG_SHELL.colord= ${NOLOGIN}
+PKG_HOME.colord= /nonexistent
+
+TOOL_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl # man pages
+DOCBOOK_MANPAGE_XSL= ${SHAREDIR}/xsl/docbook/html/docbook.xsl
+
+CONF_FILES+= share/dbus-1/system.d/org.freedesktop.ColorManager.conf \
+ ${PKG_SYSCONFDIR}/dbus-1/system.d/org.freedesktop.ColorManager.conf
+
+SUBST_CLASSES+= paths
+SUBST_STAGE.paths= pre-configure
+SUBST_MESSAGE.paths= Replacing hard-coded paths.
+SUBST_FILES.paths= client/cd-util.c examples/cd-libcolord-icc.c \
+ man/meson.build lib/colord/cd-icc-store.c \
+ src/cd-main.c src/cd-profile.c client/run.sh
+SUBST_SED.paths+= -e "s:/usr/local/share:${SHAREDIR}:g"
+SUBST_SED.paths+= -e "s:/usr/share/color:${SHAREDIR}/color:g"
+SUBST_SED.paths+= -e "s:/var/lib/:@VARBASE/db:g"
+SUBST_VARS.paths+= DOCBOOK_MANPAGE_XSL SH
+
+
+SUBST_CLASSES+= target
+SUBST_STAGE.target= pre-build
+SUBST_MESSAGE.target= Replacing meson custom target.
+SUBST_FILES.target= data/cmf/meson.build \
+ data/illuminant/meson.build \
+ data/profiles/meson.build
+SUBST_SED.target+= -e "s:cd_create_profile:run_cd_create_profile:g"
+SUBST_SED.target+= -e "s:cd_idt8:run_cd_idt8:g"
+
+MESON_ARGS+= -Dlocalstatedir=${VARBASE} \
+ -Ddaemon_user=colord \
+ -Dman=true \
+ -Dbash_completion=true \
+ -Dcompletionsdir=share/bash-completion/completions \
+ -Dpnp_ids=${SHAREDIR}/hwdata/pnp.ids \
+ -Dargyllcms_sensor=false \
+ -Dsystemd=false
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Linux"
+MESON_ARGS+= -Dudev_rules=true
+.else
+MESON_ARGS+= -Dudev_rules=false
+.endif
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/lib/colord/colord.vapi ${DESTDIR}${PREFIX}/share/vala/vapi/
+.include "options.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/schemas.mk"
-.include "../../devel/gobject-introspection/buildlink3.mk"
+.include "../../devel/libgusb/buildlink3.mk"
.include "../../graphics/lcms2/buildlink3.mk"
.include "../../databases/sqlite3/buildlink3.mk"
.include "../../security/polkit/buildlink3.mk"
.include "../../sysutils/dbus/buildlink3.mk"
.include "../../sysutils/consolekit/buildlink3.mk"
+.include "../../sysutils/hwdata/buildlink3.mk"
+.include "../../textproc/libxslt/xsltproc-nonet.mk"
+.include "../../devel/meson/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/graphics/colord/PLIST
diff -u pkgsrc/graphics/colord/PLIST:1.3 pkgsrc/graphics/colord/PLIST:1.4
--- pkgsrc/graphics/colord/PLIST:1.3 Sat Oct 31 13:29:41 2020
+++ pkgsrc/graphics/colord/PLIST Sun Apr 26 14:48:56 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2020/10/31 13:29:41 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.4 2026/04/26 14:48:56 vins Exp $
bin/cd-create-profile
bin/cd-fix-profile
bin/cd-iccdump
@@ -33,14 +33,43 @@ 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/girepository-1.0/Colord-1.0.typelib
-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
+${PLIST.udev}lib/colord-plugins/libcolord_sensor_camera.so
+${PLIST.sane}lib/colord-plugins/libcolord_sensor_sane.so
+${PLIST.udev}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
+${PLIST.introspection}lib/girepository-1.0/Colord-1.0.typelib
+${PLIST.introspection}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
libexec/colord
+${PLIST.sane}libexec/colord-sane
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/bash-completion/completions/colormgr
share/color/icc/colord/AdobeRGB1998.icc
share/color/icc/colord/AppleRGB.icc
share/color/icc/colord/BestRGB.icc
@@ -60,6 +89,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
@@ -120,10 +150,51 @@ share/dbus-1/interfaces/org.freedesktop.
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/gir-1.0/Colord-1.0.gir
+share/dbus-1/system.d/org.freedesktop.ColorManager.conf
+${PLIST.introspection}share/gir-1.0/Colord-1.0.gir
+${PLIST.introspection}share/gir-1.0/Colorhug-1.0.gir
share/glib-2.0/schemas/org.freedesktop.ColorHelper.gschema.xml
+${PLIST.doc}share/gtk-doc/html/colord/colord-CdClient.html
+${PLIST.doc}share/gtk-doc/html/colord/colord-CdDevice.html
+${PLIST.doc}share/gtk-doc/html/colord/colord-CdDom.html
+${PLIST.doc}share/gtk-doc/html/colord/colord-CdEdid.html
+${PLIST.doc}share/gtk-doc/html/colord/colord-CdIcc.html
+${PLIST.doc}share/gtk-doc/html/colord/colord-CdIccStore.html
+${PLIST.doc}share/gtk-doc/html/colord/colord-CdInterp.html
+${PLIST.doc}share/gtk-doc/html/colord/colord-CdInterpAkima.html
+${PLIST.doc}share/gtk-doc/html/colord/colord-CdInterpLinear.html
+${PLIST.doc}share/gtk-doc/html/colord/colord-CdIt8.html
+${PLIST.doc}share/gtk-doc/html/colord/colord-CdProfile.html
+${PLIST.doc}share/gtk-doc/html/colord/colord-CdSensor.html
+${PLIST.doc}share/gtk-doc/html/colord/colord-CdTransform.html
+${PLIST.doc}share/gtk-doc/html/colord/colord-cd-client-sync.html
+${PLIST.doc}share/gtk-doc/html/colord/colord-cd-color.html
+${PLIST.doc}share/gtk-doc/html/colord/colord-cd-device-sync.html
+${PLIST.doc}share/gtk-doc/html/colord/colord-cd-icc-utils.html
+${PLIST.doc}share/gtk-doc/html/colord/colord-cd-it8-utils.html
+${PLIST.doc}share/gtk-doc/html/colord/colord-cd-math.html
+${PLIST.doc}share/gtk-doc/html/colord/colord-cd-profile-sync.html
+${PLIST.doc}share/gtk-doc/html/colord/colord-cd-sensor-sync.html
+${PLIST.doc}share/gtk-doc/html/colord/colord-cd-spectrum.html
+${PLIST.doc}share/gtk-doc/html/colord/colord-cd-version.html
+${PLIST.doc}share/gtk-doc/html/colord/colord.devhelp2
+${PLIST.doc}share/gtk-doc/html/colord/home.png
+${PLIST.doc}share/gtk-doc/html/colord/index.html
+${PLIST.doc}share/gtk-doc/html/colord/ix01.html
+${PLIST.doc}share/gtk-doc/html/colord/left-insensitive.png
+${PLIST.doc}share/gtk-doc/html/colord/left.png
+${PLIST.doc}share/gtk-doc/html/colord/libcolord.html
+${PLIST.doc}share/gtk-doc/html/colord/libcolordprivate.html
+${PLIST.doc}share/gtk-doc/html/colord/license.html
+${PLIST.doc}share/gtk-doc/html/colord/right-insensitive.png
+${PLIST.doc}share/gtk-doc/html/colord/right.png
+${PLIST.doc}share/gtk-doc/html/colord/style.css
+${PLIST.doc}share/gtk-doc/html/colord/up-insensitive.png
+${PLIST.doc}share/gtk-doc/html/colord/up.png
+share/locale/ar/LC_MESSAGES/colord.mo
share/locale/as/LC_MESSAGES/colord.mo
+share/locale/be/LC_MESSAGES/colord.mo
+share/locale/bg/LC_MESSAGES/colord.mo
share/locale/bn_IN/LC_MESSAGES/colord.mo
share/locale/ca/LC_MESSAGES/colord.mo
share/locale/cs/LC_MESSAGES/colord.mo
@@ -136,15 +207,18 @@ 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
share/locale/it/LC_MESSAGES/colord.mo
share/locale/ja/LC_MESSAGES/colord.mo
+share/locale/ka/LC_MESSAGES/colord.mo
share/locale/kk/LC_MESSAGES/colord.mo
share/locale/kn/LC_MESSAGES/colord.mo
share/locale/ko/LC_MESSAGES/colord.mo
@@ -162,8 +236,10 @@ share/locale/pt/LC_MESSAGES/colord.mo
share/locale/pt_BR/LC_MESSAGES/colord.mo
share/locale/ro/LC_MESSAGES/colord.mo
share/locale/ru/LC_MESSAGES/colord.mo
+share/locale/si/LC_MESSAGES/colord.mo
share/locale/sk/LC_MESSAGES/colord.mo
share/locale/sl/LC_MESSAGES/colord.mo
+share/locale/sq/LC_MESSAGES/colord.mo
share/locale/sr/LC_MESSAGES/colord.mo
share/locale/sr@latin/LC_MESSAGES/colord.mo
share/locale/sv/LC_MESSAGES/colord.mo
@@ -173,5 +249,7 @@ share/locale/tr/LC_MESSAGES/colord.mo
share/locale/uk/LC_MESSAGES/colord.mo
share/locale/zh_CN/LC_MESSAGES/colord.mo
share/locale/zh_TW/LC_MESSAGES/colord.mo
+share/metainfo/org.freedesktop.colord.metainfo.xml
share/polkit-1/actions/org.freedesktop.color.policy
-share/vala/vapi/colord.vapi
+${PLIST.vapi}share/vala/vapi/colord.deps
+${PLIST.vapi}share/vala/vapi/colord.vapi
Index: pkgsrc/graphics/colord/buildlink3.mk
diff -u pkgsrc/graphics/colord/buildlink3.mk:1.5 pkgsrc/graphics/colord/buildlink3.mk:1.6
--- pkgsrc/graphics/colord/buildlink3.mk:1.5 Thu Jun 12 06:31:05 2025
+++ pkgsrc/graphics/colord/buildlink3.mk Sun Apr 26 14:48:56 2026
@@ -1,14 +1,26 @@
-# $NetBSD: buildlink3.mk,v 1.5 2025/06/12 06:31:05 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2026/04/26 14:48:56 vins Exp $
BUILDLINK_TREE+= colord
.if !defined(COLORD_BUILDLINK3_MK)
COLORD_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.colord+= colord>=1.3.5nb7
+BUILDLINK_API_DEPENDS.colord+= colord>=1.4.8
BUILDLINK_PKGSRCDIR.colord?= ../../graphics/colord
+.include "../../devel/libgusb/buildlink3.mk"
.include "../../graphics/lcms2/buildlink3.mk"
+.include "../../security/polkit/buildlink3.mk"
+.include "../../sysutils/dbus/buildlink3.mk"
+
+pkgbase := colord
+.include "../../mk/pkg-build-options.mk"
+
+.if ${PKG_BUILD_OPTIONS.colord:Mintrospection}
+. include "../../devel/gobject-introspection/buildlink3.mk"
+.elif ${PKG_BUILD_OPTIONS.colord:Mudev}
+. include "../../devel/libgudev/buildlink3.mk"
+
.endif # COLORD_BUILDLINK3_MK
BUILDLINK_TREE+= -colord
Index: pkgsrc/graphics/colord/distinfo
diff -u pkgsrc/graphics/colord/distinfo:1.4 pkgsrc/graphics/colord/distinfo:1.5
--- pkgsrc/graphics/colord/distinfo:1.4 Tue Oct 26 10:46:03 2021
+++ pkgsrc/graphics/colord/distinfo Sun Apr 26 14:48:56 2026
@@ -1,12 +1,18 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 10:46:03 nia Exp $
+$NetBSD: distinfo,v 1.5 2026/04/26 14:48:56 vins Exp $
-BLAKE2s (colord-1.3.5.tar.xz) = 46a1bc108a61982e62a9944b2c526da4c6909b90be5e68a5397c3c7711229845
-SHA512 (colord-1.3.5.tar.xz) = a0084ad2c08ae88c8023b8bade68f6cf25e13c77a6a37ef127b2914e86b06e6a7a783f9ab3585243d975dbbe1120d5daae13bdb586aefe519bf675458683025f
-Size (colord-1.3.5.tar.xz) = 1263488 bytes
-SHA1 (patch-client_cd-util.c) = 5147d37e65823b706b41ae33d2cf85892ff96ac6
-SHA1 (patch-configure.ac) = cc2d522faee09f3af388210962ea7283879ff4a6
-SHA1 (patch-data_Makefile.am) = 1e0a3bfc0c8a76d44b619906c9fd77e0f4a83486
-SHA1 (patch-lib_colord_cd-icc-store.c) = 6c379033d35a696496d9300db5845279a61136db
-SHA1 (patch-src_Makefile.am) = e0667c0408e6dc5ee0536a84ed992c962ec8e8a7
-SHA1 (patch-src_Makefile.in) = 7f9ebf08ca8fec6c0e6a5f8a948e5a979fd6ca02
-SHA1 (patch-src_cd-main.c) = e9a8f970a5f1a2e761bd271a42e37a531953dca9
+BLAKE2s (colord-1.4.8.tar.xz) = 199f5464d270b7bab521c65b84823e4a0778bb837956435dc9b8d1b7e9ec86dc
+SHA512 (colord-1.4.8.tar.xz) = 5e9a3b9ee93ca86a0467630905190cf9659f659ae6e7917c75df307793b8a78e80f598ee873e5b1070ead1c683780bb22b82410746aff41f50f801aa10e71018
+Size (colord-1.4.8.tar.xz) = 1916884 bytes
+SHA1 (patch-client_cd-util.c) = ce3eae7579a721e0b57aef580cc81ac9e349a759
+SHA1 (patch-client_meson.build) = 580d375625c7145e58a24f601bb4495eb39244d8
+SHA1 (patch-client_run.sh) = 72a090061192f9028a6217b44cd291142cde75ae
+SHA1 (patch-data_meson.build) = 6fd964372570e1578c5650b9df9bf11e2b6b169e
+SHA1 (patch-lib_colord_cd-edid.c) = b24376954fa80d348b03a82379e85b3e02cbc37b
+SHA1 (patch-man_meson.build) = f5d67e4d5a236f16c825e686526a062ae649e60b
+SHA1 (patch-meson.build) = 1e846babc629141c70fce8ee157259f970a898c4
+SHA1 (patch-meson__options.txt) = eb8e3357573611d72e703f889f3c2fe288d3c267
+SHA1 (patch-src_cd-main.c) = 6e2873ecd74d9a06f0a64cc767a7ad353d860f92
+SHA1 (patch-src_cd-sensor.c) = ed44862e01a00935fcf69d7790d97c73a15d1e7d
+SHA1 (patch-src_cd-sensor.h) = a164159ca93535cefb2956b5ade9e84ee7b9a8b9
+SHA1 (patch-src_meson.build) = 4ba021242925bbbb624425ad90735c683a4d548f
+SHA1 (patch-src_plugins_meson.build) = a180a3bbc49029d760150574e03f99a2d62ad31a
Index: pkgsrc/graphics/colord/patches/patch-client_cd-util.c
diff -u pkgsrc/graphics/colord/patches/patch-client_cd-util.c:1.2 pkgsrc/graphics/colord/patches/patch-client_cd-util.c:1.3
--- pkgsrc/graphics/colord/patches/patch-client_cd-util.c:1.2 Tue Jun 26 10:16:20 2018
+++ pkgsrc/graphics/colord/patches/patch-client_cd-util.c Sun Apr 26 14:48:56 2026
@@ -1,6 +1,5 @@
-$NetBSD: patch-client_cd-util.c,v 1.2 2018/06/26 10:16:20 jperkin Exp $
+$NetBSD: patch-client_cd-util.c,v 1.3 2026/04/26 14:48:56 vins Exp $
-Fix db path.
SunOS requires sys/termios.h
--- client/cd-util.c.orig 2016-07-27 13:49:36.000000000 +0000
@@ -15,12 +14,3 @@ SunOS requires sys/termios.h
#include <stdlib.h>
#include <stdio.h>
#include <sys/ioctl.h>
-@@ -814,7 +817,7 @@ cd_util_dump (CdUtilPrivate *priv, gchar
- {
- CdDevice *device;
- CdProfile *profile;
-- const gchar *argv[] = { "sqlite3", "/var/lib/colord/mapping.db", ".dump", NULL };
-+ const gchar *argv[] = { "sqlite3", "@VARBASE@/db/colord/mapping.db", ".dump", NULL };
- gboolean ret = TRUE;
- gchar *tmp;
- GDateTime *dt;
Index: pkgsrc/graphics/colord/patches/patch-src_cd-main.c
diff -u pkgsrc/graphics/colord/patches/patch-src_cd-main.c:1.1 pkgsrc/graphics/colord/patches/patch-src_cd-main.c:1.2
--- pkgsrc/graphics/colord/patches/patch-src_cd-main.c:1.1 Wed Jun 13 15:49:40 2018
+++ pkgsrc/graphics/colord/patches/patch-src_cd-main.c Sun Apr 26 14:48:56 2026
@@ -1,44 +1,71 @@
-$NetBSD: patch-src_cd-main.c,v 1.1 2018/06/13 15:49:40 youri Exp $
+$NetBSD: patch-src_cd-main.c,v 1.2 2026/04/26 14:48:56 vins Exp $
-Adjust paths.
+Make udev support optional.
---- src/cd-main.c.orig 2016-07-27 13:55:24.000000000 +0000
+--- src/cd-main.c.orig 2025-06-23 14:06:37.000000000 +0000
+++ src/cd-main.c
-@@ -1716,8 +1716,8 @@ cd_main_icc_store_added_cb (CdIccStore *
- /* create profile */
- profile = cd_profile_new ();
- filename = cd_icc_get_filename (icc);
-- if (g_str_has_prefix (filename, "/usr/share/color") ||
-- g_str_has_prefix (filename, "/var/lib/color"))
-+ if (g_str_has_prefix (filename, "@PREFIX@/share/color") ||
-+ g_str_has_prefix (filename, "@VARBASE@/db/color"))
- cd_profile_set_is_system_wide (profile, TRUE);
+@@ -60,7 +60,9 @@ typedef struct {
+ CdMappingDb *mapping_db;
+ CdDeviceDb *device_db;
+ CdProfileDb *profile_db;
++#ifdef HAVE_UDEV
+ CdSensorClient *sensor_client;
++#endif
+ GPtrArray *sensors;
+ GPtrArray *plugins;
+ GMainLoop *loop;
+@@ -1905,8 +1907,10 @@ cd_main_on_name_acquired_cb (GDBusConnec
+ cd_main_add_disk_device (priv, device_id);
+ }
+
++#ifdef HAVE_UDEV
+ /* add sensor devices */
+ cd_sensor_client_coldplug (priv->sensor_client);
++#endif
+
+ /* coldplug plugin devices */
+ cd_main_plugin_phase (priv, CD_PLUGIN_PHASE_COLDPLUG);
+@@ -1936,7 +1940,7 @@ cd_main_on_name_lost_cb (GDBusConnection
+ g_main_loop_quit (priv->loop);
+ }
+
+-
++#ifdef HAVE_UDEV
+ static void
+ cd_main_client_sensor_added_cb (CdSensorClient *sensor_client_,
+ CdSensor *sensor,
+@@ -1967,6 +1971,7 @@ cd_main_client_sensor_removed_cb (CdSens
+ NULL);
+ g_ptr_array_remove (priv->sensors, sensor);
+ }
++#endif
+
+ static gboolean
+ cd_main_timed_exit_cb (gpointer user_data)
+@@ -2390,6 +2395,7 @@ main (int argc, char *argv[])
+ priv->devices_array = cd_device_array_new ();
+ priv->profiles_array = cd_profile_array_new ();
+ priv->sensors = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref);
++#ifdef HAVE_UDEV
+ priv->sensor_client = cd_sensor_client_new ();
+ g_signal_connect (priv->sensor_client, "sensor-added",
+ G_CALLBACK (cd_main_client_sensor_added_cb),
+@@ -2397,6 +2403,7 @@ main (int argc, char *argv[])
+ g_signal_connect (priv->sensor_client, "sensor-removed",
+ G_CALLBACK (cd_main_client_sensor_removed_cb),
+ priv);
++#endif
- /* parse the profile name */
-@@ -2590,7 +2590,7 @@ main (int argc, char *argv[])
/* connect to the mapping db */
priv->mapping_db = cd_mapping_db_new ();
- ret = cd_mapping_db_load (priv->mapping_db,
-- LOCALSTATEDIR "/lib/colord/mapping.db",
-+ LOCALSTATEDIR "/db/colord/mapping.db",
- &error);
- if (!ret) {
- g_warning ("CdMain: failed to load mapping database: %s",
-@@ -2601,7 +2601,7 @@ main (int argc, char *argv[])
- /* connect to the device db */
- priv->device_db = cd_device_db_new ();
- ret = cd_device_db_load (priv->device_db,
-- LOCALSTATEDIR "/lib/colord/storage.db",
-+ LOCALSTATEDIR "/db/colord/storage.db",
- &error);
- if (!ret) {
- g_warning ("CdMain: failed to load device database: %s",
-@@ -2612,7 +2612,7 @@ main (int argc, char *argv[])
- /* connect to the profile db */
- priv->profile_db = cd_profile_db_new ();
- ret = cd_profile_db_load (priv->profile_db,
-- LOCALSTATEDIR "/lib/colord/storage.db",
-+ LOCALSTATEDIR "/db/colord/storage.db",
- &error);
- if (!ret) {
- g_warning ("CdMain: failed to load profile database: %s",
+@@ -2519,8 +2526,10 @@ out:
+ g_ptr_array_unref (priv->sensors);
+ if (priv->plugins != NULL)
+ g_ptr_array_unref (priv->plugins);
++#ifdef HAVE_UDEV
+ if (priv->sensor_client != NULL)
+ g_object_unref (priv->sensor_client);
++#endif
+ if (priv->icc_store != NULL)
+ g_object_unref (priv->icc_store);
+ if (priv->mapping_db != NULL)
Added files:
Index: pkgsrc/graphics/colord/PLIST.Linux
diff -u /dev/null pkgsrc/graphics/colord/PLIST.Linux:1.1
--- /dev/null Sun Apr 26 14:48:57 2026
+++ pkgsrc/graphics/colord/PLIST.Linux Sun Apr 26 14:48:56 2026
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.Linux,v 1.1 2026/04/26 14:48:56 vins Exp $
+lib/udev/rules.d/69-cd-sensors.rules
+lib/udev/rules.d/95-cd-devices.rules
Index: pkgsrc/graphics/colord/options.mk
diff -u /dev/null pkgsrc/graphics/colord/options.mk:1.1
--- /dev/null Sun Apr 26 14:48:57 2026
+++ pkgsrc/graphics/colord/options.mk Sun Apr 26 14:48:56 2026
@@ -0,0 +1,71 @@
+# $NetBSD: options.mk,v 1.1 2026/04/26 14:48:56 vins Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.colord
+PKG_SUPPORTED_OPTIONS= doc introspection sane udev vapi
+PKG_SUGGESTED_OPTIONS= introspection vapi
+
+# check for a working libudev implementation
+.include "../../mk/udev.buildlink3.mk"
+.if ${UDEV_TYPE} != "none"
+PKG_SUGGESTED_OPTIONS+= udev
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+= doc introspection sane udev vapi
+
+#
+# Build documentation
+#
+.if !empty(PKG_OPTIONS:Mdoc)
+TOOL_DEPENDS+= gtk-doc-[0-9]*:../../textproc/gtk-doc
+MESON_ARGS+= -Ddocs=true
+PLIST.doc= yes
+.else
+MESON_ARGS+= -Ddocs=false
+.endif
+
+#
+# Build GObject Introspection data
+#
+.if !empty(PKG_OPTIONS:Mintrospection)
+MESON_ARGS+= -Dintrospection=true
+. include "../../devel/gobject-introspection/buildlink3.mk"
+PLIST.introspection= yes
+.else
+MESON_ARGS+= -Dintrospection=false
+.endif
+
+#
+# Enable SANE support
+#
+.if !empty(PKG_OPTIONS:Msane)
+. include "../../graphics/sane-backends/buildlink3.mk"
+MESON_ARGS+= -Dsane=true
+PLIST.sane= yes
+.else
+MESON_ARGS+= -Dsane=false
+.endif
+
+#
+# Generate Vala API file
+#
+.if !empty(PKG_OPTIONS:Mvapi)
+MESON_ARGS+= -Dvapi=true
+. include "../../lang/vala/buildlink3.mk"
+PLIST.vapi= yes
+.else
+MESON_ARGS+= -Dvapi=false
+.endif
+
+#
+# Libudev support
+#
+.if !empty(PKG_OPTIONS:Mudev)
+. include "../../devel/libgudev/buildlink3.mk"
+MESON_ARGS+= -Dudev=true
+PLIST_VARS+= udev
+PLIST.udev= yes
+.else
+MESON_ARGS+= -Dudev=false
+.endif
Index: pkgsrc/graphics/colord/patches/patch-client_meson.build
diff -u /dev/null pkgsrc/graphics/colord/patches/patch-client_meson.build:1.1
--- /dev/null Sun Apr 26 14:48:57 2026
+++ pkgsrc/graphics/colord/patches/patch-client_meson.build Sun Apr 26 14:48:56 2026
@@ -0,0 +1,23 @@
+$NetBSD: patch-client_meson.build,v 1.1 2026/04/26 14:48:56 vins Exp $
+
+Replace custom targets with local script to avoid missing
+shared objects in generated executables.
+
+--- client/meson.build.orig 2025-06-23 14:06:37.000000000 +0000
++++ client/meson.build
+@@ -114,3 +114,15 @@ cd_create_profile = executable(
+ install : true,
+ install_dir : bindir
+ )
++
++run_cd_idt8 = [
++ join_paths(meson.source_root(), 'client', 'run.sh'),
++ join_paths(meson.build_root(), 'lib', 'colord'),
++ cd_idt8
++]
++
++run_cd_create_profile = [
++ join_paths(meson.source_root(), 'client', 'run.sh'),
++ join_paths(meson.build_root(), 'lib', 'colord'),
++ cd_create_profile
++]
Index: pkgsrc/graphics/colord/patches/patch-client_run.sh
diff -u /dev/null pkgsrc/graphics/colord/patches/patch-client_run.sh:1.1
--- /dev/null Sun Apr 26 14:48:57 2026
+++ pkgsrc/graphics/colord/patches/patch-client_run.sh Sun Apr 26 14:48:56 2026
@@ -0,0 +1,24 @@
+$NetBSD: patch-client_run.sh,v 1.1 2026/04/26 14:48:56 vins Exp $
+
+This script is a hack to allow the `cd_create_profile' and
+`cd_idt8' executables to access their required shared libraries during
+the build, as meson's RPATH gets otherwise overridden.
+
+--- client/run.sh.orig 2026-04-26 14:18:45.688746449 +0000
++++ client/run.sh
+@@ -0,0 +1,15 @@
++#!@SH@
++
++libdir="$1"
++executable="$2"
++
++if [ -z "$LD_LIBRARY_PATH" ]; then
++ LD_LIBRARY_PATH="$libdir"
++else
++ LD_LIBRARY_PATH="$libdir:$LD_LIBRARY_PATH"
++fi
++
++export LD_LIBRARY_PATH
++shift 2
++
++exec "$executable" "$@"
Index: pkgsrc/graphics/colord/patches/patch-data_meson.build
diff -u /dev/null pkgsrc/graphics/colord/patches/patch-data_meson.build:1.1
--- /dev/null Sun Apr 26 14:48:57 2026
+++ pkgsrc/graphics/colord/patches/patch-data_meson.build Sun Apr 26 14:48:56 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-data_meson.build,v 1.1 2026/04/26 14:48:56 vins Exp $
+
+Get bash completions dir without pkg-config.
+
+--- data/meson.build.orig 2025-06-23 14:06:37.000000000 +0000
++++ data/meson.build
+@@ -8,7 +8,7 @@ subdir('ti1')
+
+ if get_option('bash_completion')
+ install_data('colormgr',
+- install_dir: bash_completion.get_pkgconfig_variable('completionsdir')
++ install_dir: get_variable('completionsdir')
+ )
+ endif
+
Index: pkgsrc/graphics/colord/patches/patch-lib_colord_cd-edid.c
diff -u /dev/null pkgsrc/graphics/colord/patches/patch-lib_colord_cd-edid.c:1.1
--- /dev/null Sun Apr 26 14:48:57 2026
+++ pkgsrc/graphics/colord/patches/patch-lib_colord_cd-edid.c Sun Apr 26 14:48:56 2026
@@ -0,0 +1,16 @@
+$NetBSD: patch-lib_colord_cd-edid.c,v 1.1 2026/04/26 14:48:56 vins Exp $
+
+Make udev support optional.
+
+--- lib/colord/cd-edid.c.orig 2025-06-23 14:06:37.000000000 +0000
++++ lib/colord/cd-edid.c
+@@ -25,7 +25,9 @@
+ #include <string.h>
+ #include <glib-object.h>
+ #include <math.h>
++#ifdef HAVE_LIBUDEV
+ #include <libudev.h>
++#endif
+
+ #include "cd-edid.h"
+ #include "cd-quirk.h"
Index: pkgsrc/graphics/colord/patches/patch-man_meson.build
diff -u /dev/null pkgsrc/graphics/colord/patches/patch-man_meson.build:1.1
--- /dev/null Sun Apr 26 14:48:57 2026
+++ pkgsrc/graphics/colord/patches/patch-man_meson.build Sun Apr 26 14:48:56 2026
@@ -0,0 +1,14 @@
+$NetBSD: patch-man_meson.build,v 1.1 2026/04/26 14:48:56 vins Exp $
+
+Use our local copy to fix detection of docbook-xsl.
+
+--- man/meson.build.orig 2026-04-26 12:32:47.769364344 +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 = '@DOCBOOK_MANPAGE_XSL@'
+ ret = run_command(xsltproc, '--nonet', stylesheet_url)
+ if ret.returncode() != 0
+ error('Cannot build man pages without docbook-xsl-ns')
Index: pkgsrc/graphics/colord/patches/patch-meson.build
diff -u /dev/null pkgsrc/graphics/colord/patches/patch-meson.build:1.1
--- /dev/null Sun Apr 26 14:48:57 2026
+++ pkgsrc/graphics/colord/patches/patch-meson.build Sun Apr 26 14:48:56 2026
@@ -0,0 +1,59 @@
+$NetBSD: patch-meson.build,v 1.1 2026/04/26 14:48:56 vins Exp $
+
+* Make udev support optional.
+* Do not require bash-completion.
+
+--- meson.build.orig 2025-06-23 14:06:37.000000000 +0000
++++ meson.build
+@@ -118,9 +118,16 @@ giounix = dependency('gio-unix-2.0', ver
+ lcms = dependency('lcms2', version : '>= 2.6')
+ sqlite = dependency('sqlite3')
+ gusb = dependency('gusb', version : '>= 0.2.7')
+-gudev = dependency('gudev-1.0')
+ libm = cc.find_library('m', required: false)
+-libudev = dependency('libudev')
++
++if get_option('udev')
++ libudev = dependency('libudev')
++ gudev = dependency('gudev-1.0')
++ conf.set('HAVE_UDEV', '1')
++else
++ libudev = []
++ gudev = []
++endif
+
+ if get_option('udev_rules')
+ udev = dependency('udev')
+@@ -165,7 +172,10 @@ if get_option('session_example')
+ colord_gtk = dependency('colord-gtk', version : '>= 0.1.24')
+ endif
+ if get_option('bash_completion')
+- bash_completion = dependency('bash-completion', version : '>= 2.0')
++ bash = find_program('bash', required : false)
++ if bash.found() == false
++ warning('bash completions enabled but bash shell could not be found')
++ endif
+ endif
+
+ if get_option('sane')
+@@ -243,6 +253,11 @@ sysconfdir = join_paths(prefix, get_opti
+ mandir = join_paths(prefix, get_option('mandir'))
+ includedir = join_paths(prefix, get_option('includedir'))
+
++if get_option('bash_completion')
++ completionsdir = join_paths(prefix, get_option('completionsdir'))
++ conf.set_quoted('COMPLETIONSDIR', completionsdir)
++endif
++
+ conf.set_quoted('SYSCONFDIR', sysconfdir)
+ conf.set_quoted('BINDIR', bindir)
+ conf.set_quoted('LIBDIR', libdir)
+@@ -251,7 +266,7 @@ conf.set_quoted('LIBEXECDIR', libexecdir
+ conf.set_quoted('LOCALSTATEDIR', localstatedir)
+
+ cd_system_profiles_dir = join_paths(localstatedir,
+- 'lib', 'colord', 'icc')
++ 'db', 'colord', 'icc')
+ conf.set_quoted('CD_SYSTEM_PROFILES_DIR', cd_system_profiles_dir)
+
+ conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
Index: pkgsrc/graphics/colord/patches/patch-meson__options.txt
diff -u /dev/null pkgsrc/graphics/colord/patches/patch-meson__options.txt:1.1
--- /dev/null Sun Apr 26 14:48:57 2026
+++ pkgsrc/graphics/colord/patches/patch-meson__options.txt Sun Apr 26 14:48:56 2026
@@ -0,0 +1,16 @@
+$NetBSD: patch-meson__options.txt,v 1.1 2026/04/26 14:48:56 vins Exp $
+
+* Add option to specify bash completions directory.
+* Add option to toggle libudev support.
+
+--- meson_options.txt.orig 2025-06-23 14:06:37.000000000 +0000
++++ meson_options.txt
+@@ -1,6 +1,8 @@
+ option('daemon', type : 'boolean', value : true, description : 'build the daemon')
+ option('session_example', type : 'boolean', value : false, description : 'Enable session example')
+ option('bash_completion', type : 'boolean', value : true, description : 'Enable bash completion')
++option('completionsdir', type : 'string', value : '', description : 'Destination directory for bash completions')
++option('udev', type: 'boolean', value: false, description: 'Enable libudev support')
+ option('udev_rules', type: 'boolean', value: true, description: 'Install udev rules')
+ option('systemd', type : 'boolean', value : true, description : 'Enable systemd integration')
+ option('systemd_root_prefix', type: 'string', value: '', description: 'Directory to base systemd’s installation directories on')
Index: pkgsrc/graphics/colord/patches/patch-src_cd-sensor.c
diff -u /dev/null pkgsrc/graphics/colord/patches/patch-src_cd-sensor.c:1.1
--- /dev/null Sun Apr 26 14:48:57 2026
+++ pkgsrc/graphics/colord/patches/patch-src_cd-sensor.c Sun Apr 26 14:48:56 2026
@@ -0,0 +1,75 @@
+$NetBSD: patch-src_cd-sensor.c,v 1.1 2026/04/26 14:48:56 vins Exp $
+
+Make udev support optional.
+
+--- src/cd-sensor.c.orig 2025-06-23 14:06:37.000000000 +0000
++++ src/cd-sensor.c
+@@ -89,7 +89,9 @@ typedef struct
+ gchar *serial;
+ gchar *model;
+ gchar *vendor;
++#ifdef HAVE_UDEV
+ GUdevDevice *device;
++#endif
+ gboolean native;
+ gboolean embedded;
+ gboolean locked;
+@@ -1229,8 +1231,12 @@ cd_sensor_register_object (CdSensor *sen
+ const gchar *
+ cd_sensor_get_device_path (CdSensor *sensor)
+ {
++#ifdef HAVE_UDEV
+ CdSensorPrivate *priv = GET_PRIVATE (sensor);
+ return g_udev_device_get_sysfs_path (priv->device);
++#else
++ return NULL;
++#endif
+ }
+
+ const gchar *
+@@ -1246,6 +1252,7 @@ cd_sensor_open_usb_device (CdSensor *sen
+ gint interface,
+ GError **error)
+ {
++#ifdef HAVE_UDEV
+ CdSensorPrivate *priv = GET_PRIVATE (sensor);
+ guint8 busnum;
+ guint8 devnum;
+@@ -1270,6 +1277,10 @@ cd_sensor_open_usb_device (CdSensor *sen
+ return NULL;
+ }
+ return g_object_ref (device);
++#else
++ g_set_error_literal (error, 1, 0, "failed: no gudev support");
++ return NULL;
++#endif
+ }
+
+ void
+@@ -1283,6 +1294,7 @@ cd_sensor_add_cap (CdSensor *sensor, CdS
+
+ }
+
++#ifdef HAVE_UDEV
+ GUdevDevice *
+ cd_sensor_get_device (CdSensor *sensor)
+ {
+@@ -1411,6 +1423,7 @@ cd_sensor_set_from_device (CdSensor *sen
+ /* success */
+ return TRUE;
+ }
++#endif
+
+ void
+ cd_sensor_set_index (CdSensor *sensor,
+@@ -1656,8 +1669,10 @@ cd_sensor_finalize (GObject *object)
+ g_hash_table_unref (priv->options);
+ g_hash_table_unref (priv->metadata);
+ g_object_unref (priv->usb_ctx);
++#ifdef HAVE_UDEV
+ if (priv->device != NULL)
+ g_object_unref (priv->device);
++#endif
+
+ G_OBJECT_CLASS (cd_sensor_parent_class)->finalize (object);
+ }
Index: pkgsrc/graphics/colord/patches/patch-src_cd-sensor.h
diff -u /dev/null pkgsrc/graphics/colord/patches/patch-src_cd-sensor.h:1.1
--- /dev/null Sun Apr 26 14:48:57 2026
+++ pkgsrc/graphics/colord/patches/patch-src_cd-sensor.h Sun Apr 26 14:48:57 2026
@@ -0,0 +1,32 @@
+$NetBSD: patch-src_cd-sensor.h,v 1.1 2026/04/26 14:48:57 vins Exp $
+
+Make udev support optional.
+
+--- src/cd-sensor.h.orig 2025-06-23 14:06:37.000000000 +0000
++++ src/cd-sensor.h
+@@ -27,10 +27,10 @@
+ #include <glib-object.h>
+ #include <gio/gio.h>
+ #include <colord-private.h>
+-
++#ifdef HAVE_UDEV
+ #include <gudev/gudev.h>
++#endif
+ #include <gusb.h>
+-
+ #include "cd-common.h"
+
+ G_BEGIN_DECLS
+@@ -66,10 +66,12 @@ gboolean cd_sensor_register_object (CdS
+ GDBusConnection *connection,
+ GDBusInterfaceInfo *info,
+ GError **error);
++#ifdef HAVE_UDEV
+ gboolean cd_sensor_set_from_device (CdSensor *sensor,
+ GUdevDevice *device,
+ GError **error);
+ GUdevDevice *cd_sensor_get_device (CdSensor *sensor);
++#endif
+ void cd_sensor_set_index (CdSensor *sensor,
+ guint idx);
+ GUsbDevice *cd_sensor_open_usb_device (CdSensor *sensor,
Index: pkgsrc/graphics/colord/patches/patch-src_meson.build
diff -u /dev/null pkgsrc/graphics/colord/patches/patch-src_meson.build:1.1
--- /dev/null Sun Apr 26 14:48:57 2026
+++ pkgsrc/graphics/colord/patches/patch-src_meson.build Sun Apr 26 14:48:57 2026
@@ -0,0 +1,28 @@
+$NetBSD: patch-src_meson.build,v 1.1 2026/04/26 14:48:57 vins Exp $
+
+Make udev support optional.
+
+--- src/meson.build.orig 2025-06-23 14:06:37.000000000 +0000
++++ src/meson.build
+@@ -30,6 +30,12 @@ if get_option('systemd')
+ colord_extra_deps += libsystemd
+ endif
+
++colord_extra_sources = []
++if get_option('udev')
++ colord_extra_sources += 'cd-sensor-client.c'
++endif
++
++
+ executable(
+ 'colord',
+ resources_src,
+@@ -49,7 +55,7 @@ executable(
+ 'cd-profile.c',
+ 'cd-profile-db.c',
+ 'cd-sensor.c',
+- 'cd-sensor-client.c',
++ colord_extra_sources,
+ ],
+ include_directories : [
+ colord_incdir,
Index: pkgsrc/graphics/colord/patches/patch-src_plugins_meson.build
diff -u /dev/null pkgsrc/graphics/colord/patches/patch-src_plugins_meson.build:1.1
--- /dev/null Sun Apr 26 14:48:57 2026
+++ pkgsrc/graphics/colord/patches/patch-src_plugins_meson.build Sun Apr 26 14:48:57 2026
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_plugins_meson.build,v 1.1 2026/04/26 14:48:57 vins Exp $
+
+Make udev support optional.
+
+--- src/plugins/meson.build.orig 2025-06-23 14:06:37.000000000 +0000
++++ src/plugins/meson.build
+@@ -15,6 +15,7 @@ shared_module('colord_sensor_example',
+ gio,
+ ],
+ )
++if get_option('udev')
+ shared_module('colord_sensor_camera',
+ sources : [
+ 'cd-plugin-camera.c',
+@@ -74,3 +75,4 @@ if get_option('sane')
+ ],
+ )
+ endif
++endif
Home |
Main Index |
Thread Index |
Old Index