diff options
| author | Richard Hughes <richard@hughsie.com> | 2017-07-25 22:49:33 +0100 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2017-07-31 12:00:57 +0100 |
| commit | 158fba0bc37d4cdcbd98d30e97b434ad033732f4 (patch) | |
| tree | d94c6be43ada1d89c710ac22132e38934168bbb4 | |
| parent | 9235b120fc0ec33ef13a04d54c403285dae49cb3 (diff) | |
| download | colord-158fba0bc37d4cdcbd98d30e97b434ad033732f4.tar.gz | |
Port to the Meson build system
139 files changed, 1945 insertions, 3443 deletions
diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index e3b21bf..0000000 --- a/Makefile.am +++ /dev/null @@ -1,132 +0,0 @@ -AUTOMAKE_OPTIONS = 1.7 - -ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - -NULL = - -SUBDIRS = \ - lib \ - po - -# this needs libcolord -SUBDIRS += \ - client \ - contrib \ - doc - -# this needs client/cd-create-profile -SUBDIRS += \ - data - -# this needs data/profiles/*.icc -SUBDIRS += \ - man \ - policy \ - rules \ - src - -snapshot: - $(MAKE) dist distdir=$(PACKAGE)-$(VERSION)-`date +"%Y%m%d"` - -DISTCHECK_CONFIGURE_FLAGS = \ - --enable-introspection \ - --enable-fd-fallback \ - --enable-gtk \ - --enable-sane \ - --enable-libcolordcompat \ - --disable-print-profiles \ - --disable-bash-completion \ - --enable-gtk-doc \ - --with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \ - --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) - -EXTRA_DIST = \ - COPYING \ - MAINTAINERS \ - AUTHORS \ - README.md \ - NEWS \ - autogen.sh \ - config.h \ - intltool-extract.in \ - intltool-merge.in \ - intltool-update.in - -MAINTAINERCLEANFILES = \ - $(srcdir)/INSTALL \ - $(srcdir)/ABOUT-NLS \ - $(srcdir)/aclocal.m4 \ - $(srcdir)/autoscan.log \ - $(srcdir)/compile \ - $(srcdir)/config.guess \ - $(srcdir)/config.rpath \ - $(srcdir)/config.h.in \ - $(srcdir)/config.sub \ - $(srcdir)/configure.scan \ - $(srcdir)/depcomp \ - $(srcdir)/install-sh \ - $(srcdir)/ltmain.sh \ - $(srcdir)/missing \ - $(srcdir)/mkinstalldirs \ - $(srcdir)/omf.make \ - $(srcdir)/test-driver \ - $(srcdir)/xmldocs.make \ - $(srcdir)/gtk-doc.make \ - $(srcdir)/ChangeLog \ - $(srcdir)/po/Makefile.in.in~ \ - $(srcdir)/colord-*.tar.* \ - `find "$(srcdir)" -type f -name Makefile.in -print` - -GITIGNOREFILES = \ - .tx - -clang: - $(MAKE) clean; \ - rm -rf clang; \ - scan-build --use-analyzer=/usr/bin/clang \ - -o clang-report \ - ./autogen.sh \ - --enable-introspection=no \ - --disable-print-profiles; \ - scan-build --use-analyzer=/usr/bin/clang \ - -o clang-report make - -coverity: - $(MAKE); \ - cd src; $(MAKE) clean; cd -; \ - cd lib; $(MAKE) clean; cd -; \ - cd examples; $(MAKE) clean; cd -; \ - cd client; $(MAKE) clean; cd -; \ - cd contrib/session-helper; $(MAKE) clean; cd -; \ - cov-build --dir cov-int $(MAKE); \ - tar czvf colord-coverity.tgz cov-int; \ - export COVERITY_EMAIL=`cat ~/.coverity | grep EMAIL | cut -f2`; \ - export COVERITY_PASSWORD=`cat ~/.coverity | grep PASSWORD_colord | cut -f2`; \ - curl --form file=@colord-coverity.tgz \ - --form project=colord \ - --form password=${COVERITY_PASSWORD} \ - --form email=${COVERITY_EMAIL} \ - http://scan5.coverity.com/cgi-bin/upload.py - -distclean-local: - if test $(srdcir) = .; then :; else \ - rm -f ChangeLog; \ - fi - -ChangeLog: - @echo Creating $@ - @if test -d "$(srcdir)/.git"; then \ - (GIT_DIR=$(top_srcdir)/.git ./missing --run git log e197d80c8937c622f21f569457d1bbd05746d951.. --stat -M -C --name-status --date=short --no-color) | fmt --split-only > $@.tmp \ - && mv -f $@.tmp $@ \ - || ($(RM) $@.tmp; \ - echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \ - (test -f $@ || echo git-log is required to generate this file >> $@)); \ - else \ - test -f $@ || \ - (echo A git checkout and git-log is required to generate ChangeLog >&2 && \ - echo A git checkout and git-log is required to generate this file >> $@); \ - fi - -.PHONY: ChangeLog - --include $(top_srcdir)/git.mk @@ -1 +0,0 @@ - diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 60b4fc7..0000000 --- a/autogen.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# Copyright (C) 2010 Richard Hughes <richard@hughsie.com> -# -# Run this to generate all the initial makefiles, etc. -# -# Licensed under the GNU General Public License Version 2 -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. - -test -n "$srcdir" || srcdir=`dirname "$0"` -test -n "$srcdir" || srcdir=. - -olddir=`pwd` -cd "$srcdir" - -GTKDOCIZE=`which gtkdocize` -if test -z $GTKDOCIZE; then - echo "*** No GTK-Doc found, please install it ***" - exit 1 -fi - -AUTORECONF=`which autoreconf` -if test -z $AUTORECONF; then - echo "*** No autoreconf found, please install it ***" - exit 1 -fi - -gtkdocize --copy || exit $? -autopoint --force -ACLOCAL="${ACLOCAL-aclocal} $ACLOCAL_FLAGS" AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose - -cd "$olddir" -test -n "$NOCONFIGURE" || "$srcdir/configure" "$@" diff --git a/client/Makefile.am b/client/Makefile.am deleted file mode 100644 index 91b64cd..0000000 --- a/client/Makefile.am +++ /dev/null @@ -1,104 +0,0 @@ -AM_CPPFLAGS = \ - $(PIE_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(GTK_CFLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/lib \ - -I$(top_builddir)/lib \ - -I$(top_srcdir)/lib/colord \ - -DG_LOG_DOMAIN=\"Cd\" \ - -DCD_COMPILATION \ - -DCD_DISABLE_DEPRECATED \ - -DLIBEXECDIR=\"$(libexecdir)\" \ - -DDATADIR=\"$(datadir)\" \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DVERSION="\"$(VERSION)\"" \ - -DLOCALEDIR=\""$(localedir)"\" - -COLORD_LIBS = \ - $(top_builddir)/lib/colord/libcolordprivate.la \ - $(top_builddir)/lib/colord/libcolord.la - -bin_PROGRAMS = \ - cd-create-profile \ - cd-iccdump \ - cd-it8 \ - cd-fix-profile \ - colormgr - -colormgr_SOURCES = \ - cd-util.c - -colormgr_LDADD = \ - $(COLORD_LIBS) \ - $(GLIB_LIBS) - -colormgr_LDFLAGS = \ - $(PIE_LDFLAGS) - -colormgr_CFLAGS = \ - $(WARN_CFLAGS) - -cd_fix_profile_SOURCES = \ - cd-fix-profile.c - -cd_fix_profile_LDADD = \ - $(GLIB_LIBS) \ - $(LCMS_LIBS) \ - $(COLORD_LIBS) \ - -lm - -cd_fix_profile_CFLAGS = \ - $(WARN_CFLAGS) - -cd_fix_profile_LDFLAGS = \ - $(PIE_LDFLAGS) - -cd_iccdump_SOURCES = \ - cd-iccdump.c - -cd_iccdump_LDADD = \ - $(GLIB_LIBS) \ - $(LCMS_LIBS) \ - $(COLORD_LIBS) \ - -lm - -cd_iccdump_LDFLAGS = \ - $(PIE_LDFLAGS) - -cd_iccdump_CFLAGS = \ - $(WARN_CFLAGS) - -cd_it8_SOURCES = \ - cd-it8.c - -cd_it8_LDADD = \ - $(GLIB_LIBS) \ - $(LCMS_LIBS) \ - $(COLORD_LIBS) \ - -lm - -cd_it8_LDFLAGS = \ - $(PIE_LDFLAGS) - -cd_it8_CFLAGS = \ - $(WARN_CFLAGS) - -cd_create_profile_SOURCES = \ - cd-create-profile.c - -cd_create_profile_LDADD = \ - $(GLIB_LIBS) \ - $(LCMS_LIBS) \ - $(COLORD_LIBS) \ - -lm - -cd_create_profile_LDFLAGS = \ - $(PIE_LDFLAGS) - -cd_create_profile_CFLAGS = \ - $(WARN_CFLAGS) - -MAINTAINERCLEANFILES = *.a - --include $(top_srcdir)/git.mk diff --git a/client/meson.build b/client/meson.build new file mode 100644 index 0000000..981b54b --- /dev/null +++ b/client/meson.build @@ -0,0 +1,116 @@ +cargs = ['-DG_LOG_DOMAIN="Cd"'] + +executable( + 'colormgr', + sources : [ + 'cd-util.c', + ], + include_directories : [ + colord_incdir, + lib_incdir, + root_incdir, + ], + dependencies : [ + gio, + lcms, + libm, + ], + link_with : colord, + c_args : [ + cargs, + ], + install : true, + install_dir : get_option('bindir') +) + +executable( + 'cd-fix-profile', + sources : [ + 'cd-fix-profile.c', + ], + include_directories : [ + colord_incdir, + lib_incdir, + root_incdir, + ], + dependencies : [ + gio, + lcms, + libm, + ], + link_with : colord, + c_args : [ + cargs, + ], + install : true, + install_dir : get_option('bindir') +) + +executable( + 'cd-iccdump', + sources : [ + 'cd-iccdump.c', + ], + include_directories : [ + colord_incdir, + lib_incdir, + root_incdir, + ], + dependencies : [ + gio, + lcms, + libm, + ], + link_with : colord, + c_args : [ + cargs, + ], + install : true, + install_dir : get_option('bindir') +) + +cd_idt8 = executable( + 'cd-it8', + sources : [ + 'cd-it8.c', + ], + include_directories : [ + colord_incdir, + lib_incdir, + root_incdir, + ], + dependencies : [ + gio, + lcms, + libm, + ], + link_with : colord, + c_args : [ + cargs, + ], + install : true, + install_dir : get_option('bindir') +) + +cd_create_profile = executable( + 'cd-create-profile', + sources : [ + 'cd-create-profile.c', + ], + include_directories : [ + colord_incdir, + lib_incdir, + root_incdir, + ], + dependencies : [ + gio, + lcms, + libm, + ], + link_with : colordprivate, + c_args : [ + cargs, + ], + install : true, + install_dir : get_option('bindir') +) diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 023e592..0000000 --- a/configure.ac +++ /dev/null @@ -1,454 +0,0 @@ -# Copyright (C) 2010 Richard Hughes <richard@hughsie.com> -AC_PREREQ(2.63) - -m4_define([cd_major_version], [1]) -m4_define([cd_minor_version], [3]) -m4_define([cd_micro_version], [6]) -m4_define([cd_version], - [cd_major_version.cd_minor_version.cd_micro_version]) - -AC_INIT([colord],[cd_version],[http://www.freedesktop.org/software/colord/]) -AC_CONFIG_SRCDIR(src) -AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz tar-ustar foreign]) -AC_CONFIG_HEADERS([config.h]) -AC_CONFIG_MACRO_DIR([m4]) -AC_PROG_LIBTOOL - -m4_ifdef([GOBJECT_INTROSPECTION_CHECK], [GOBJECT_INTROSPECTION_CHECK([0.9.8])]) -AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = xyes) -GLIB_GSETTINGS - -# set up gtk-doc -GTK_DOC_CHECK(1.9) - -# use this in cd-version.h -CD_MAJOR_VERSION=cd_major_version -CD_MINOR_VERSION=cd_minor_version -CD_MICRO_VERSION=cd_micro_version -AC_SUBST(VERSION) -AC_SUBST(CD_MAJOR_VERSION) -AC_SUBST(CD_MINOR_VERSION) -AC_SUBST(CD_MICRO_VERSION) - -# libtool versioning - this applies to libcolord -# -# See http://sources.redhat.com/autobook/autobook/autobook_91.html#SEC91 for details -# -# increment; -# CURRENT If the API or ABI interface has changed (reset REVISION to 0) -# REVISION If the API and ABI remains the same, but bugs are fixed. -# AGE Don't use. -LT_CURRENT=2 -LT_REVISION=5 -LT_AGE=0 -AC_SUBST(LT_CURRENT) -AC_SUBST(LT_REVISION) -AC_SUBST(LT_AGE) - -# enable nice build output on automake1.11 -m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) - -AS_ALL_LINGUAS -AC_PROG_CC_C99 -AC_PROG_INSTALL -LT_INIT -AM_PROG_CC_C_O -IT_PROG_INTLTOOL([0.35.0]) -AC_PATH_PROG(XSLTPROC, xsltproc) - -GNOME_COMPILE_WARNINGS([maximum],[ - -Wmissing-declarations - -Wcast-align - -Wwrite-strings - -Wreturn-type - -Wformat-nonliteral - -Wmissing-format-attribute - -Wclobbered - -Wempty-body - -Wignored-qualifiers - -Wsign-compare - -Wtype-limits - -Wuninitialized - -Waggregate-return - -Wdeclaration-after-statement - -Wshadow - -Wno-strict-aliasing - -Winline - -Wmissing-parameter-type - -Woverride-init - -Wno-discarded-qualifiers - -Wformat-signedness -]) - -dnl --------------------------------------------------------------------------- -dnl - gettext stuff -dnl --------------------------------------------------------------------------- -AM_GNU_GETTEXT_VERSION([0.17]) -AM_GNU_GETTEXT([external]) - -GETTEXT_PACKAGE=AC_PACKAGE_NAME -AC_SUBST(GETTEXT_PACKAGE) -AC_DEFINE(GETTEXT_PACKAGE, "AC_PACKAGE_NAME", [foo]) - -LT_LIB_M -AC_SUBST(LIBM) - -GLIB_GSETTINGS - -# check for PIE (position independent executable) support -if test x$with_pic != xno; then - AX_CHECK_COMPILE_FLAG([-fPIE], - [AX_CHECK_LINK_FLAG([-fPIE -pie], - [PIE_CFLAGS="-fPIE" PIE_LDFLAGS="-pie"])]) - AC_SUBST(PIE_CFLAGS) - AC_SUBST(PIE_LDFLAGS) -fi - -# check for full RELRO (relocation read-only) support -AX_CHECK_LINK_FLAG([-Wl,-z,relro,-z,now], - [RELRO_LDFLAGS="-Wl,-z,relro,-z,now"]) -AC_SUBST([RELRO_LDFLAGS]) - -dnl --------------------------------------------------------------------------- -dnl - Check headers and functions that may not exist on all platforms -dnl --------------------------------------------------------------------------- -AC_CHECK_HEADERS([pwd.h]) -AC_CHECK_HEADERS([syslog.h]) -AC_CHECK_FUNC(getuid, AC_DEFINE([HAVE_GETUID], [], [getuid() is available])) - -dnl --------------------------------------------------------------------------- -dnl - Check library dependencies -dnl --------------------------------------------------------------------------- -COLORD_REQUIRES_PRIVATE="lcms2" -PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.44.0 gobject-2.0 gthread-2.0 gio-2.0 >= 2.25.9 gmodule-2.0) - -dnl --------------------------------------------------------------------------- -dnl - Check Linux-specific dependencies -dnl --------------------------------------------------------------------------- -AC_CHECK_DEFINE([__unix__], enable_unix="yes", enable_unix="no") -if test x$enable_unix != xno; then - PKG_CHECK_MODULES(GLIB_UNIX, gio-unix-2.0) - CD_IT8="\$(top_builddir)/client/cd-it8" - CD_CREATE_PROFILE="\$(top_builddir)/client/cd-create-profile" -else - # look for a wine that can run our win32 and win64 client tools - case "$build_cpu" in - x86_64*) - AC_PATH_PROG(WINE, wine64, no);; - *) - AC_PATH_PROG(WINE, wine, no);; - esac - - # we don't have wine, so try to use the system tools instead - if test $WINE = no; then - AC_PATH_PROG(CD_IT8, [cd-it8], no) - if test $CD_IT8 = no; then - AC_MSG_ERROR([Non-UNIX build requires either wine or colord]) - fi - AC_PATH_PROG(CD_CREATE_PROFILE, [cd-create-profile], no) - if test $CD_CREATE_PROFILE = no; then - AC_MSG_ERROR([Non-UNIX build requires either wine or colord]) - fi - else - CD_IT8="$WINE \$(top_builddir)/client/cd-it8\$(EXEEXT)" - CD_CREATE_PROFILE="$WINE \$(top_builddir)/client/cd-create-profile\$(EXEEXT)" - fi -fi -AC_SUBST([CD_IT8]) -AC_SUBST([CD_CREATE_PROFILE]) - -# optional -AC_ARG_ENABLE(session_helper, AS_HELP_STRING([--enable-session-helper],[Enable Session Helper]), - enable_session_helper=$enableval, enable_session_helper=$enable_unix) -AM_CONDITIONAL(HAVE_SESSION_HELPER, test x$enable_session_helper = xyes) - -PKG_CHECK_MODULES(GUSB, gusb >= 0.2.7) -PKG_CHECK_MODULES(LCMS, lcms2 >= 2.6) - -PKG_CHECK_MODULES(SQLITE, sqlite3) - -dnl **** Check for UDEV **** -PKG_CHECK_MODULES(UDEV, libudev) -PKG_CHECK_MODULES(GUDEV, gudev-1.0) -COLORD_REQUIRES_PRIVATE+=", libudev" - -dnl **** Bash completion **** -AC_ARG_ENABLE(bash_completion, AS_HELP_STRING([--enable-bash-completion],[Enable bash completion]), - enable_bash_completion=$enableval, enable_bash_completion=yes) -if test x$enable_bash_completion != xno; then - PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0]) - BASH_COMPLETIONS_DIR="`pkg-config --variable=completionsdir bash-completion`" - AC_SUBST([BASH_COMPLETIONS_DIR]) -fi -AM_CONDITIONAL([HAVE_BASH_COMPLETION],[test "x$enable_bash_completion" = "xyes"]) - -dnl --------------------------------------------------------------------------- -dnl - Is docbook2man available? -dnl --------------------------------------------------------------------------- -AC_PATH_PROG(DOCBOOK2MAN, docbook2man, no) -if test "$DOCBOOK2MAN" = "no" ; then - AC_MSG_WARN([docbook2man not found, will not be able to build man documentation (if tarball, pre-generated documentation will be installed)]) -fi -AM_CONDITIONAL(HAVE_DOCBOOK2MAN, [test "$DOCBOOK2MAN" != "no"]) - -PKG_CHECK_MODULES(POLKIT, polkit-gobject-1 >= 0.103) -PKG_CHECK_EXISTS([polkit-gobject-1 >= 0.114], - [AC_DEFINE(POLKIT_HAS_AUTOPTR_MACROS, 1, [if PolKit has autoptr macros])], - []) - -dnl --------------------------------------------------------------------------- -dnl - Select whether and where to install systemd system service files -dnl --------------------------------------------------------------------------- - -AC_ARG_WITH([systemdsystemunitdir], - AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), - [], - [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) -if test "x$with_systemdsystemunitdir" != "xno"; then - AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) -fi - -dnl --------------------------------------------------------------------------- -dnl - Where to install tmpfiles.d snippet rules -dnl --------------------------------------------------------------------------- -AC_ARG_WITH([tmpfilesdir], - AS_HELP_STRING([--with-tmpfilesdir=DIR], [Directory for tmpfiles.d snippet files]), - [], - [with_tmpfilesdir=$($PKG_CONFIG --variable=tmpfilesdir systemd)]) -if test "x$with_tmpfilesdir" != "xno"; then - AC_SUBST([tmpfilesdir], [$with_tmpfilesdir]) -fi - -dnl **** Check if we should build libcolordcompat **** -AC_ARG_ENABLE(libcolordcompat, AS_HELP_STRING([--enable-libcolordcompat], - [Enable libcolordcompat.so which is used by ArgyllCMS]), - build_libcolordcompat=$enableval, build_libcolordcompat=no) -if test x$build_libcolordcompat != xno; then - AC_DEFINE(BUILD_LIBCOLORDCOMPAT,1,[Build libcolordcompat.so]) -fi -AM_CONDITIONAL(BUILD_LIBCOLORDCOMPAT, test x$build_libcolordcompat = xyes) - -dnl --------------------------------------------------------------------------- -dnl - Use systemd to track the process seat -dnl --------------------------------------------------------------------------- -AC_ARG_ENABLE(systemd, AS_HELP_STRING([--enable-systemd],[Build systemd seat-tracking support]), - enable_systemd=$enableval, enable_systemd=yes) -AM_CONDITIONAL(HAVE_SYSTEMD, test x$enable_systemd = xyes) -if test x$enable_systemd != xno; then - PKG_CHECK_MODULES(LIBSYSTEMD, - [libsystemd], - [LIBSYSTEMD_CFLAGS=$LIBSYSTEMD_CFLAGS; - LIBSYSTEMD_LIBS=$LIBSYSTEMD_LIBS], - [PKG_CHECK_MODULES(LIBSYSTEMD, - [libsystemd >= 44])]) - AC_DEFINE([HAVE_SYSTEMD], 1, [Define to 1 if systemd login is available]) -fi - -dnl --------------------------------------------------------------------------- -dnl - Where to install udev rules -dnl --------------------------------------------------------------------------- -AC_ARG_WITH([udevrulesdir], - AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules files]), - [], - [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)/rules.d]) -AC_SUBST([udevrulesdir], [$with_udevrulesdir]) - -dnl --------------------------------------------------------------------------- -dnl - Build ArgyllCMS sensor -dnl --------------------------------------------------------------------------- -AC_ARG_ENABLE(argyllcms-sensor, AS_HELP_STRING([--enable-argyllcms-sensor],[enable ArgllCMS sensor]), - enable_argyllcms_sensor=$enableval,enable_argyllcms_sensor=yes) -AM_CONDITIONAL(HAVE_ARGYLLCMS_SENSOR, test x$enable_argyllcms_sensor = xyes) -if test x$enable_argyllcms_sensor = xyes; then - AC_PATH_PROG(SPOTREAD, spotread, no) - if test "$SPOTREAD" = "no" ; then - AC_MSG_ERROR([argyllcms sensor requires spotread, not found]) - fi -fi - -dnl **** Check for SANE **** -AC_ARG_ENABLE(sane, AS_HELP_STRING([--enable-sane],[Enable SANE support]), - enable_sane=$enableval,enable_sane=no) -has_sane=no -if test x$enable_sane != xno; then - PKG_CHECK_MODULES(SANE, sane-backends, has_sane=yes, has_sane=no) - PKG_CHECK_MODULES(DBUS, dbus-1, have_dbus=yes, have_dbus=no) - if test $has_sane = "no"; then - # fall back to detecting the header for some distros - AC_CHECK_HEADER(sane/sane.h, has_sane=yes, has_sane=no) - if test $has_sane = "yes"; then - SANE_CFLAGS="" - SANE_LIBS="-lsane" - AC_SUBST(SANE_CFLAGS) - AC_SUBST(SANE_LIBS) - fi - if test x$enable_sane = xyes -a $has_sane = "no"; then - AC_MSG_ERROR([--enable-sane was specified and SANE was not found]) - fi - - fi - if test x$have_dbus != xyes; then - has_sane=no - if test x$enable_sane = xyes; then - AC_MSG_ERROR([--enable-sane was specified and SANE requires dbus support, not found]) - fi - AC_MSG_WARN([dbus not found, SANE support will not be enabled]) - fi -fi -AM_CONDITIONAL(HAVE_SANE, test x$has_sane = xyes) -if test x$has_sane = xyes; then - AC_DEFINE(HAVE_SANE,1,[Use SANE support for detecting scanners]) -fi - -# custom daemon user -AC_ARG_WITH( - [daemon_user], - AC_HELP_STRING([--with-daemon-user], - [User for running the colord daemon (root)]), - [daemon_user=$withval], - [daemon_user=root] -) -AC_SUBST(daemon_user) -AC_DEFINE_UNQUOTED([DAEMON_USER], ["$daemon_user"], [Daemon user]) - -dnl --------------------------------------------------------------------------- -dnl - Build VALA support -dnl --------------------------------------------------------------------------- -AC_ARG_ENABLE(vala, AS_HELP_STRING([--enable-vala],[build vala bindings]), - enable_vala=$enableval,enable_vala=no) -if test x$found_introspection != xno -a x$enable_vala != xno; then - AC_PATH_PROG([VAPIGEN], [vapigen], []) - if test "x$VAPIGEN" = "x"; then - has_vapigen="no" - AC_MSG_WARN([vapigen not found, will not build Vala binding]) - else - has_vapigen="yes" - fi -else - has_vapigen="no" - if test x$found_introspection = xno; then - AC_MSG_WARN([introspection not found, will not build Vala binding]) - fi -fi -AM_CONDITIONAL(HAVE_VAPIGEN, [test "x$has_vapigen" = "xyes"]) - -dnl --------------------------------------------------------------------------- -dnl - Build session helper example -dnl --------------------------------------------------------------------------- -AC_ARG_ENABLE(session-example, AS_HELP_STRING([--enable-session-example],[Enable session example]), - enable_session_example=$enableval, enable_session_example=no) -AM_CONDITIONAL(CD_BUILD_SESSION_EXAMPLE, test x$enable_session_example = xyes) -if test x$enable_session_example != xno; then - PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-3.0) - PKG_CHECK_MODULES(COLORD_GTK, colord-gtk >= 0.1.24) -fi - -dnl --------------------------------------------------------------------------- -dnl - Build extra print profiles (requires argyllcms) -dnl --------------------------------------------------------------------------- -AC_ARG_ENABLE(print-profiles, AS_HELP_STRING([--enable-print-profiles],[Build extra print profiles]), - enable_print_profiles=$enableval, enable_print_profiles=no) -AM_CONDITIONAL(CD_BUILD_PRINT_PROFILES, test x$enable_print_profiles = xyes) -if test x$enable_print_profiles != xno; then - AC_PATH_PROG(COLPROF, [colprof], false) - if test "$COLPROF" = "false"; then - AC_MSG_ERROR([colprof not found, please install argyllcms]) - fi - AC_DEFINE_UNQUOTED([TOOL_COLPROF], ["$COLPROF"], [Full path of colprof binary]) -fi - -AC_ARG_ENABLE(installed_tests, - AS_HELP_STRING([--enable-installed-tests], - [Install test programs (default: no)]),, - [enable_installed_tests=no]) -AM_CONDITIONAL(BUILDOPT_INSTALL_TESTS, test x$enable_installed_tests = xyes) - -# per-machine directory -AC_SUBST(CD_SYSTEM_PROFILES_DIR, "\$(localstatedir)/lib/colord/icc") - -# only include the colord.pc Requires.private of the libraries we actually use -AC_SUBST(COLORD_REQUIRES_PRIVATE) - -dnl --------------------------------------------------------------------------- -dnl - Makefiles, etc. -dnl --------------------------------------------------------------------------- -AC_CONFIG_FILES([ -Makefile -contrib/Makefile -contrib/session-helper/Makefile -contrib/colord-sane/Makefile -man/Makefile -doc/Makefile -doc/api/Makefile -doc/api/dbus/Makefile -doc/api/version.xml -data/Makefile -data/cmf/Makefile -data/illuminant/Makefile -data/figures/Makefile -data/profiles/Makefile -data/ref/Makefile -data/ti1/Makefile -data/org.freedesktop.ColorManager.conf -data/tests/Makefile -policy/Makefile -rules/Makefile -rules/69-cd-sensors.rules -po/Makefile.in -src/Makefile -src/plugins/Makefile -src/sensors/Makefile -src/sensors/argyll/Makefile -src/sensors/colorhug/Makefile -src/sensors/dtp94/Makefile -src/sensors/dummy/Makefile -src/sensors/huey/Makefile -src/sensors/munki/Makefile -src/sensors/spark/Makefile -client/Makefile -lib/Makefile -lib/colord/cd-version.h -lib/colord/colord.pc -lib/colord/Makefile -lib/colorhug/Makefile -lib/colorhug/colorhug.pc -lib/colorhug/ch-version.h -lib/compat/Makefile -]) -AC_OUTPUT - -dnl ========================================================================== -echo " - colord $VERSION - =================== - - prefix: ${prefix} - datadir: ${datadir} - compiler: ${CC} - cflags: ${CFLAGS} - cppflags: ${CPPFLAGS} - cd-it8: ${CD_IT8} - cd-create-profile: ${CD_CREATE_PROFILE} - gobject-introspection: ${found_introspection} - BASH completion support: ${enable_bash_completion} - SANE support: ${has_sane} - Extra print profiles: ${enable_print_profiles} - Install tests: ${enable_installed_tests} - ArgyllCMS sensor: ${enable_argyllcms_sensor} - Building libcolordcompat: ${build_libcolordcompat} - Vala API generator: ${has_vapigen} - Daemon user: ${daemon_user} - udev rules.d dir: ${with_udevrulesdir} - systemd support: ${enable_systemd} - systemd service dir: ${with_systemdsystemunitdir} - tmpfiles.d dir: ${with_tmpfilesdir} - Session helper support: ${enable_session_helper} - Unix support: ${enable_unix} -" - -# warn that using the default root user isn't always a good idea -if test x$daemon_user = xroot; then - echo "*******************************************************************" - echo "** RUNNING THIS AS root ISN'T A GOOD IDEA SEE --with-daemon-user **" - echo "*******************************************************************" -fi diff --git a/contrib/Makefile.am b/contrib/Makefile.am deleted file mode 100644 index 569e884..0000000 --- a/contrib/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -SUBDIRS = - -if HAVE_SESSION_HELPER -SUBDIRS += \ - session-helper -endif - -if HAVE_SANE -SUBDIRS += \ - colord-sane -endif - --include $(top_srcdir)/git.mk diff --git a/contrib/ci/Dockerfile-debian b/contrib/ci/Dockerfile-debian index 64f574c..1ef4015 100644 --- a/contrib/ci/Dockerfile-debian +++ b/contrib/ci/Dockerfile-debian @@ -1,9 +1,32 @@ -FROM debian:stretch +FROM debian:unstable -RUN echo "deb-src http://deb.debian.org/debian/ stretch main" >> /etc/apt/sources.list RUN apt-get update -qq -RUN apt-get build-dep -yq colord RUN apt-get install -yq --no-install-recommends \ - valgrind + bash-completion \ + docbook-utils \ + gettext \ + gobject-introspection \ + gtk-doc-tools \ + gvfs-bin \ + libdbus-glib-1-dev \ + libgirepository1.0-dev \ + libglib2.0-dev \ + libgudev-1.0-dev \ + libgusb-dev \ + liblcms2-dev \ + libpolkit-gobject-1-dev \ + libsane-dev \ + libsoup2.4-dev \ + libsqlite3-dev \ + libsystemd-dev \ + libtool-bin \ + libudev-dev \ + meson \ + pkg-config \ + policykit-1 \ + shared-mime-info \ + systemd \ + udev \ + valgrind RUN mkdir /build WORKDIR /build diff --git a/contrib/ci/Dockerfile-fedora b/contrib/ci/Dockerfile-fedora index cb2d21a..f9a8db1 100644 --- a/contrib/ci/Dockerfile-fedora +++ b/contrib/ci/Dockerfile-fedora @@ -1,9 +1,8 @@ -FROM fedora:25 +FROM fedora:26 RUN dnf -y update RUN dnf -y install \ argyllcms \ - autoconf-archive \ bash-completion \ color-filesystem \ dbus-devel \ @@ -12,16 +11,17 @@ RUN dnf -y install \ glib2-devel \ gobject-introspection-devel \ gtk-doc \ - intltool \ lcms2-devel \ libgudev1-devel \ libgusb-devel \ libtool \ + meson \ polkit-devel \ redhat-rpm-config \ sane-backends-devel \ sqlite-devel \ systemd-devel \ + systemd-udev \ vala-tools RUN mkdir /build diff --git a/contrib/ci/build_and_test.sh b/contrib/ci/build_and_test.sh index 9c2ac7a..c82ffe5 100755 --- a/contrib/ci/build_and_test.sh +++ b/contrib/ci/build_and_test.sh @@ -1,6 +1,15 @@ #!/bin/sh set -e - -./autogen.sh $@ -make -make install DEST=/tmp/install_root/ +export LC_ALL=C.UTF-8 +mkdir -p build && cd build +rm * -rf +meson .. \ + -Denable-vala=false \ + -Denable-print-profiles=false \ + -Denable-argyllcms-sensor=false \ + -Denable-sane=true \ + -Denable-libcolordcompat=true $@ +ninja -v || bash +ninja test -v +DESTDIR=/tmp/install-ninja ninja install +cd .. diff --git a/contrib/colord-sane/Makefile.am b/contrib/colord-sane/Makefile.am deleted file mode 100644 index 1397b8b..0000000 --- a/contrib/colord-sane/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -if HAVE_SANE - -AM_CPPFLAGS = \ - $(PIE_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(GUDEV_CFLAGS) \ - $(SANE_CFLAGS) \ - $(DBUS_CFLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/lib \ - -I$(top_srcdir)/lib/colord \ - -I$(top_builddir)/lib \ - -DG_LOG_DOMAIN=\"CdSane\" \ - -DLIBEXECDIR=\"$(libexecdir)\" \ - -DDATADIR=\"$(datadir)\" \ - -DVERSION="\"$(VERSION)\"" \ - -DCD_COMPILATION \ - -DG_UDEV_API_IS_SUBJECT_TO_CHANGE \ - -DLOCALEDIR=\""$(localedir)"\" - -COLORD_LIBS = \ - $(top_builddir)/lib/colord/libcolordprivate.la \ - $(top_builddir)/lib/colord/libcolord.la - -libexec_PROGRAMS = \ - colord-sane - -colord_sane_SOURCES = \ - cd-main.c - -colord_sane_LDADD = \ - $(COLORD_LIBS) \ - $(GUDEV_LIBS) \ - $(SANE_LIBS) \ - $(GLIB_LIBS) \ - $(DBUS_LIBS) - -colord_sane_LDFLAGS = \ - $(PIE_LDFLAGS) - -colord_sane_CFLAGS = \ - $(WARN_CFLAGS) - -DISTCLEANFILES = \ - $(dist_profile_DATA) - --include $(top_srcdir)/git.mk -endif diff --git a/contrib/colord-sane/meson.build b/contrib/colord-sane/meson.build new file mode 100644 index 0000000..9967302 --- /dev/null +++ b/contrib/colord-sane/meson.build @@ -0,0 +1,25 @@ +cargs = ['-DG_LOG_DOMAIN="Cd"'] + +executable( + 'colord-sane', + sources : [ + 'cd-main.c', + ], + include_directories : [ + colord_incdir, + lib_incdir, + root_incdir, + ], + dependencies : [ + dbus, + gio, + gudev, + sane, + ], + link_with : colord, + c_args : [ + cargs, + ], + install : true, + install_dir : get_option('libexecdir') +) diff --git a/contrib/colord.spec.in b/contrib/colord.spec.in index 0fbfc93..497eff7 100644 --- a/contrib/colord.spec.in +++ b/contrib/colord.spec.in @@ -29,7 +29,6 @@ BuildRequires: dbus-devel BuildRequires: docbook-utils BuildRequires: gettext BuildRequires: glib2-devel -BuildRequires: intltool BuildRequires: systemd-devel BuildRequires: lcms2-devel >= 2.6 BuildRequires: libgudev1-devel @@ -40,10 +39,11 @@ BuildRequires: vala-tools BuildRequires: libgusb-devel >= 0.2.2 BuildRequires: gtk-doc BuildRequires: color-filesystem +BuildRequires: meson %if !0%{?rhel} BuildRequires: bash-completion %endif -%if 0%{?build_print_profiles} +%if !0%{?rhel} BuildRequires: argyllcms %endif @@ -114,39 +114,30 @@ This may be useful for CMYK soft-proofing or for extra device support. # generating the print profile rather than trying to allocate a 3.1 GiB # chunk of RAM to put the entire B-to-A tables in. ulimit -Sv 2000000 -%configure \ - --with-daemon-user=colord \ - --enable-gtk-doc \ - --enable-vala \ + +%meson \ + -Denable-vala=false \ %if 0%{?build_print_profiles} - --enable-print-profiles \ + -Denable-print-profiles=true \ %else - --disable-print-profiles \ + -Denable-print-profiles=false \ %endif %if 0%{?enable_sane} - --enable-sane \ + -Denable-sane=true \ %endif %if 0%{?rhel} - --disable-bash-completion \ - --disable-argyllcms-sensor \ + -Denable-bash-completion=false \ + -Denable-argyllcms-sensor=false \ %endif %if !0%{?rhel} - --enable-libcolordcompat \ + -Denable-libcolordcompat=true \ %endif - --disable-static \ - --disable-rpath \ - --disable-examples \ - --disable-silent-rules \ - --disable-dependency-tracking + -Dwith-daemon-user=colord -make %{?_smp_mflags} +%meson_build %install -make install DESTDIR=$RPM_BUILD_ROOT - -# Remove static libs and libtool archives. -find %{buildroot} -name '*.la' -exec rm -f {} ';' -find %{buildroot} -name '*.a' -exec rm -f {} ';' +%meson_install # databases touch $RPM_BUILD_ROOT%{_localstatedir}/lib/colord/mapping.db @@ -182,7 +173,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %attr(755,colord,colord) %dir %{_localstatedir}/lib/colord/icc %{_bindir}/* %{_datadir}/glib-2.0/schemas/org.freedesktop.ColorHelper.gschema.xml -%{_sysconfdir}/dbus-1/system.d/org.freedesktop.ColorManager.conf +%{_datadir}/dbus-1/system.d/org.freedesktop.ColorManager.conf %{_datadir}/dbus-1/interfaces/org.freedesktop.ColorManager*.xml %{_datadir}/polkit-1/actions/org.freedesktop.color.policy %{_datadir}/dbus-1/system-services/org.freedesktop.ColorManager.service @@ -281,7 +272,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_libdir}/libcolorhug.so %{_libdir}/pkgconfig/*.pc %{_datadir}/gir-1.0/*.gir -%{_datadir}/vala/vapi/colord.vapi +#%{_datadir}/vala/vapi/colord.vapi %files devel-docs %dir %{_datadir}/gtk-doc/html/colord diff --git a/contrib/meson.build b/contrib/meson.build new file mode 100644 index 0000000..740bf14 --- /dev/null +++ b/contrib/meson.build @@ -0,0 +1,5 @@ +subdir('session-helper') + +if get_option('enable-sane') + subdir('colord-sane') +endif diff --git a/contrib/session-helper/Makefile.am b/contrib/session-helper/Makefile.am deleted file mode 100644 index 7fbdafa..0000000 --- a/contrib/session-helper/Makefile.am +++ /dev/null @@ -1,110 +0,0 @@ -introspectiondir = $(datadir)/dbus-1/interfaces -dist_introspection_DATA = \ - org.freedesktop.ColorHelper.xml - -AM_CPPFLAGS = \ - $(PIE_CFLAGS) \ - -I$(top_srcdir)/lib \ - $(COLORD_GTK_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(GNOME_DESKTOP_CFLAGS) \ - $(LCMS_CFLAGS) \ - -I$(top_srcdir)/client \ - -I$(top_builddir)/lib \ - -I$(top_srcdir)/lib/colord \ - -I$(top_builddir)/lib/colord \ - -I$(top_srcdir)/src \ - -DCD_COMPILATION \ - -DCD_DISABLE_DEPRECATED \ - -DG_LOG_DOMAIN=\"Cd\" \ - -DLIBEXECDIR=\"$(libexecdir)\" \ - -DLIBDIR=\"$(libdir)\" \ - -DDATADIR=\"$(datadir)\" \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DLOCALSTATEDIR=\""$(localstatedir)"\" \ - -DVERSION="\"$(VERSION)\"" - -COLORD_LIBS = \ - $(top_builddir)/lib/colord/libcolordprivate.la \ - $(top_builddir)/lib/colord/libcolord.la - -libcolord_includedir = $(includedir)/colord-1/colord-session -libcolord_include_HEADERS = \ - cd-session.h - -libexec_PROGRAMS = \ - colord-session - -colord_session_SOURCES = \ - cd-debug.c \ - cd-debug.h \ - cd-session.h \ - cd-state.c \ - cd-state.h \ - cd-main.c - -colord_session_LDADD = \ - $(COLORD_LIBS) \ - $(LCMS_LIBS) \ - $(GLIB_LIBS) \ - -lm - -colord_session_LDFLAGS = \ - $(PIE_LDFLAGS) - -colord_session_CFLAGS = \ - $(WARN_CFLAGS) - -dbusservicemaindir = $(datadir)/dbus-1/services -dbusservicemain_in_files = org.freedesktop.ColorHelper.service.in -dbusservicemain_DATA = $(dbusservicemain_in_files:.service.in=.service) -$(dbusservicemain_DATA): $(dbusservicemain_in_files) Makefile - @sed -e "s|\@servicedir\@|$(libexecdir)|" $< | \ - sed -e "s|\@daemon_user\@|$(daemon_user)|" > $@ - -systemduserdir = $(prefix)/lib/systemd/user -systemduser_in_files = colord-session.service.in -systemduser_DATA = $(systemduser_in_files:.service.in=.service) -$(systemduser_DATA): $(systemduser_in_files) Makefile - @sed -e "s|\@servicedir\@|$(libexecdir)|" $< > $@ - -if CD_BUILD_SESSION_EXAMPLE -noinst_PROGRAMS = \ - colord-session-example -colord_session_example_SOURCES = \ - cd-example.c -colord_session_example_LDADD = \ - $(COLORD_LIBS) \ - $(COLORD_GTK_LIBS) \ - $(GLIB_LIBS) \ - $(GNOME_DESKTOP_LIBS) \ - $(LCMS_LIBS) -lm -colord_session_example_CFLAGS = \ - $(WARN_CFLAGS) - -test: colord-session-example - ./colord-session-example \ - --device "xrandr-Lenovo Group Limited" \ - --sensor dummy \ - --title "This is a test profile" \ - --quality high \ - --whitepoint 0 - -endif - -@GSETTINGS_RULES@ -@INTLTOOL_XML_NOMERGE_RULE@ -gsettings_schemas_in_files = org.freedesktop.ColorHelper.gschema.xml.in -gsettings_SCHEMAS = $(gsettings_schemas_in_files:.gschema.xml.in=.gschema.xml) - -EXTRA_DIST = \ - $(gsettings_schemas_in_files) \ - $(systemduser_in_files) \ - $(dbusservicemain_in_files) - -DISTCLEANFILES = \ - $(dbusservicemain_DATA) \ - $(systemduser_DATA) \ - org.freedesktop.ColorHelper.gschema.xml - --include $(top_srcdir)/git.mk diff --git a/contrib/session-helper/meson.build b/contrib/session-helper/meson.build new file mode 100644 index 0000000..6b6bae0 --- /dev/null +++ b/contrib/session-helper/meson.build @@ -0,0 +1,90 @@ +cargs = ['-DG_LOG_DOMAIN="Cd"'] + +install_data('org.freedesktop.ColorHelper.xml', + install_dir : join_paths(get_option('datadir'), 'dbus-1', 'interfaces') +) + +install_headers( + 'cd-session.h', + subdir : 'colord-1/colord-session', +) + +con2 = configuration_data() +con2.set('servicedir', + join_paths(get_option('prefix'), + get_option('libexecdir'))) + +# replace @servicedir@ +configure_file( + input : 'colord-session.service.in', + output : 'colord-session.service', + configuration : con2, + install: true, + install_dir: systemd.get_pkgconfig_variable('systemduserunitdir'), +) + +# replace @servicedir@ +configure_file( + input : 'org.freedesktop.ColorHelper.service.in', + output : 'org.freedesktop.ColorHelper.service', + configuration : con2, + install: true, + install_dir: join_paths(get_option('datadir'), 'dbus-1', 'services') , +) + +executable( + 'colord-session', + sources : [ + 'cd-debug.c', + 'cd-debug.h', + 'cd-main.c', + 'cd-session.h', + 'cd-state.c', + 'cd-state.h', + ], + include_directories : [ + colord_incdir, + lib_incdir, + root_incdir, + ], + dependencies : [ + gio, + lcms, + libm, + ], + link_with : colord, + c_args : [ + cargs, + ], + install : true, + install_dir : get_option('libexecdir') +) + +install_data('org.freedesktop.ColorHelper.gschema.xml', + install_dir : 'share/glib-2.0/schemas') + +if get_option('enable-session-example') + executable( + 'colord-session-example', + sources : [ + 'cd-example.c', + ], + include_directories : [ + root_incdir, + colord_incdir, + lib_incdir, + root_incdir, + ], + dependencies : [ + gio, + lcms, + libm, + colord_gtk, + gnome_desktop, + ], + link_with : colord, + c_args : [ + cargs, + ], + ) +endif diff --git a/contrib/session-helper/org.freedesktop.ColorHelper.gschema.xml.in b/contrib/session-helper/org.freedesktop.ColorHelper.gschema.xml index 092df7e..8d0ab60 100644 --- a/contrib/session-helper/org.freedesktop.ColorHelper.gschema.xml.in +++ b/contrib/session-helper/org.freedesktop.ColorHelper.gschema.xml @@ -2,38 +2,38 @@ <schema id="org.freedesktop.ColorHelper" path="/org/freedesktop/color-helper/"> <key name="display-gamma" type="d"> <default>2.4</default> - <_summary>Default gamma for the display</_summary> - <_description> + <summary>Default gamma for the display</summary> + <description> The default target gamma value for the display. Common values are 1.8, 2.2 and 2.4. - </_description> + </description> </key> <key name="display-whitepoint" type="i"> <default>6500</default> - <_summary>Default display target whitepoint</_summary> - <_description> + <summary>Default display target whitepoint</summary> + <description> The default target whitepoint in Kelvin for display calibration, with 0 meaning display native. Common values are 6500 for D65 and 5000 for D50. - </_description> + </description> </key> <key name="sample-delay" type="i"> <default>400</default> - <_summary>Delay between sample intervals</_summary> - <_description> + <summary>Delay between sample intervals</summary> + <description> This is the delay between setting the sample color and asking the measuring instrument to take a sample. It is required because both the graphics driver and the display itself introduce latency. - </_description> + </description> </key> <key name="profile-upload-uri" type="s"> <default>'http://www.hughski.com/profile-store.php'</default> - <_summary>Web service profile upload URI</_summary> - <_description> + <summary>Web service profile upload URI</summary> + <description> The URI of the web service that allows the calibration tools to upload a specific profile to the Internet. - </_description> + </description> </key> </schema> </schemalist> diff --git a/data/Makefile.am b/data/Makefile.am deleted file mode 100644 index 6e76701..0000000 --- a/data/Makefile.am +++ /dev/null @@ -1,53 +0,0 @@ - -SUBDIRS = \ - cmf \ - illuminant \ - profiles \ - figures \ - ref \ - tests \ - ti1 - -dbusdir = $(sysconfdir)/dbus-1/system.d -dist_dbus_DATA = org.freedesktop.ColorManager.conf - -dbusservicemaindir = $(datadir)/dbus-1/system-services -dbusservicemain_in_files = org.freedesktop.ColorManager.service.in -dbusservicemain_DATA = $(dbusservicemain_in_files:.service.in=.service) -$(dbusservicemain_DATA): $(dbusservicemain_in_files) Makefile - @sed -e "s|\@servicedir\@|$(libexecdir)|" $< | \ - sed -e "s|\@daemon_user\@|$(daemon_user)|" > $@ - -systemdservicemain_in_files = colord.service.in - -dist_tmpfiles_DATA = colord.conf - -if HAVE_SYSTEMD -systemdservicemaindir = $(systemdsystemunitdir) -systemdservicemain_DATA = $(systemdservicemain_in_files:.service.in=.service) -$(systemdservicemain_DATA): $(systemdservicemain_in_files) Makefile - @sed -e "s|\@servicedir\@|$(libexecdir)|" $< | \ - sed -e "s|\@daemon_user\@|$(daemon_user)|" > $@ -endif - -EXTRA_DIST = \ - $(dbusservicemain_in_files) \ - org.freedesktop.ColorManager.conf.in - -if HAVE_SYSTEMD -EXTRA_DIST += $(systemdservicemain_in_files) -endif - -if HAVE_BASH_COMPLETION -bashcompletiondir = $(BASH_COMPLETIONS_DIR) -dist_bashcompletion_DATA = colormgr -endif - -CLEANFILES = \ - $(dist_profile_DATA) - -DISTCLEANFILES = \ - $(dbusservicemain_DATA) \ - $(systemdservicemain_DATA) - --include $(top_srcdir)/git.mk diff --git a/data/cmf/Makefile.am b/data/cmf/Makefile.am deleted file mode 100644 index e7feb92..0000000 --- a/data/cmf/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -.NOTPARALLEL: - -generated = \ - CIE1931-2deg-XYZ.cmf \ - CIE1964-10deg-XYZ.cmf - -cmfdir = $(datadir)/colord/cmf -cmf_DATA = \ - $(generated) - -noinst_DATA = \ - CIE1931-2deg-XYZ.csv \ - CIE1964-10deg-XYZ.csv - -CIE1931-2deg-XYZ.cmf: CIE1931-2deg-XYZ.csv - $(AM_V_GEN) \ - $(CD_IT8) create-cmf $@ \ - $(srcdir)/CIE1931-2deg-XYZ.csv 1.0 - -CIE1964-10deg-XYZ.cmf: CIE1964-10deg-XYZ.csv - $(AM_V_GEN) \ - $(CD_IT8) create-cmf $@ \ - $(srcdir)/CIE1964-10deg-XYZ.csv 1.0 - -CLEANFILES = \ - $(generated) - -EXTRA_DIST = \ - $(noinst_DATA) - --include $(top_srcdir)/git.mk diff --git a/data/cmf/meson.build b/data/cmf/meson.build new file mode 100644 index 0000000..802d974 --- /dev/null +++ b/data/cmf/meson.build @@ -0,0 +1,9 @@ +foreach arg: [ 'CIE1964-10deg-XYZ', 'CIE1931-2deg-XYZ' ] + custom_target(arg, + input: arg + '.csv', + output: arg + '.cmf', + command: [ cd_idt8, 'create-cmf', '@OUTPUT@', '@INPUT@', '1.0' ], + install: true, + install_dir: join_paths(get_option('datadir'), 'colord', 'cmf') + ) +endforeach diff --git a/data/figures/Makefile.am b/data/figures/Makefile.am deleted file mode 100644 index 588f61e..0000000 --- a/data/figures/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -iconsdir = $(datadir)/colord/icons -icons_DATA = \ - colorhug-attach.svg \ - colorhug2-attach.svg \ - dtp94-attach.svg \ - hcfr-attach.svg \ - huey-attach.svg \ - i1-display3-attach.svg \ - i1-monitor-attach.svg \ - i1-pro-attach.svg \ - color-munki-smile-attach.svg \ - color-munki-photo-ambient.svg \ - color-munki-photo-attach.svg \ - color-munki-photo-calibrate.svg \ - color-munki-photo-projector.svg \ - color-munki-photo-screen.svg \ - spyder2-attach.svg \ - spyder3-attach.svg \ - spyder4-attach.svg \ - spyder5-attach.svg - -EXTRA_DIST = \ - $(icons_DATA) - --include $(top_srcdir)/git.mk diff --git a/data/figures/meson.build b/data/figures/meson.build new file mode 100644 index 0000000..87297ce --- /dev/null +++ b/data/figures/meson.build @@ -0,0 +1,22 @@ +install_data([ + 'colorhug2-attach.svg', + 'colorhug-attach.svg', + 'color-munki-photo-ambient.svg', + 'color-munki-photo-attach.svg', + 'color-munki-photo-calibrate.svg', + 'color-munki-photo-projector.svg', + 'color-munki-photo-screen.svg', + 'color-munki-smile-attach.svg', + 'dtp94-attach.svg', + 'hcfr-attach.svg', + 'huey-attach.svg', + 'i1-display3-attach.svg', + 'i1-monitor-attach.svg', + 'i1-pro-attach.svg', + 'spyder2-attach.svg', + 'spyder3-attach.svg', + 'spyder4-attach.svg', + 'spyder5-attach.svg', + ], + install_dir: join_paths(get_option('datadir'), 'colord', 'icons') +) diff --git a/data/illuminant/Makefile.am b/data/illuminant/Makefile.am deleted file mode 100644 index f9f7a9b..0000000 --- a/data/illuminant/Makefile.am +++ /dev/null @@ -1,118 +0,0 @@ -.NOTPARALLEL: - -generated = \ - CIE-A.sp \ - CIE-B.sp \ - CIE-C.sp \ - CIE-D50.sp \ - CIE-D55.sp \ - CIE-D65.sp \ - CIE-D93.sp \ - CIE-E.sp \ - CIE-F10.sp \ - CIE-F11.sp \ - CIE-F12.sp \ - CIE-F1.sp \ - CIE-F2.sp \ - CIE-F3.sp \ - CIE-F4.sp \ - CIE-F5.sp \ - CIE-F6.sp \ - CIE-F7.sp \ - CIE-F8.sp \ - CIE-F9.sp - -illuminantdir = $(datadir)/colord/illuminant -illuminant_DATA = \ - $(generated) - -noinst_DATA = \ - CIE-A.csv \ - CIE-B.csv \ - CIE-C.csv \ - CIE-D50.csv \ - CIE-D55.csv \ - CIE-D65.csv \ - CIE-D93.csv \ - CIE-E.csv \ - CIE-F10.csv \ - CIE-F11.csv \ - CIE-F12.csv \ - CIE-F1.csv \ - CIE-F2.csv \ - CIE-F3.csv \ - CIE-F4.csv \ - CIE-F5.csv \ - CIE-F6.csv \ - CIE-F7.csv \ - CIE-F8.csv \ - CIE-F9.csv - -CIE-A.sp: CIE-A.csv - $(AM_V_GEN) $(CD_IT8) create-sp $@ \ - $(srcdir)/CIE-A.csv 100.0 -CIE-B.sp: CIE-B.csv - $(AM_V_GEN) $(CD_IT8) create-sp $@ \ - $(srcdir)/CIE-B.csv 100.0 -CIE-C.sp: CIE-C.csv - $(AM_V_GEN) $(CD_IT8) create-sp $@ \ - $(srcdir)/CIE-C.csv 100.0 -CIE-D50.sp: CIE-D50.csv - $(AM_V_GEN) $(CD_IT8) create-sp $@ \ - $(srcdir)/CIE-D50.csv 100.0 -CIE-D55.sp: CIE-D55.csv - $(AM_V_GEN) $(CD_IT8) create-sp $@ \ - $(srcdir)/CIE-D55.csv 100.0 -CIE-D65.sp: CIE-D65.csv - $(AM_V_GEN) $(CD_IT8) create-sp $@ \ - $(srcdir)/CIE-D65.csv 100.0 -CIE-D93.sp: CIE-D93.csv - $(AM_V_GEN) $(CD_IT8) create-sp $@ \ - $(srcdir)/CIE-D93.csv 100.0 -CIE-E.sp: CIE-E.csv - $(AM_V_GEN) $(CD_IT8) create-sp $@ \ - $(srcdir)/CIE-E.csv 100.0 -CIE-F10.sp: CIE-F10.csv - $(AM_V_GEN) $(CD_IT8) create-sp $@ \ - $(srcdir)/CIE-F10.csv 100.0 -CIE-F11.sp: CIE-F11.csv - $(AM_V_GEN) $(CD_IT8) create-sp $@ \ - $(srcdir)/CIE-F11.csv 100.0 -CIE-F12.sp: CIE-F12.csv - $(AM_V_GEN) $(CD_IT8) create-sp $@ \ - $(srcdir)/CIE-F12.csv 100.0 -CIE-F1.sp: CIE-F1.csv - $(AM_V_GEN) $(CD_IT8) create-sp $@ \ - $(srcdir)/CIE-F1.csv 100.0 -CIE-F2.sp: CIE-F2.csv - $(AM_V_GEN) $(CD_IT8) create-sp $@ \ - $(srcdir)/CIE-F2.csv 100.0 -CIE-F3.sp: CIE-F3.csv - $(AM_V_GEN) $(CD_IT8) create-sp $@ \ - $(srcdir)/CIE-F3.csv 100.0 -CIE-F4.sp: CIE-F4.csv - $(AM_V_GEN) $(CD_IT8) create-sp $@ \ - $(srcdir)/CIE-F4.csv 100.0 -CIE-F5.sp: CIE-F5.csv - $(AM_V_GEN) $(CD_IT8) create-sp $@ \ - $(srcdir)/CIE-F5.csv 100.0 -CIE-F6.sp: CIE-F6.csv - $(AM_V_GEN) $(CD_IT8) create-sp $@ \ - $(srcdir)/CIE-F6.csv 100.0 -CIE-F7.sp: CIE-F7.csv - $(AM_V_GEN) $(CD_IT8) create-sp $@ \ - $(srcdir)/CIE-F7.csv 100.0 -CIE-F8.sp: CIE-F8.csv - $(AM_V_GEN) $(CD_IT8) create-sp $@ \ - $(srcdir)/CIE-F8.csv 100.0 -CIE-F9.sp: CIE-F9.csv - $(AM_V_GEN) $(CD_IT8) create-sp $@ \ - $(srcdir)/CIE-F9.csv 100.0 - -CLEANFILES = \ - $(generated) - -EXTRA_DIST = \ - $(noinst_DATA) - --include $(top_srcdir)/git.mk diff --git a/data/illuminant/meson.build b/data/illuminant/meson.build new file mode 100644 index 0000000..5d1fa6b --- /dev/null +++ b/data/illuminant/meson.build @@ -0,0 +1,31 @@ +generated_spectra = [ + 'CIE-A', + 'CIE-B', + 'CIE-C', + 'CIE-D50', + 'CIE-D55', + 'CIE-D65', + 'CIE-D93', + 'CIE-E', + 'CIE-F10', + 'CIE-F11', + 'CIE-F12', + 'CIE-F1', + 'CIE-F2', + 'CIE-F3', + 'CIE-F4', + 'CIE-F5', + 'CIE-F6', + 'CIE-F7', + 'CIE-F8', + 'CIE-F9', +] +foreach arg: generated_spectra + custom_target(arg, + input: arg + '.csv', + output: arg + '.sp', + command: [ cd_idt8, 'create-sp', '@OUTPUT@', '@INPUT@', '100.0' ], + install: true, + install_dir: join_paths(get_option('datadir'), 'colord', 'illuminant') + ) +endforeach diff --git a/data/meson.build b/data/meson.build new file mode 100644 index 0000000..86957b2 --- /dev/null +++ b/data/meson.build @@ -0,0 +1,50 @@ +subdir('cmf') +subdir('figures') +subdir('illuminant') +subdir('profiles') +subdir('ref') +subdir('tests') +subdir('ti1') + +install_data('colord.conf', + install_dir: systemd.get_pkgconfig_variable('tmpfilesdir') +) + +if get_option('enable-bash-completion') + install_data('colormgr', + install_dir: bash_completion.get_pkgconfig_variable('completionsdir') + ) +endif + +con2 = configuration_data() +con2.set('servicedir', + join_paths(get_option('prefix'), + get_option('libexecdir'))) +con2.set('daemon_user', get_option('with-daemon-user')) + +# replace @servicedir@ and @daemon_user@ +configure_file( + input : 'colord.service.in', + output : 'colord.service', + configuration : con2, + install: true, + install_dir: systemd.get_pkgconfig_variable('systemdsystemunitdir'), +) + +# replace @servicedir@ and @daemon_user@ +configure_file( + input : 'org.freedesktop.ColorManager.service.in', + output : 'org.freedesktop.ColorManager.service', + configuration : con2, + install: true, + install_dir: join_paths(get_option('datadir'), 'dbus-1', 'system-services') , +) + +# replace @daemon_user@ +configure_file( + input : 'org.freedesktop.ColorManager.conf.in', + output : 'org.freedesktop.ColorManager.conf', + configuration : con2, + install: true, + install_dir: join_paths(get_option('datadir'), 'dbus-1', 'system.d') , +) diff --git a/data/profiles/AdobeRGB1998.xml.in b/data/profiles/AdobeRGB1998.iccprofile.xml index e140fa9..8f8354e 100644 --- a/data/profiles/AdobeRGB1998.xml.in +++ b/data/profiles/AdobeRGB1998.iccprofile.xml @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="UTF-8" ?> <profile> <name>AdobeRGB1998</name> - <_description>Compatible with Adobe RGB (1998)</_description> - <_copyright>This profile is free of known copyright restrictions</_copyright> + <description>Compatible with Adobe RGB (1998)</description> + <copyright>This profile is free of known copyright restrictions</copyright> <!-- TRANSLATORS: a editing space is a profile you use for editing, 'SWOP' is also a trademark so don't translate that --> - <_model> + <model> This editing space was designed as SMPTE-240M and encompasses most of the possible colors available on a CMYK color printer. This is a popular choice for editing photographs and for use in printing, as all the SWOP colors can be reproduced. - </_model> + </model> <license>CC0</license> <data_source>standard</data_source> <standard_space>adobe-rgb</standard_space> diff --git a/data/profiles/AppleRGB.xml.in b/data/profiles/AppleRGB.iccprofile.xml index f039cc8..f4119fb 100644 --- a/data/profiles/AppleRGB.xml.in +++ b/data/profiles/AppleRGB.iccprofile.xml @@ -2,17 +2,17 @@ <profile> <name>AppleRGB</name> <description>Apple RGB</description> - <_copyright>This profile is free of known copyright restrictions</_copyright> + <copyright>This profile is free of known copyright restrictions</copyright> <!-- TRANSLATORS: 'Adobe', 'Photoshop', 'Apple' and 'Illustrator' are trademarks, don't translate those --> - <_model> + <model> This legacy profile was originally created by Adobe for use with Photoshop and Illustrator. As it is based on the original Apple 13" RGB monitor and is similar to sRGB, it should not be used as a display profile or for new images. - </_model> + </model> <license>CC0</license> <data_source>standard</data_source> <standard_space>apple-rgb</standard_space> diff --git a/data/profiles/BestRGB.xml.in b/data/profiles/BestRGB.iccprofile.xml index 0094745..d69adeb 100644 --- a/data/profiles/BestRGB.xml.in +++ b/data/profiles/BestRGB.iccprofile.xml @@ -2,17 +2,17 @@ <profile> <name>BestRGB</name> <description>Best RGB</description> - <_copyright>This profile is free of known copyright restrictions</_copyright> + <copyright>This profile is free of known copyright restrictions</copyright> <!-- TRANSLATORS: super-saturated is in reference to colors you can't show on a PC screen --> - <_model> + <model> This editing space can display more saturated colors than Adobe RGB and is suitable for images with highly saturated colors often used in advertisements. It is very similar to DonRGB4, but can show super-saturated red colors sometimes present in Fujichrome Velvia. - </_model> + </model> <license>CC0</license> <data_source>standard</data_source> <standard_space>best-rgb</standard_space> diff --git a/data/profiles/BetaRGB.xml.in b/data/profiles/BetaRGB.iccprofile.xml index 7bfcc2b..a2d105b 100644 --- a/data/profiles/BetaRGB.xml.in +++ b/data/profiles/BetaRGB.iccprofile.xml @@ -2,14 +2,14 @@ <profile> <name>BetaRGB</name> <description>Beta RGB</description> - <_copyright>This profile is free of known copyright restrictions</_copyright> + <copyright>This profile is free of known copyright restrictions</copyright> <!-- TRANSLATORS: 'shadow detail' is the number of black colors you can see --> - <_model> + <model> This editing space can display more saturated colors than Adobe RGB. It is less prone to quantisation errors compared to ProPhoto RGB, although more shadow detail is preserved. In most instances ProPhoto RGB is probably a better choice. - </_model> + </model> <license>CC0</license> <data_source>standard</data_source> <standard_space>beta-rgb</standard_space> diff --git a/data/profiles/Bluish.xml.in b/data/profiles/Bluish.iccprofile.xml index e0db821..b4924d8 100644 --- a/data/profiles/Bluish.xml.in +++ b/data/profiles/Bluish.iccprofile.xml @@ -2,14 +2,14 @@ <profile> <name>bluish</name> <type>x11-gamma</type> - <_description>Blue</_description> - <_copyright>This profile is free of known copyright restrictions</_copyright> + <description>Blue</description> + <copyright>This profile is free of known copyright restrictions</copyright> <!-- TRANSLATORS: the lookup tables in the GPU map one color to another --> - <_model> + <model> This test profile is used to make all colors on the screen slightly more blue by altering the video card lookup table. This allows the user to check the calibration is being applied correctly. - </_model> + </model> <license>CC0</license> <data_source>test</data_source> <x11_gamma> diff --git a/data/profiles/BruceRGB.xml.in b/data/profiles/BruceRGB.iccprofile.xml index f8f2ebd..005edb9 100644 --- a/data/profiles/BruceRGB.xml.in +++ b/data/profiles/BruceRGB.iccprofile.xml @@ -2,13 +2,13 @@ <profile> <name>BruceRGB</name> <description>Bruce RGB</description> - <_copyright>This profile is free of known copyright restrictions</_copyright> + <copyright>This profile is free of known copyright restrictions</copyright> <!-- TRANSLATORS: 'Adobe Photoshop' is a trademark, don't translate --> - <_model> + <model> This is an RGB editing space for use with Adobe Photoshop 5.0 and later. It was designed as an output-centric compromise between ColorMatch RGB and Adobe RGB and used to be preferred by some photograph printing services. - </_model> + </model> <license>CC0</license> <data_source>standard</data_source> <standard_space>bruce-rgb</standard_space> diff --git a/data/profiles/CIE-RGB.xml.in b/data/profiles/CIE-RGB.iccprofile.xml index 027f7b4..acd83e0 100644 --- a/data/profiles/CIE-RGB.xml.in +++ b/data/profiles/CIE-RGB.iccprofile.xml @@ -2,12 +2,12 @@ <profile> <name>CIE-RGB</name> <description>CIE RGB</description> - <_copyright>This profile is free of known copyright restrictions</_copyright> + <copyright>This profile is free of known copyright restrictions</copyright> <!-- TRANSLATORS: theoretical in that the profile primaries are not real colors --> - <_model> + <model> This theoretical profile is designed for use in color experiments. You probably don't want to use this profile as a editing space or a display profile. - </_model> + </model> <license>CC0</license> <data_source>standard</data_source> <standard_space>cie-rgb</standard_space> diff --git a/data/profiles/ColorMatchRGB.xml.in b/data/profiles/ColorMatchRGB.iccprofile.xml index d097fee..990fa03 100644 --- a/data/profiles/ColorMatchRGB.xml.in +++ b/data/profiles/ColorMatchRGB.iccprofile.xml @@ -2,15 +2,15 @@ <profile> <name>ColorMatchRGB</name> <description>ColorMatch RGB</description> - <_copyright>This profile is free of known copyright restrictions</_copyright> + <copyright>This profile is free of known copyright restrictions</copyright> <!-- TRANSLATORS: 'Radius' and 'PressView' are trademarks, please don't translate --> - <_model> + <model> This profile was designed by Radius for the PressView monitor. Only use this profile as a display profile or as a editing space as the profile is not significantly different to sRGB. You should only need to use this profile if viewing images created on a PressView monitor. - </_model> + </model> <license>CC0</license> <data_source>standard</data_source> <standard_space>colormatch-rgb</standard_space> diff --git a/data/profiles/Crayons.xml.in b/data/profiles/Crayons.iccprofile.xml index 5b807c4..7f0c9b6 100644 --- a/data/profiles/Crayons.xml.in +++ b/data/profiles/Crayons.iccprofile.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8" ?> <profile> <name>Crayons</name> - <_description>Crayon Colors</_description> - <_copyright>This profile is free of known copyright restrictions</_copyright> + <description>Crayon Colors</description> + <copyright>This profile is free of known copyright restrictions</copyright> <!-- TRANSLATORS: 'Crayola' is a trademark, please don't translate, also 'named colors' are color swatches with a name, e.g. 'Royal Rose' --> - <_model> + <model> This named color profile contains all the Crayola crayon colors in popular use. It is a test profile designed for testing embedding named colors into documents. - </_model> + </model> <license>CC0</license> <named> <color> diff --git a/data/profiles/DonRGB4.xml.in b/data/profiles/DonRGB4.iccprofile.xml index 65b7ce5..2ef2740 100644 --- a/data/profiles/DonRGB4.xml.in +++ b/data/profiles/DonRGB4.iccprofile.xml @@ -2,12 +2,12 @@ <profile> <name>DonRGB4</name> <description>Don RGB 4</description> - <_copyright>This profile is free of known copyright restrictions</_copyright> + <copyright>This profile is free of known copyright restrictions</copyright> <!-- TRANSLATORS: saturated means vivid bright colors --> - <_model> + <model> This editing space can display more saturated colors than Adobe RGB and is suitable for images with highly saturated colors often used in advertisements. - </_model> + </model> <license>CC0</license> <data_source>standard</data_source> <standard_space>don-rgb4</standard_space> diff --git a/data/profiles/ECI-RGBv1.xml.in b/data/profiles/ECI-RGBv1.iccprofile.xml index 0693ee6..543e98e 100644 --- a/data/profiles/ECI-RGBv1.xml.in +++ b/data/profiles/ECI-RGBv1.iccprofile.xml @@ -2,15 +2,15 @@ <profile> <name>ECI-RGBv1</name> <description>eciRGB v1</description> - <_copyright>This profile is free of known copyright restrictions</_copyright> + <copyright>This profile is free of known copyright restrictions</copyright> <!-- TRANSLATORS: ECI is a trademark, don't translate --> - <_model> + <model> This profile is recommended by the ECI (European Color Initiative) as a editing space for professional image editing and aims to cover all colors that can be printed on printing presses. This is sometimes used as a color data exchange format between publishers and printing houses. - </_model> + </model> <license>CC0</license> <data_source>standard</data_source> <standard_space>eci-rgb-v1</standard_space> diff --git a/data/profiles/ECI-RGBv2.xml.in b/data/profiles/ECI-RGBv2.iccprofile.xml index 4343621..419ce95 100644 --- a/data/profiles/ECI-RGBv2.xml.in +++ b/data/profiles/ECI-RGBv2.iccprofile.xml @@ -2,14 +2,14 @@ <profile> <name>ECI-RGBv2</name> <description>eciRGB v2</description> - <_copyright>This profile is free of known copyright restrictions</_copyright> + <copyright>This profile is free of known copyright restrictions</copyright> <!-- TRANSLATORS: lightness is a technical word for brightness --> - <_model> + <model> This profile was designed with a lightness gamma curve which means the monitor will have to be also calibrated in the same way. This profile is only useful for advanced users and is not recommended for general use. - </_model> + </model> <license>CC0</license> <data_source>standard</data_source> <standard_space>eci-rgb-v2</standard_space> diff --git a/data/profiles/EktaSpacePS5.xml.in b/data/profiles/EktaSpacePS5.iccprofile.xml index 0db36e3..c7f6d3b 100644 --- a/data/profiles/EktaSpacePS5.xml.in +++ b/data/profiles/EktaSpacePS5.iccprofile.xml @@ -2,13 +2,13 @@ <profile> <name>EktaSpacePS5</name> <description>Ekta Space PS5</description> - <_copyright>This profile is free of known copyright restrictions</_copyright> + <copyright>This profile is free of known copyright restrictions</copyright> <!-- TRANSLATORS: negatives refers to the film on which a negative image is stored --> - <_model> + <model> This profile was designed for storing archives of scanned transparency film. It is suitable for storing images from color negatives, although nowadays ProPhoto RGB is a more popular profile for archival. - </_model> + </model> <license>CC0</license> <data_source>standard</data_source> <standard_space>ekta-space-ps5</standard_space> diff --git a/data/profiles/FOGRA27L_coated.xml.in b/data/profiles/FOGRA27L_coated.iccprofile.xml index 224c04d..ee5aec1 100644 --- a/data/profiles/FOGRA27L_coated.xml.in +++ b/data/profiles/FOGRA27L_coated.iccprofile.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8" ?> <profile> - <_description>FOGRA27L Coated</_description> - <_copyright>This profile is free of known copyright restrictions</_copyright> + <description>FOGRA27L Coated</description> + <copyright>This profile is free of known copyright restrictions</copyright> <!-- TRANSLATORS: positive as in not a negative image of what's printed --> - <_model> + <model> This profile is used for positive plate making, printing on paper types 1 and 2 (coated or matte), sheetfed offset. This profile set should no longer be used for production, use FOGRA39L instead. - </_model> + </model> <manufacturer>ArgyllCMS</manufacturer> <license>CC0</license> <data_source>standard</data_source> diff --git a/data/profiles/FOGRA28L_webcoated.xml.in b/data/profiles/FOGRA28L_webcoated.iccprofile.xml index 3624364..21f62ef 100644 --- a/data/profiles/FOGRA28L_webcoated.xml.in +++ b/data/profiles/FOGRA28L_webcoated.iccprofile.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8" ?> <profile> - <_description>FOGRA28L Web Coated</_description> - <_copyright>This profile is free of known copyright restrictions</_copyright> + <description>FOGRA28L Web Coated</description> + <copyright>This profile is free of known copyright restrictions</copyright> <!-- TRANSLATORS: paper grade 3 is just a description meaning "not very white", LCW stands for Light Weight Coated --> - <_model> + <model> This profile is used for positive plate making, printing on paper type 3 (LWC), webfed offset. This profile should no longer be used for production, use FOGRA45 instead. - </_model> + </model> <manufacturer>ArgyllCMS</manufacturer> <license>CC0</license> <data_source>standard</data_source> diff --git a/data/profiles/FOGRA29L_uncoated.xml.in b/data/profiles/FOGRA29L_uncoated.iccprofile.xml index f3c7b32..cb8fa45 100644 --- a/data/profiles/FOGRA29L_uncoated.xml.in +++ b/data/profiles/FOGRA29L_uncoated.iccprofile.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8" ?> <profile> - <_description>FOGRA29L Uncoated</_description> - <_copyright>This profile is free of known copyright restrictions</_copyright> + <description>FOGRA29L Uncoated</description> + <copyright>This profile is free of known copyright restrictions</copyright> <!-- TRANSLATORS: yellowish is in reference to the paper color, i.e. not pure white --> - <_model> + <model> This profile is used for positive plate making, printing on paper type 4 (uncoated white), sheetfed offset. This profile should no longer be used for production, use FOGRA47 instead. - </_model> + </model> <manufacturer>ArgyllCMS</manufacturer> <license>CC0</license> <data_source>standard</data_source> diff --git a/data/profiles/FOGRA30L_uncoated_yellowish.xml.in b/data/profiles/FOGRA30L_uncoated_yellowish.iccprofile.xml index fc3ab8a..cd6f3e6 100644 --- a/data/profiles/FOGRA30L_uncoated_yellowish.xml.in +++ b/data/profiles/FOGRA30L_uncoated_yellowish.iccprofile.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8" ?> <profile> - <_description>FOGRA30L Uncoated Yellowish</_description> - <_copyright>This profile is free of known copyright restrictions</_copyright> + <description>FOGRA30L Uncoated Yellowish</description> + <copyright>This profile is free of known copyright restrictions</copyright> <!-- TRANSLATORS: uncoated means "without expensive glossy coating" --> - <_model> + <model> This profile is used for positive plate making, printing on paper type 5 (uncoated yellowish), sheetfed offset. - </_model> + </model> <manufacturer>ArgyllCMS</manufacturer> <license>CC0</license> <data_source>standard</data_source> diff --git a/data/profiles/FOGRA39L_coated.xml.in b/data/profiles/FOGRA39L_coated.iccprofile.xml index 552a692..3d709e3 100644 --- a/data/profiles/FOGRA39L_coated.xml.in +++ b/data/profiles/FOGRA39L_coated.iccprofile.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8" ?> <profile> - <_description>FOGRA39L Coated</_description> - <_copyright>This profile is free of known copyright restrictions</_copyright> + <description>FOGRA39L Coated</description> + <copyright>This profile is free of known copyright restrictions</copyright> <!-- TRANSLATORS: coated refers to the high quality paper covering making the paper better quality, GRACoL is also a trademark don't translate please --> - <_model> + <model> This profile is used for printing on paper types 1 and 2 (coated or matte), sheetfed offset. This profile is not significantly different from U.S. GRACoL 2006 (TR 006). - </_model> + </model> <manufacturer>ArgyllCMS</manufacturer> <license>CC0</license> <data_source>standard</data_source> diff --git a/data/profiles/FOGRA40L_SC_paper.xml.in b/data/profiles/FOGRA40L_SC_paper.iccprofile.xml index 4e28b4d..cb8f2c5 100644 --- a/data/profiles/FOGRA40L_SC_paper.xml.in +++ b/data/profiles/FOGRA40L_SC_paper.iccprofile.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8" ?> <profile> - <_description>FOGRA40L SC Paper</_description> - <_copyright>This profile is free of known copyright restrictions</_copyright> + <description>FOGRA40L SC Paper</description> + <copyright>This profile is free of known copyright restrictions</copyright> <!-- TRANSLATORS: supercalendered means "super smoothed and thin" --> - <_model> + <model> This profile is used for printing on SC (supercalendered) paper, webfed offset. There is no known U.S. equivalent. - </_model> + </model> <manufacturer>ArgyllCMS</manufacturer> <license>CC0</license> <data_source>standard</data_source> diff --git a/data/profiles/FOGRA45L_lwc.xml.in b/data/profiles/FOGRA45L_lwc.iccprofile.xml index 79d57e1..72c47cf 100644 --- a/data/profiles/FOGRA45L_lwc.xml.in +++ b/data/profiles/FOGRA45L_lwc.iccprofile.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8" ?> <profile> - <_description>FOGRA45L Lightweight Coated</_description> - <_copyright>This profile is free of known copyright restrictions</_copyright> + <description>FOGRA45L Lightweight Coated</description> + <copyright>This profile is free of known copyright restrictions</copyright> <!-- TRANSLATORS: ISO is a trademark --> - <_model> + <model> This ISO 12647-2:2004 compliant profile is used for printing on improved light-weight coated (LWC) paper for 60 l/cm heatset web offset printing. It replaces FOGRA28L. - </_model> + </model> <manufacturer>ArgyllCMS</manufacturer> <license>CC0</license> <data_source>standard</data_source> diff --git a/data/profiles/FOGRA47L_uncoated.xml.in b/data/profiles/FOGRA47L_uncoated.iccprofile.xml index 745eac2..8036662 100644 --- a/data/profiles/FOGRA47L_uncoated.xml.in +++ b/data/profiles/FOGRA47L_uncoated.iccprofile.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8" ?> <profile> - <_description>FOGRA47L Uncoated</_description> - <_copyright>This profile is free of known copyright restrictions</_copyright> + <description>FOGRA47L Uncoated</description> + <copyright>This profile is free of known copyright restrictions</copyright> <!-- TRANSLATORS: gsm stands for "grams per square meter" --> - <_model> + <model> This ISO 12647-2 compliant profile is used for printing on 115 gsm uncoated white (paper type 4) for 60 l/cm sheetfed offset printing. - </_model> + </model> <manufacturer>ArgyllCMS</manufacturer> <license>CC0</license> <data_source>standard</data_source> diff --git a/data/profiles/GRACoL_TR006_coated.xml.in b/data/profiles/GRACoL_TR006_coated.iccprofile.xml index d9c3ef8..42a9e9d 100644 --- a/data/profiles/GRACoL_TR006_coated.xml.in +++ b/data/profiles/GRACoL_TR006_coated.iccprofile.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8" ?> <profile> - <_description>GRACoL TR006 Coated</_description> - <_copyright>This profile is free of known copyright restrictions</_copyright> + <description>GRACoL TR006 Coated</description> + <copyright>This profile is free of known copyright restrictions</copyright> <!-- TRANSLATORS: coated = smooth and expensive --> - <_model> + <model> This profile is used for printing on U.S. grade 1 and 2 coated paper, sheetfed offset and gravure. It is the U.S. equivalent of FOGRA39. - </_model> + </model> <manufacturer>ArgyllCMS</manufacturer> <license>CC0</license> <data_source>standard</data_source> diff --git a/data/profiles/Gamma5000K.xml.in b/data/profiles/Gamma5000K.iccprofile.xml index ece87cd..0b38616 100644 --- a/data/profiles/Gamma5000K.xml.in +++ b/data/profiles/Gamma5000K.iccprofile.xml @@ -3,7 +3,7 @@ <name>Gamma6500K</name> <type>temperature</type> <description>D50</description> - <_copyright>This profile is free of known copyright restrictions</_copyright> + <copyright>This profile is free of known copyright restrictions</copyright> <license>CC0</license> <data_source>test</data_source> <temperature>5003</temperature> diff --git a/data/profiles/Gamma5500K.xml.in b/data/profiles/Gamma5500K.iccprofile.xml index 6cbff4e..1b303d4 100644 --- a/data/profiles/Gamma5500K.xml.in +++ b/data/profiles/Gamma5500K.iccprofile.xml @@ -3,7 +3,7 @@ <name>Gamma6500K</name> <type>temperature</type> <description>D55</description> - <_copyright>This profile is free of known copyright restrictions</_copyright> + <copyright>This profile is free of known copyright restrictions</copyright> <license>CC0</license> <data_source>test</data_source> <temperature>5503</temperature> diff --git a/data/profiles/Gamma6500K.xml.in b/data/profiles/Gamma6500K.iccprofile.xml index 8c5a48b..6a69589 100644 --- a/data/profiles/Gamma6500K.xml.in +++ b/data/profiles/Gamma6500K.iccprofile.xml @@ -3,7 +3,7 @@ <name>Gamma6500K</name> <type>temperature</type> <description>D65</description> - <_copyright>This profile is free of known copyright restrictions</_copyright> + <copyright>This profile is free of known copyright restrictions</copyright> <license>CC0</license> <data_source>test</data_source> <temperature>6504</temperature> diff --git a/data/profiles/IFRA26S_2004_newsprint.xml.in b/data/profiles/IFRA26S_2004_newsprint.iccprofile.xml index ca0f8f2..ec8b867 100644 --- a/data/profiles/IFRA26S_2004_newsprint.xml.in +++ b/data/profiles/IFRA26S_2004_newsprint.iccprofile.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8" ?> <profile> - <_description>IFRA26S 2004 Newsprint</_description> - <_copyright>This profile is free of known copyright restrictions</_copyright> + <description>IFRA26S 2004 Newsprint</description> + <copyright>This profile is free of known copyright restrictions</copyright> <!-- TRANSLATORS: TVI stands for 'tone value increase' and is another name for dot gain, coldset means letting the ink dry without heating it --> - <_model> + <model> This profile is use for printing on newsprint, and is an ISO12647-3:2005 compliant profile designed for a printing press exhibiting 26% TVI (dot gain). It is recommended by WAN-IFRA for coldset printing on newsprint worldwide. - </_model> + </model> <manufacturer>ArgyllCMS</manufacturer> <license>CC0</license> <data_source>standard</data_source> diff --git a/data/profiles/Makefile.am b/data/profiles/Makefile.am deleted file mode 100644 index 9fe5792..0000000 --- a/data/profiles/Makefile.am +++ /dev/null @@ -1,297 +0,0 @@ -.NOTPARALLEL: - -@INTLTOOL_XML_RULE@ -noinst_DATA = \ - AdobeRGB1998.xml \ - AppleRGB.xml \ - BestRGB.xml \ - BetaRGB.xml \ - Bluish.xml \ - BruceRGB.xml \ - CIE-RGB.xml \ - ColorMatchRGB.xml \ - Crayons.xml \ - DonRGB4.xml \ - ECI-RGBv1.xml \ - ECI-RGBv2.xml \ - EktaSpacePS5.xml \ - FOGRA27L_coated.xml \ - FOGRA28L_webcoated.xml \ - FOGRA29L_uncoated.xml \ - FOGRA30L_uncoated_yellowish.xml \ - FOGRA39L_coated.xml \ - FOGRA40L_SC_paper.xml \ - FOGRA45L_lwc.xml \ - FOGRA47L_uncoated.xml \ - Gamma5000K.xml \ - Gamma5500K.xml \ - Gamma6500K.xml \ - GRACoL_TR006_coated.xml \ - IFRA26S_2004_newsprint.xml \ - NTSC-RGB.xml \ - PAL-RGB.xml \ - ProPhotoRGB.xml \ - Rec709.xml \ - SMPTE-C-RGB.xml \ - SNAP_TR002_newsprint.xml \ - sRGB.xml \ - SwappedRedAndGreen.xml \ - SWOP_TR003_coated_3.xml \ - SWOP_TR005_coated_5.xml \ - WideGamutRGB.xml \ - x11-colors.xml - -profilesdir = $(datadir)/color/icc/colord -generatedprofiles = \ - AdobeRGB1998.icc \ - AppleRGB.icc \ - BestRGB.icc \ - BetaRGB.icc \ - BruceRGB.icc \ - CIE-RGB.icc \ - ColorMatchRGB.icc \ - DonRGB4.icc \ - ECI-RGBv1.icc \ - ECI-RGBv2.icc \ - EktaSpacePS5.icc \ - NTSC-RGB.icc \ - PAL-RGB.icc \ - ProPhotoRGB.icc \ - Rec709.icc \ - SMPTE-C-RGB.icc \ - sRGB.icc \ - WideGamutRGB.icc \ - SwappedRedAndGreen.icc \ - Bluish.icc \ - Gamma5000K.icc \ - Gamma5500K.icc \ - Gamma6500K.icc \ - Crayons.icc \ - x11-colors.icc - -if CD_BUILD_PRINT_PROFILES -generatedprofiles += \ - FOGRA27L_coated.icc \ - FOGRA28L_webcoated.icc \ - FOGRA29L_uncoated.icc \ - FOGRA30L_uncoated_yellowish.icc \ - FOGRA39L_coated.icc \ - FOGRA40L_SC_paper.icc \ - FOGRA45L_lwc.icc \ - FOGRA47L_uncoated.icc \ - GRACoL_TR006_coated.icc \ - SNAP_TR002_newsprint.icc \ - SWOP_TR003_coated_3.icc \ - SWOP_TR005_coated_5.icc \ - IFRA26S_2004_newsprint.icc -endif - -profiles_DATA = \ - $(generatedprofiles) - -AdobeRGB1998.icc: AdobeRGB1998.xml - $(AM_V_GEN) $(CD_CREATE_PROFILE) \ - --output $@ \ - $(builddir)/AdobeRGB1998.xml -AppleRGB.icc: AppleRGB.xml - $(AM_V_GEN) $(CD_CREATE_PROFILE) \ - --output $@ \ - $(builddir)/AppleRGB.xml -BestRGB.icc: BestRGB.xml - $(AM_V_GEN) $(CD_CREATE_PROFILE) \ - --output $@ \ - $(builddir)/BestRGB.xml -BetaRGB.icc: BetaRGB.xml - $(AM_V_GEN) $(CD_CREATE_PROFILE) \ - --output $@ \ - $(builddir)/BetaRGB.xml -BruceRGB.icc: BruceRGB.xml - $(AM_V_GEN) $(CD_CREATE_PROFILE) \ - --output $@ \ - $(builddir)/BruceRGB.xml -CIE-RGB.icc: CIE-RGB.xml - $(AM_V_GEN) $(CD_CREATE_PROFILE) \ - --output $@ \ - $(builddir)/CIE-RGB.xml -ColorMatchRGB.icc: ColorMatchRGB.xml - $(AM_V_GEN) $(CD_CREATE_PROFILE) \ - --output $@ \ - $(builddir)/ColorMatchRGB.xml -DonRGB4.icc: DonRGB4.xml - $(AM_V_GEN) $(CD_CREATE_PROFILE) \ - --output $@ \ - $(builddir)/DonRGB4.xml -ECI-RGBv1.icc: ECI-RGBv1.xml - $(AM_V_GEN) $(CD_CREATE_PROFILE) \ - --output $@ \ - $(builddir)/ECI-RGBv1.xml -ECI-RGBv2.icc: ECI-RGBv2.xml - $(AM_V_GEN) $(CD_CREATE_PROFILE) \ - --output $@ \ - $(builddir)/ECI-RGBv2.xml -EktaSpacePS5.icc: EktaSpacePS5.xml - $(AM_V_GEN) $(CD_CREATE_PROFILE) \ - --output $@ \ - $(builddir)/EktaSpacePS5.xml -NTSC-RGB.icc: NTSC-RGB.xml - $(AM_V_GEN) $(CD_CREATE_PROFILE) \ - --output $@ \ - $(builddir)/NTSC-RGB.xml -PAL-RGB.icc: PAL-RGB.xml - $(AM_V_GEN) $(CD_CREATE_PROFILE) \ - --output $@ \ - $(builddir)/PAL-RGB.xml -ProPhotoRGB.icc: ProPhotoRGB.xml - $(AM_V_GEN) $(CD_CREATE_PROFILE) \ - --output $@ \ - $(builddir)/ProPhotoRGB.xml -Rec709.icc: Rec709.xml - $(AM_V_GEN) $(CD_CREATE_PROFILE) \ - --output $@ \ - $(builddir)/Rec709.xml -SMPTE-C-RGB.icc: SMPTE-C-RGB.xml - $(AM_V_GEN) $(CD_CREATE_PROFILE) \ - --output $@ \ - $(builddir)/SMPTE-C-RGB.xml -sRGB.icc: sRGB.xml - $(AM_V_GEN) $(CD_CREATE_PROFILE) \ - --output $@ \ - $(builddir)/sRGB.xml -WideGamutRGB.icc: WideGamutRGB.xml - $(AM_V_GEN) $(CD_CREATE_PROFILE) \ - --output $@ \ - $(builddir)/WideGamutRGB.xml -SwappedRedAndGreen.icc: SwappedRedAndGreen.xml - $(AM_V_GEN) $(CD_CREATE_PROFILE) \ - --output $@ \ - $(builddir)/SwappedRedAndGreen.xml -x11-colors.icc: x11-colors.xml - $(AM_V_GEN) $(CD_CREATE_PROFILE) \ - --output $@ \ - $(builddir)/x11-colors.xml -Crayons.icc: Crayons.xml - $(AM_V_GEN) $(CD_CREATE_PROFILE) \ - --output $@ \ - $(builddir)/Crayons.xml -Bluish.icc: Bluish.xml - $(AM_V_GEN) $(CD_CREATE_PROFILE) \ - --output $@ \ - $(builddir)/Bluish.xml -Gamma6500K.icc: Gamma6500K.xml - $(AM_V_GEN) $(CD_CREATE_PROFILE) \ - --output $@ \ - $(builddir)/Gamma6500K.xml -Gamma5500K.icc: Gamma5500K.xml - $(AM_V_GEN) $(CD_CREATE_PROFILE) \ - --output $@ \ - $(builddir)/Gamma5500K.xml -Gamma5000K.icc: Gamma5000K.xml - $(AM_V_GEN) $(CD_CREATE_PROFILE) \ - --output $@ \ - $(builddir)/Gamma5000K.xml - -if CD_BUILD_PRINT_PROFILES -FOGRA27L_coated.icc: FOGRA27L_coated.xml - $(AM_V_GEN) $(CD_CREATE_PROFILE) \ - --output $@ \ - $(builddir)/FOGRA27L_coated.xml -FOGRA28L_webcoated.icc: FOGRA28L_webcoated.xml - $(AM_V_GEN) $(CD_CREATE_PROFILE) \ - --output $@ \ - $(builddir)/FOGRA28L_webcoated.xml -FOGRA29L_uncoated.icc: FOGRA29L_uncoated.xml - $(AM_V_GEN) $(CD_CREATE_PROFILE) \ - --output $@ \ - $(builddir)/FOGRA29L_uncoated.xml -FOGRA30L_uncoated_yellowish.icc: FOGRA30L_uncoated_yellowish.xml - $(AM_V_GEN) $(CD_CREATE_PROFILE) \ - --output $@ \ - $(builddir)/FOGRA30L_uncoated_yellowish.xml -FOGRA39L_coated.icc: FOGRA39L_coated.xml - $(AM_V_GEN) $(CD_CREATE_PROFILE) \ - --output $@ \ - $(builddir)/FOGRA39L_coated.xml -FOGRA40L_SC_paper.icc: FOGRA40L_SC_paper.xml - $(AM_V_GEN) $(CD_CREATE_PROFILE) \ - --output $@ \ - $(builddir)/FOGRA40L_SC_paper.xml -FOGRA45L_lwc.icc: FOGRA45L_lwc.xml - $(AM_V_GEN) $(CD_CREATE_PROFILE) \ - --output $@ \ - $(builddir)/FOGRA45L_lwc.xml -FOGRA47L_uncoated.icc: FOGRA47L_uncoated.xml - $(AM_V_GEN) $(CD_CREATE_PROFILE) \ - --output $@ \ - $(builddir)/FOGRA47L_uncoated.xml -GRACoL_TR006_coated.icc: GRACoL_TR006_coated.xml - $(AM_V_GEN) $(CD_CREATE_PROFILE) \ - --output $@ \ - $(builddir)/GRACoL_TR006_coated.xml -SNAP_TR002_newsprint.icc: SNAP_TR002_newsprint.xml - $(AM_V_GEN) $(CD_CREATE_PROFILE) \ - --output $@ \ - $(builddir)/SNAP_TR002_newsprint.xml -SWOP_TR003_coated_3.icc: SWOP_TR003_coated_3.xml - $(AM_V_GEN) $(CD_CREATE_PROFILE) \ - --output $@ \ - $(builddir)/SWOP_TR003_coated_3.xml -SWOP_TR005_coated_5.icc: SWOP_TR005_coated_5.xml - $(AM_V_GEN) $(CD_CREATE_PROFILE) \ - --output $@ \ - $(builddir)/SWOP_TR005_coated_5.xml -IFRA26S_2004_newsprint.icc: IFRA26S_2004_newsprint.xml - $(AM_V_GEN) $(CD_CREATE_PROFILE) \ - --output $@ \ - $(builddir)/IFRA26S_2004_newsprint.xml -endif - -sourcedata = \ - AdobeRGB1998.xml.in \ - AppleRGB.xml.in \ - BestRGB.xml.in \ - BetaRGB.xml.in \ - Bluish.xml.in \ - BruceRGB.xml.in \ - CIE-RGB.xml.in \ - ColorMatchRGB.xml.in \ - Crayons.xml.in \ - DonRGB4.xml.in \ - ECI-RGBv1.xml.in \ - ECI-RGBv2.xml.in \ - EktaSpacePS5.xml.in \ - FOGRA27L_coated.xml.in \ - FOGRA28L_webcoated.xml.in \ - FOGRA29L_uncoated.xml.in \ - FOGRA30L_uncoated_yellowish.xml.in \ - FOGRA39L_coated.xml.in \ - FOGRA40L_SC_paper.xml.in \ - FOGRA45L_lwc.xml.in \ - FOGRA47L_uncoated.xml.in \ - Gamma5000K.xml.in \ - Gamma5500K.xml.in \ - Gamma6500K.xml.in \ - GRACoL_TR006_coated.xml.in \ - IFRA26S_2004_newsprint.xml.in \ - NTSC-RGB.xml.in \ - PAL-RGB.xml.in \ - ProPhotoRGB.xml.in \ - Rec709.xml.in \ - SMPTE-C-RGB.xml.in \ - SNAP_TR002_newsprint.xml.in \ - sRGB.xml.in \ - SwappedRedAndGreen.xml.in \ - SWOP_TR003_coated_3.xml.in \ - SWOP_TR005_coated_5.xml.in \ - WideGamutRGB.xml.in \ - x11-colors.xml.in - -CLEANFILES = \ - $(generatedprofiles) - -DISTCLEANFILES = \ - $(noinst_DATA) - -EXTRA_DIST = \ - $(sourcedata) - --include $(top_srcdir)/git.mk diff --git a/data/profiles/NTSC-RGB.xml.in b/data/profiles/NTSC-RGB.iccprofile.xml index a3f2ac4..e14000e 100644 --- a/data/profiles/NTSC-RGB.xml.in +++ b/data/profiles/NTSC-RGB.iccprofile.xml @@ -2,16 +2,16 @@ <profile> <name>NTSC-RGB</name> <description>NTSC RGB</description> - <_copyright>This profile is free of known copyright restrictions</_copyright> + <copyright>This profile is free of known copyright restrictions</copyright> <!-- TRANSLATORS: A little joke: Color Geeks say that NTSC stands for 'Never The Same Color' as it's really a poor choice compared to sRGB --> - <_model> + <model> This profile defines the range of colors used with the NTSC video standard. It is an obsolete standard that has been replaced by SMTE-C. You should only use this profile to decode archived video. - </_model> + </model> <license>CC0</license> <data_source>standard</data_source> <standard_space>ntsc-rgb</standard_space> diff --git a/data/profiles/PAL-RGB.xml.in b/data/profiles/PAL-RGB.iccprofile.xml index ab05823..6d8cc3d 100644 --- a/data/profiles/PAL-RGB.xml.in +++ b/data/profiles/PAL-RGB.iccprofile.xml @@ -2,13 +2,13 @@ <profile> <name>PAL-RGB</name> <description>PAL/SECAM RGB</description> - <_copyright>This profile is free of known copyright restrictions</_copyright> + <copyright>This profile is free of known copyright restrictions</copyright> <!-- TRANSLATORS: Please don't translate PAL or SECAM --> - <_model> + <model> This profile defines the range of colors used with the PAL and SECAM video standards and is very similar to sRGB. You should only use this profile to encode or decode video. - </_model> + </model> <license>CC0</license> <data_source>standard</data_source> <standard_space>pal-rgb</standard_space> diff --git a/data/profiles/ProPhotoRGB.xml.in b/data/profiles/ProPhotoRGB.iccprofile.xml index 62f20ad..2bb6e30 100644 --- a/data/profiles/ProPhotoRGB.xml.in +++ b/data/profiles/ProPhotoRGB.iccprofile.xml @@ -2,15 +2,15 @@ <profile> <name>ProPhotoRGB</name> <description>ProPhoto RGB</description> - <_copyright>This profile is free of known copyright restrictions</_copyright> + <copyright>This profile is free of known copyright restrictions</copyright> <!-- TRANSLATORS: Please don't translate 'RGB' or 'RAW' --> - <_model> + <model> Originally designed by Eastman Kodak and called ROMM RGB, this profile can display a very large range of colors and is used by many photographers for rendering, editing and archiving RAW images. Unless you are working with 16 bits per channel precision, you may see color banding when editing images. - </_model> + </model> <license>CC0</license> <data_source>standard</data_source> <standard_space>prophoto-rgb</standard_space> diff --git a/data/profiles/Rec709.xml.in b/data/profiles/Rec709.iccprofile.xml index a506aa1..665e802 100644 --- a/data/profiles/Rec709.xml.in +++ b/data/profiles/Rec709.iccprofile.xml @@ -2,16 +2,16 @@ <profile> <name>Rec709</name> <description>Rec. 709</description> - <_copyright>This profile is free of known copyright restrictions</_copyright> + <copyright>This profile is free of known copyright restrictions</copyright> <!-- TRANSLATORS: ITU-R is a standards body --> - <_model> + <model> ITU-R recommendation BT.709 is a high-definition television standard that was first approved in 1990. The Rec. 709 profile uses the same range of colors as sRGB although the luminance curve is different. - </_model> + </model> <license>CC0</license> <data_source>standard</data_source> <standard_space>rec709</standard_space> diff --git a/data/profiles/SMPTE-C-RGB.xml.in b/data/profiles/SMPTE-C-RGB.iccprofile.xml index 769bf61..7931c63 100644 --- a/data/profiles/SMPTE-C-RGB.xml.in +++ b/data/profiles/SMPTE-C-RGB.iccprofile.xml @@ -2,13 +2,13 @@ <profile> <name>SMPTE-C-RGB</name> <description>SMPTE-C RGB</description> - <_copyright>This profile is free of known copyright restrictions</_copyright> + <copyright>This profile is free of known copyright restrictions</copyright> <!-- TRANSLATORS: studio recording means 'shows you'll see on TV' --> - <_model> + <model> This is the current standard used by North America and Japan for studio recording. You should only use this profile to encode or decode video. - </_model> + </model> <license>CC0</license> <data_source>standard</data_source> <standard_space>smpte-c-rgb</standard_space> diff --git a/data/profiles/SNAP_TR002_newsprint.xml.in b/data/profiles/SNAP_TR002_newsprint.iccprofile.xml index 001cb5c..0fa3a2f 100644 --- a/data/profiles/SNAP_TR002_newsprint.xml.in +++ b/data/profiles/SNAP_TR002_newsprint.iccprofile.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8" ?> <profile> - <_description>SNAP TR002 Newsprint</_description> - <_copyright>This profile is free of known copyright restrictions</_copyright> + <description>SNAP TR002 Newsprint</description> + <copyright>This profile is free of known copyright restrictions</copyright> <!-- TRANSLATORS: CGATS is a trademark --> - <_model> + <model> This is an ANSI CGATS/SNAP TR 002-2007 based profile for printing on newsprint in the U.S., coldset offset. The TVI (dot gain) is 26%. - </_model> + </model> <manufacturer>ArgyllCMS</manufacturer> <license>CC0</license> <data_source>standard</data_source> diff --git a/data/profiles/SWOP_TR003_coated_3.xml.in b/data/profiles/SWOP_TR003_coated_3.iccprofile.xml index 75368f0..56ba801 100644 --- a/data/profiles/SWOP_TR003_coated_3.xml.in +++ b/data/profiles/SWOP_TR003_coated_3.iccprofile.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8" ?> <profile> - <_description>SWOP TR003 Coated</_description> - <_copyright>This profile is free of known copyright restrictions</_copyright> + <description>SWOP TR003 Coated</description> + <copyright>This profile is free of known copyright restrictions</copyright> <!-- TRANSLATORS: FOGRA is a trademark --> - <_model> + <model> This profile is used for printing on U.S. grade 3 coated paper, sheetfed offset and gravure. It is used for high quality magazine printing with white paper. - </_model> + </model> <manufacturer>ArgyllCMS</manufacturer> <license>CC0</license> <data_source>standard</data_source> diff --git a/data/profiles/SWOP_TR005_coated_5.xml.in b/data/profiles/SWOP_TR005_coated_5.iccprofile.xml index 784ee43..10fcdca 100644 --- a/data/profiles/SWOP_TR005_coated_5.xml.in +++ b/data/profiles/SWOP_TR005_coated_5.iccprofile.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8" ?> <profile> - <_description>SWOP TR005 Coated</_description> - <_copyright>This profile is free of known copyright restrictions</_copyright> + <description>SWOP TR005 Coated</description> + <copyright>This profile is free of known copyright restrictions</copyright> <!-- TRANSLATORS: FOGRA is a trademark --> - <_model> + <model> This profile is used for printing on U.S. grade 5 coated paper, sheetfed offset and gravure. It is use for standard magazine printing with yellowish paper. - </_model> + </model> <manufacturer>ArgyllCMS</manufacturer> <license>CC0</license> <data_source>standard</data_source> diff --git a/data/profiles/SwappedRedAndGreen.xml.in b/data/profiles/SwappedRedAndGreen.iccprofile.xml index c698ea6..70e6865 100644 --- a/data/profiles/SwappedRedAndGreen.xml.in +++ b/data/profiles/SwappedRedAndGreen.iccprofile.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8" ?> <profile> <name>SwappedRedAndGreen</name> - <_description>Swapped Red and Green</_description> - <_copyright>This profile is free of known copyright restrictions</_copyright> + <description>Swapped Red and Green</description> + <copyright>This profile is free of known copyright restrictions</copyright> <!-- TRANSLATORS: channels refer to the RGB values in an image --> - <_model> + <model> This test profile swaps the red and green channels and is useful as a visual check that profiles are being applied correctly. If this profile is applied twice, the image looks unchanged. - </_model> + </model> <license>CC0</license> <data_source>test</data_source> <gamma>sRGB</gamma> diff --git a/data/profiles/WideGamutRGB.xml.in b/data/profiles/WideGamutRGB.iccprofile.xml index 86b64c6..413f3e8 100644 --- a/data/profiles/WideGamutRGB.xml.in +++ b/data/profiles/WideGamutRGB.iccprofile.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="UTF-8" ?> <profile> <name>WideGamutRGB</name> - <_description>Wide Gamut RGB</_description> - <_copyright>This profile is free of known copyright restrictions</_copyright> + <description>Wide Gamut RGB</description> + <copyright>This profile is free of known copyright restrictions</copyright> <!-- TRANSLATORS: 'Adobe Systems' is a trademark, don't translate that --> - <_model> + <model> This editing space was designed by Adobe Systems to capture many more colors than Adobe RGB. This profile is used to print to devices such as film recorders and can define many colors that cannot be displayed on a computer screen. Unless you are working with 16 bits per channel precision, you may see color banding when editing images. - </_model> + </model> <license>CC0</license> <data_source>standard</data_source> <standard_space>wide-gamut-rgb</standard_space> diff --git a/data/profiles/its/colord.its b/data/profiles/its/colord.its new file mode 100644 index 0000000..a9128a9 --- /dev/null +++ b/data/profiles/its/colord.its @@ -0,0 +1,9 @@ +<?xml version="1.0"?> +<its:rules xmlns:its="http://www.w3.org/2005/11/its" + version="2.0"> + <its:translateRule selector="//*" translate="no"/> + <its:translateRule selector="//profile/name | + //profile/model | + //profile/description" + translate="yes"/> +</its:rules> diff --git a/data/profiles/its/colord.loc b/data/profiles/its/colord.loc new file mode 100644 index 0000000..81680c7 --- /dev/null +++ b/data/profiles/its/colord.loc @@ -0,0 +1,6 @@ +<?xml version="1.0"?> +<locatingRules> + <locatingRule name="IccProfile" pattern="*.iccprofile.xml"> + <documentRule localName="profile" target="colord.its"/> + </locatingRule> +</locatingRules> diff --git a/data/profiles/meson.build b/data/profiles/meson.build new file mode 100644 index 0000000..c2390e9 --- /dev/null +++ b/data/profiles/meson.build @@ -0,0 +1,67 @@ +icc_display_profiles = [ + 'AdobeRGB1998', + 'AppleRGB', + 'BestRGB', + 'BetaRGB', + 'Bluish', + 'BruceRGB', + 'CIE-RGB', + 'ColorMatchRGB', + 'Crayons', + 'DonRGB4', + 'ECI-RGBv1', + 'ECI-RGBv2', + 'EktaSpacePS5', + 'Gamma5000K', + 'Gamma5500K', + 'Gamma6500K', + 'NTSC-RGB', + 'PAL-RGB', + 'ProPhotoRGB', + 'Rec709', + 'SMPTE-C-RGB', + 'sRGB', + 'SwappedRedAndGreen', + 'WideGamutRGB', + 'x11-colors', +] + +icc_print_profiles = [ + 'FOGRA27L_coated', + 'FOGRA28L_webcoated', + 'FOGRA29L_uncoated', + 'FOGRA30L_uncoated_yellowish', + 'FOGRA39L_coated', + 'FOGRA40L_SC_paper', + 'FOGRA45L_lwc', + 'FOGRA47L_uncoated', + 'GRACoL_TR006_coated', + 'IFRA26S_2004_newsprint', + 'SNAP_TR002_newsprint', + 'SWOP_TR003_coated_3', + 'SWOP_TR005_coated_5', +] + +icc_profiles = icc_display_profiles +if get_option('enable-print-profiles') + icc_profiles += icc_print_profiles +endif + +generated_iccs = [] +foreach arg: icc_profiles + xml_i18n = i18n.merge_file( + input: arg + '.iccprofile.xml', + output: arg + '.iccprofile.xml', + type: 'xml', + data_dirs: join_paths(meson.source_root(), 'data', 'profiles'), + po_dir: join_paths(meson.source_root(), 'po') + ) + generated_icc = custom_target(arg + '.icc', + input: xml_i18n, + output: arg + '.icc', + command: [ cd_create_profile, '--output=@OUTPUT@', '@INPUT@' ], + install: true, + install_dir: join_paths(get_option('datadir'), 'color', 'icc', 'colord'), + ) + generated_iccs += generated_icc +endforeach diff --git a/data/profiles/sRGB.xml.in b/data/profiles/sRGB.iccprofile.xml index f8fd779..d881b38 100644 --- a/data/profiles/sRGB.xml.in +++ b/data/profiles/sRGB.iccprofile.xml @@ -2,18 +2,18 @@ <profile> <name>sRGB</name> <description>sRGB</description> - <_copyright>This profile is free of known copyright restrictions</_copyright> + <copyright>This profile is free of known copyright restrictions</copyright> <!-- TRANSLATORS: Trinitron is a trademark, 'untagged' means an image with an unspecified color profile --> - <_model> + <model> This general purpose profile was designed by Hewlett-Packard and Microsoft and lives on as the default profile on the Internet for untagged RGB colors and used in HDTV. Most uncalibrated displays are able to display most of the colors available in sRGB, although this profile is sometimes a poor choice for printing. - </_model> + </model> <license>CC0</license> <data_source>standard</data_source> <standard_space>srgb</standard_space> diff --git a/data/profiles/x11-colors.xml.in b/data/profiles/x11-colors.iccprofile.xml index da4f60a..b9f87a5 100644 --- a/data/profiles/x11-colors.xml.in +++ b/data/profiles/x11-colors.iccprofile.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8" ?> <profile> <name>x11-colors</name> - <_description>X11 Colors</_description> - <_copyright>This profile is free of known copyright restrictions</_copyright> + <description>X11 Colors</description> + <copyright>This profile is free of known copyright restrictions</copyright> <!-- TRANSLATORS: A 'named color profile' contains a list of color swatches that look the same on all computer screens --> - <_model> + <model> This named color profile contains all the colors defined by X11, assuming the source colors were supposed to be sRGB. - </_model> + </model> <license>CC0</license> <named> <color> diff --git a/data/ref/Makefile.am b/data/ref/Makefile.am deleted file mode 100644 index f35522e..0000000 --- a/data/ref/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -.NOTPARALLEL: - -refdir = $(datadir)/colord/ref -dist_ref_DATA = \ - CIE-1986-daylight-SPD.cmf \ - CIE-TCS.sp - --include $(top_srcdir)/git.mk diff --git a/data/ref/meson.build b/data/ref/meson.build new file mode 100644 index 0000000..6b2aa21 --- /dev/null +++ b/data/ref/meson.build @@ -0,0 +1,6 @@ +install_data([ + 'CIE-1986-daylight-SPD.cmf', + 'CIE-TCS.sp', + ], + install_dir: join_paths(get_option('datadir'), 'colord', 'ref') +) diff --git a/data/tests/Makefile.am b/data/tests/Makefile.am deleted file mode 100644 index d49bb9d..0000000 --- a/data/tests/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -test_files = \ - DELL-U2713H.bin \ - LG-L225W-External.bin \ - Lenovo-T61-Internal.bin \ - calibration.ccmx \ - corrupt-dict.icc \ - crayons.icc \ - empty.icc \ - ibm-t61.icc \ - measured.ti3 \ - normalised.ti3 \ - raw.ti3 \ - test.sp \ - test.ccss \ - example.cmf \ - example.sp \ - reference.ti3 - -if BUILDOPT_INSTALL_TESTS -testdatadir = $(libexecdir)/installed-tests/colord -testdata_DATA = $(test_files) -endif - -EXTRA_DIST = $(test_files) - --include $(top_srcdir)/git.mk diff --git a/data/tests/meson.build b/data/tests/meson.build new file mode 100644 index 0000000..366e692 --- /dev/null +++ b/data/tests/meson.build @@ -0,0 +1,22 @@ +if get_option('enable-installed-tests') + install_data([ + 'calibration.ccmx', + 'corrupt-dict.icc', + 'crayons.icc', + 'DELL-U2713H.bin', + 'empty.icc', + 'example.cmf', + 'example.sp', + 'ibm-t61.icc', + 'Lenovo-T61-Internal.bin', + 'LG-L225W-External.bin', + 'measured.ti3', + 'normalised.ti3', + 'raw.ti3', + 'reference.ti3', + 'test.ccss', + 'test.sp', + ], + install_dir: join_paths(get_option('libexecdir'), 'installed-tests', 'colord') + ) +endif diff --git a/data/ti1/Makefile.am b/data/ti1/Makefile.am deleted file mode 100644 index 01014e2..0000000 --- a/data/ti1/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -ti1dir = $(datadir)/colord/ti1 -ti1_DATA = \ - display-long.ti1 \ - display-normal.ti1 \ - display-short.ti1 \ - printer-long.ti1 \ - printer-normal.ti1 \ - printer-short.ti1 - -EXTRA_DIST = \ - $(ti1_DATA) - --include $(top_srcdir)/git.mk diff --git a/data/ti1/meson.build b/data/ti1/meson.build new file mode 100644 index 0000000..6ef11d4 --- /dev/null +++ b/data/ti1/meson.build @@ -0,0 +1,10 @@ +install_data([ + 'display-long.ti1', + 'display-normal.ti1', + 'display-short.ti1', + 'printer-long.ti1', + 'printer-normal.ti1', + 'printer-short.ti1', + ], + install_dir: join_paths(get_option('datadir'), 'colord', 'ti1') +) diff --git a/doc/Makefile.am b/doc/Makefile.am deleted file mode 100644 index 1dc641b..0000000 --- a/doc/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -SUBDIRS = \ - api - --include $(top_srcdir)/git.mk diff --git a/doc/api/Makefile.am b/doc/api/Makefile.am deleted file mode 100644 index cd62037..0000000 --- a/doc/api/Makefile.am +++ /dev/null @@ -1,83 +0,0 @@ - -SUBDIRS = dbus - -AUTOMAKE_OPTIONS = 1.7 - -# The name of the module. -DOC_MODULE=colord - -# The top-level SGML file. -DOC_MAIN_SGML_FILE=colord-docs.xml - -# Extra options to supply to gtkdoc-scan -SCAN_OPTIONS=--ignore-headers=config.h - -# The directory containing the source code. Relative to $(srcdir) -DOC_SOURCE_DIR=$(top_srcdir)/lib/colord $(top_builddir)/lib/colord - -# Used for dependencies -HFILE_GLOB= -CFILE_GLOB= - -# Headers to ignore -IGNORE_HFILES= \ - config.h - -# Extra options to supply to gtkdoc-mkhtml -MKHTML_OPTIONS=--path="$(top_srcdir)" - -# CFLAGS and LDFLAGS for compiling scan program. Only needed -# if $(DOC_MODULE).types is non-empty. -AM_CPPFLAGS = \ - $(GLIB_CFLAGS) \ - -I$(top_srcdir)/lib/colord \ - -I$(top_builddir)/lib/colord - -COLORD_LIBS = \ - $(top_builddir)/lib/colord/libcolordprivate.la \ - $(top_builddir)/lib/colord/libcolord.la - -GTKDOC_LIBS = \ - $(GLIB_LIBS) \ - $(COLORD_LIBS) - -# Extra options to supply to gtkdoc-mkdb -MKDB_OPTIONS=--sgml-mode --output-format=xml - -# Extra options to supply to gtkdoc-mktmpl -MKTMPL_OPTIONS= - -# Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE) -content_files = \ - ../../COPYING \ - version.xml \ - dbus/org.freedesktop.ColorManager.ref.xml - -# Images to copy into HTML directory -HTML_IMAGES = \ - $(NULL) - -# Extra options to supply to gtkdoc-fixref -FIXXREF_OPTIONS= - -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in \ - colord.types \ - colord-*.txt - -DISTCLEANFILES = \ - org.freedesktop.ColorManager.ref.xml - -if ENABLE_GTK_DOC -include $(top_srcdir)/gtk-doc.make -CLEANFILES += tmpl -else -EXTRA_DIST = -CLEANFILES = tmpl -endif - -# Version information for marking the documentation -EXTRA_DIST += version.xml.in - --include $(top_srcdir)/git.mk diff --git a/doc/api/colord-docs.xml b/doc/api/colord-docs.xml index 3b7ce9e..95916dc 100644 --- a/doc/api/colord-docs.xml +++ b/doc/api/colord-docs.xml @@ -1,12 +1,10 @@ <?xml version="1.0"?> <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ -<!ENTITY version SYSTEM "version.xml"> ]> <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude"> <bookinfo> <title>colord Reference Manual</title> - <releaseinfo>Version &version;</releaseinfo> <authorgroup> <author> <firstname>Richard</firstname> @@ -56,21 +54,6 @@ </legalnotice> </bookinfo> - <reference id="ref-dbus"> - <title>D-Bus API Reference</title> - <partintro> - <para> - This part documents the D-Bus interface used to access the - colord daemon. - </para> - </partintro> - <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include> - <xi:include href="dbus/org.freedesktop.ColorManager.ref.xml"><xi:fallback /></xi:include> - <xi:include href="dbus/org.freedesktop.ColorManager.Device.ref.xml"><xi:fallback /></xi:include> - <xi:include href="dbus/org.freedesktop.ColorManager.Profile.ref.xml"><xi:fallback /></xi:include> - <xi:include href="dbus/org.freedesktop.ColorManager.Sensor.ref.xml"><xi:fallback /></xi:include> - </reference> - <reference id="libcolordprivate"> <title>libcolord GObjects</title> <partintro> diff --git a/doc/api/dbus/Makefile.am b/doc/api/dbus/Makefile.am deleted file mode 100644 index 8932fce..0000000 --- a/doc/api/dbus/Makefile.am +++ /dev/null @@ -1,36 +0,0 @@ - -all : org.freedesktop.ColorManager.ref.xml org.freedesktop.ColorManager.Device.ref.xml org.freedesktop.ColorManager.Profile.ref.xml org.freedesktop.ColorManager.Sensor.ref.xml - -org.freedesktop.ColorManager.ref.xml : $(top_srcdir)/src/org.freedesktop.ColorManager.xml $(top_srcdir)/doc/api/dbus/spec-to-docbook.xsl - $(AM_V_GEN) \ - echo "<?xml version=\"1.0\"?>""<!DOCTYPE refentry PUBLIC \"-//OASIS//DTD DocBook XML V4.1.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\">" > $@ - $(AM_V_GEN) \ - $(XSLTPROC) $(top_srcdir)/doc/api/dbus/spec-to-docbook.xsl $< | tail -n +2 >> $@ - -org.freedesktop.ColorManager.Device.ref.xml : $(top_srcdir)/src/org.freedesktop.ColorManager.Device.xml $(top_srcdir)/doc/api/dbus/spec-to-docbook.xsl - $(AM_V_GEN) \ - echo "<?xml version=\"1.0\"?>""<!DOCTYPE refentry PUBLIC \"-//OASIS//DTD DocBook XML V4.1.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\">" > $@ - $(AM_V_GEN) \ - $(XSLTPROC) $(top_srcdir)/doc/api/dbus/spec-to-docbook.xsl $< | tail -n +2 >> $@ - -org.freedesktop.ColorManager.Profile.ref.xml : $(top_srcdir)/src/org.freedesktop.ColorManager.Profile.xml $(top_srcdir)/doc/api/dbus/spec-to-docbook.xsl - $(AM_V_GEN) \ - echo "<?xml version=\"1.0\"?>""<!DOCTYPE refentry PUBLIC \"-//OASIS//DTD DocBook XML V4.1.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\">" > $@ - $(AM_V_GEN) \ - $(XSLTPROC) $(top_srcdir)/doc/api/dbus/spec-to-docbook.xsl $< | tail -n +2 >> $@ - -org.freedesktop.ColorManager.Sensor.ref.xml : $(top_srcdir)/src/org.freedesktop.ColorManager.Sensor.xml $(top_srcdir)/doc/api/dbus/spec-to-docbook.xsl - $(AM_V_GEN) \ - echo "<?xml version=\"1.0\"?>""<!DOCTYPE refentry PUBLIC \"-//OASIS//DTD DocBook XML V4.1.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\">" > $@ - $(AM_V_GEN) \ - $(XSLTPROC) $(top_srcdir)/doc/api/dbus/spec-to-docbook.xsl $< | tail -n +2 >> $@ - -EXTRA_DIST = spec-to-docbook.xsl dbus-introspect-docs.dtd - -clean-local : - rm -f *~ *.ref.xml - -MAINTAINERCLEANFILES = \ - *.ref.xml - --include $(top_srcdir)/git.mk diff --git a/doc/api/meson.build b/doc/api/meson.build new file mode 100644 index 0000000..edbab06 --- /dev/null +++ b/doc/api/meson.build @@ -0,0 +1,9 @@ +gnome.gtkdoc( + 'colord', + src_dir : [ + join_paths(meson.source_root(), 'lib/colord'), + join_paths(meson.build_root(), 'lib/colord'), + ], + main_xml : 'colord-docs.xml', + install : true +) diff --git a/doc/api/version.xml.in b/doc/api/version.xml.in deleted file mode 100644 index d78bda9..0000000 --- a/doc/api/version.xml.in +++ /dev/null @@ -1 +0,0 @@ -@VERSION@ diff --git a/doc/meson.build b/doc/meson.build new file mode 100644 index 0000000..dc2bb41 --- /dev/null +++ b/doc/meson.build @@ -0,0 +1 @@ +subdir('api') @@ -1,200 +0,0 @@ -# git.mk -# -# Copyright 2009, Red Hat, Inc. -# Written by Behdad Esfahbod -# -# Copying and distribution of this file, with or without modification, -# are permitted in any medium without royalty provided the copyright -# notice and this notice are preserved. -# -# The canonical source for this file is pango/git.mk, or whereever the -# header of pango/git.mk suggests in the future. -# -# To use in your project, import this file in your git repo's toplevel, -# then do "make -f git.mk". This modifies all Makefile.am files in -# your project to include git.mk. -# -# This enables automatic .gitignore generation. If you need to ignore -# more files, add them to the GITIGNOREFILES variable in your Makefile.am. -# But think twice before doing that. If a file has to be in .gitignore, -# chances are very high that it's a generated file and should be in one -# of MOSTLYCLEANFILES, CLEANFILES, DISTCLEANFILES, or MAINTAINERCLEANFILES. -# -# The only case that you need to manually add a file to GITIGNOREFILES is -# when remove files in one of mostlyclean-local, clean-local, distclean-local, -# or maintainer-clean-local. -# -# Note that for files like editor backup, etc, there are better places to -# ignore them. See "man gitignore". -# -# If "make maintainer-clean" removes the files but they are not recognized -# by this script (that is, if "git status" shows untracked files still), send -# me the output of "git status" as well as your Makefile.am and Makefile for -# the directories involved. -# -# For a list of toplevel files that should be in MAINTAINERCLEANFILES, see -# pango/Makefile.am. -# -# Don't EXTRA_DIST this file. It is supposed to only live in git clones, -# not tarballs. It serves no useful purpose in tarballs and clutters the -# build dir. -# -# This file knows how to handle autoconf, automake, libtool, gtk-doc, -# gnome-doc-utils, mallard, intltool, gsettings. -# -# -# KNOWN ISSUES: -# -# - Recursive configure doesn't work as $(top_srcdir)/git.mk inside the -# submodule doesn't find us. If you have configure.{in,ac} files in -# subdirs, add a proxy git.mk file in those dirs that simply does: -# "include $(top_srcdir)/../git.mk". Add more ..'s to your taste. -# And add those files to git. See vte/gnome-pty-helper/git.mk for -# example. -# -# ChangeLog -# -# - 2010-12-06 Add support for Mallard docs -# - 2010-12-06 Start this change log - -git-all: git-mk-install - -git-mk-install: - @echo Installing git makefile - @any_failed=; find $(top_srcdir) -name Makefile.am | while read x; do \ - if grep 'include .*/git.mk' $$x >/dev/null; then \ - echo $$x already includes git.mk; \ - else \ - failed=; \ - echo "Updating $$x"; \ - { cat $$x; \ - echo ''; \ - echo '-include $$(top_srcdir)/git.mk'; \ - } > $$x.tmp || failed=1; \ - if test x$$failed = x; then \ - mv $$x.tmp $$x || failed=1; \ - fi; \ - if test x$$failed = x; then : else \ - echo Failed updating $$x; >&2 \ - any_failed=1; \ - fi; \ - fi; done; test -z "$$any_failed" - -.PHONY: git-all git-mk-install - - -### .gitignore generation - -$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk - $(AM_V_GEN) \ - { \ - if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \ - for x in \ - $(DOC_MODULE)-decl-list.txt \ - $(DOC_MODULE)-decl.txt \ - tmpl/$(DOC_MODULE)-unused.sgml \ - "tmpl/*.bak" \ - xml html \ - ; do echo /$$x; done; \ - fi; \ - if test "x$(DOC_MODULE)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \ - for x in \ - $(_DOC_C_DOCS) \ - $(_DOC_LC_DOCS) \ - $(_DOC_OMF_ALL) \ - $(_DOC_DSK_ALL) \ - $(_DOC_HTML_ALL) \ - $(_DOC_MOFILES) \ - $(_DOC_POFILES) \ - $(DOC_H_FILE) \ - "*/.xml2po.mo" \ - "*/*.omf.out" \ - ; do echo /$$x; done; \ - fi; \ - if test "x$(gsettings_SCHEMAS)" = x; then :; else \ - for x in \ - $(gsettings_SCHEMAS:.xml=.valid) \ - $(gsettings__enum_file) \ - ; do echo /$$x; done; \ - fi; \ - if test -f $(srcdir)/po/Makefile.in.in; then \ - for x in \ - po/Makefile.in.in \ - po/Makefile.in \ - po/Makefile \ - po/POTFILES \ - po/stamp-it \ - po/.intltool-merge-cache \ - "po/*.gmo" \ - "po/*.mo" \ - po/$(GETTEXT_PACKAGE).pot \ - intltool-extract.in \ - intltool-merge.in \ - intltool-update.in \ - ; do echo /$$x; done; \ - fi; \ - if test -f $(srcdir)/configure; then \ - for x in \ - autom4te.cache \ - configure \ - config.h \ - stamp-h1 \ - libtool \ - config.lt \ - ; do echo /$$x; done; \ - fi; \ - for x in \ - .gitignore \ - $(GITIGNOREFILES) \ - $(CLEANFILES) \ - $(PROGRAMS) \ - $(check_PROGRAMS) \ - $(EXTRA_PROGRAMS) \ - $(LTLIBRARIES) \ - so_locations \ - .libs _libs \ - $(MOSTLYCLEANFILES) \ - "*.$(OBJEXT)" \ - "*.lo" \ - $(DISTCLEANFILES) \ - $(am__CONFIG_DISTCLEAN_FILES) \ - $(CONFIG_CLEAN_FILES) \ - TAGS ID GTAGS GRTAGS GSYMS GPATH tags \ - "*.tab.c" \ - $(MAINTAINERCLEANFILES) \ - $(BUILT_SOURCES) \ - $(DEPDIR) \ - Makefile \ - Makefile.in \ - "*.orig" \ - "*.rej" \ - "*.bak" \ - "*~" \ - ".*.sw[nop]" \ - ".dirstamp" \ - ; do echo /$$x; done; \ - } | \ - sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \ - sed 's@/[.]/@/@g' | \ - LC_ALL=C sort | uniq > $@.tmp && \ - mv $@.tmp $@; - -all: $(srcdir)/.gitignore gitignore-recurse-maybe -gitignore-recurse-maybe: - @if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) gitignore-recurse; \ - fi; -gitignore-recurse: - @for subdir in $(DIST_SUBDIRS); do \ - case " $(SUBDIRS) " in \ - *" $$subdir "*) :;; \ - *) test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || echo "Skipping $$subdir");; \ - esac; \ - done -gitignore: $(srcdir)/.gitignore gitignore-recurse - -maintainer-clean: gitignore-clean -gitignore-clean: - -rm -f $(srcdir)/.gitignore - -.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe diff --git a/lib/Makefile.am b/lib/Makefile.am deleted file mode 100644 index b0e96e2..0000000 --- a/lib/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -SUBDIRS = \ - colord - -if BUILD_LIBCOLORDCOMPAT -SUBDIRS += \ - compat -endif - -SUBDIRS += \ - colorhug - --include $(top_srcdir)/git.mk diff --git a/lib/colord/Makefile.am b/lib/colord/Makefile.am deleted file mode 100644 index b2bbf3e..0000000 --- a/lib/colord/Makefile.am +++ /dev/null @@ -1,232 +0,0 @@ -if HAVE_INTROSPECTION --include $(INTROSPECTION_MAKEFILE) -INTROSPECTION_GIRS = -INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) -INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) -endif - -AM_CPPFLAGS = \ - $(GLIB_CFLAGS) \ - $(GLIB_UNIX_CFLAGS) \ - $(LCMS_CFLAGS) \ - $(PIE_CFLAGS) \ - $(UDEV_CFLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/lib \ - -DCD_COMPILATION \ - -DG_LOG_DOMAIN=\"libcolord\" \ - -DTESTDATADIR=\""$(top_srcdir)/data/tests"\" \ - -DLIBEXECDIR=\""$(libexecdir)"\" \ - -DCD_SYSTEM_PROFILES_DIR="\"$(CD_SYSTEM_PROFILES_DIR)"\" \ - -DPACKAGE_DATA_DIR=\""$(datadir)"\" - -lib_LTLIBRARIES = \ - libcolordprivate.la \ - libcolord.la - -libcolord_includedir = $(includedir)/colord-1 -libcolord_include_HEADERS = \ - colord.h \ - colord-private.h - -libcolordbase_includedir = $(libcolord_includedir)/colord -libcolordbase_include_HEADERS = \ - cd-buffer.h \ - cd-client.h \ - cd-client-sync.h \ - cd-color.h \ - cd-device.h \ - cd-device-sync.h \ - cd-dom.h \ - cd-edid.h \ - cd-enum.h \ - cd-icc.h \ - cd-icc-store.h \ - cd-icc-utils.h \ - cd-interp-akima.h \ - cd-interp-linear.h \ - cd-interp.h \ - cd-it8.h \ - cd-it8-utils.h \ - cd-math.h \ - cd-profile.h \ - cd-profile-sync.h \ - cd-quirk.h \ - cd-sensor.h \ - cd-sensor-sync.h \ - cd-spectrum.h \ - cd-transform.h \ - cd-version.h - -libcolordprivate_la_SOURCES = \ - cd-context-lcms.c \ - cd-context-lcms.h \ - cd-buffer.c \ - cd-color.c \ - cd-dom.c \ - cd-edid.c \ - cd-enum.c \ - cd-icc.c \ - cd-icc-store.c \ - cd-icc-utils.c \ - cd-interp-akima.c \ - cd-interp-linear.c \ - cd-interp.c \ - cd-it8.c \ - cd-it8-utils.c \ - cd-math.c \ - cd-quirk.c \ - cd-spectrum.c \ - cd-transform.c -libcolordprivate_la_LIBADD = \ - $(LIBM) \ - $(UDEV_LIBS) \ - $(LCMS_LIBS) \ - $(GLIB_LIBS) \ - $(GLIB_UNIX_LIBS) -libcolordprivate_la_LDFLAGS = \ - $(PIE_LDFLAGS) \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -export-dynamic \ - -no-undefined \ - -export-symbols-regex '^cd_.*' -libcolordprivate_la_CFLAGS = \ - $(PIE_CFLAGS) \ - $(WARN_CFLAGS) - -libcolord_la_SOURCES = \ - cd-client.c \ - cd-client-sync.c \ - cd-device.c \ - cd-device-sync.c \ - cd-profile.c \ - cd-profile-sync.c \ - cd-sensor.c \ - cd-sensor-sync.c -libcolord_la_LIBADD = \ - $(UDEV_LIBS) \ - $(GLIB_LIBS) \ - $(GLIB_UNIX_LIBS) \ - libcolordprivate.la -libcolord_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -export-dynamic \ - -no-undefined \ - -export-symbols-regex '^cd_.*' -libcolord_la_CFLAGS = \ - $(PIE_CFLAGS) \ - $(WARN_CFLAGS) - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = colord.pc - -TESTS_ENVIRONMENT = \ - libtool --mode=execute valgrind \ - --quiet \ - --leak-check=full \ - --show-possibly-lost=no - -TESTS = \ - cd-test-daemon \ - cd-test-private - -check_PROGRAMS = $(TESTS) - -cd_test_daemon_SOURCES = \ - cd-test-shared.h \ - cd-test-shared.c \ - cd-test-daemon.c - -cd_test_daemon_LDADD = \ - $(GLIB_LIBS) \ - $(GLIB_UNIX_LIBS) \ - $(lib_LTLIBRARIES) - -cd_test_daemon_CFLAGS = $(WARN_CFLAGS) - -cd_test_private_SOURCES = \ - cd-test-shared.h \ - cd-test-shared.c \ - cd-test-private.c - -cd_test_private_LDADD = \ - $(GLIB_LIBS) \ - $(GLIB_UNIX_LIBS) \ - $(UDEV_LIBS) \ - $(LCMS_LIBS) \ - $(lib_LTLIBRARIES) - -cd_test_private_CFLAGS = $(WARN_CFLAGS) - -if BUILDOPT_INSTALL_TESTS -insttestdir = $(libexecdir)/installed-tests/$(PACKAGE) -insttest_PROGRAMS = $(TESTS) -testmetadir = $(datadir)/installed-tests/$(PACKAGE) -testmeta_in_files = \ - colord-daemon.test.in \ - colord-private.test.in -testmeta_DATA = $(testmeta_in_files:.test.in=.test) -colord-daemon.test: colord-daemon.test.in Makefile - @sed -e "s|\@libexecdir\@|$(libexecdir)|g" $< > $@ -colord-private.test: colord-private.test.in Makefile - @sed -e "s|\@libexecdir\@|$(libexecdir)|g" $< > $@ -endif - -EXTRA_DIST = \ - cd-version.h.in \ - colord-daemon.test.in \ - colord.pc.in \ - colord-private.test.in - -MAINTAINERCLEANFILES = \ - $(noinst_LIBRARIES) - -CLEANFILES = $(BUILT_SOURCES) *.log *.trs - -if HAVE_INTROSPECTION -introspection_sources = \ - $(libcolordprivate_la_SOURCES) \ - $(libcolord_la_SOURCES) \ - $(libcolordbase_include_HEADERS) - -Colord-1.0.gir: libcolord.la libcolordprivate.la -Colord_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0 -Colord_1_0_gir_CFLAGS = $(AM_CPPFLAGS) -DCD_DISABLE_DEPRECATED -Colord_1_0_gir_SCANNERFLAGS = --identifier-prefix=Cd \ - --symbol-prefix=cd \ - --warn-all \ - --add-include-path=$(srcdir) \ - --c-include="colord.h" -Colord_1_0_gir_EXPORT_PACKAGES = colord -Colord_1_0_gir_LIBS = libcolord.la libcolordprivate.la -Colord_1_0_gir_FILES = $(introspection_sources) -INTROSPECTION_GIRS += Colord-1.0.gir - -girdir = $(datadir)/gir-1.0 -gir_DATA = $(INTROSPECTION_GIRS) - -typelibdir = $(libdir)/girepository-1.0 -typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) - -CLEANFILES += $(gir_DATA) $(typelib_DATA) *.log *.trs *.test - -if HAVE_VAPIGEN -colord.vapi: Colord-1.0.gir - $(MAKE) $(AM_MAKEFLAGS) Colord-1.0.gir - $(AM_V_GEN)$(VAPIGEN) $(VAPIGENFLAGS) \ - --library colord \ - --pkg gio-2.0 \ - Colord-1.0.gir - touch $@ -vapidir = $(datadir)/vala/vapi -dist_vapi_DATA = \ - colord.vapi -CLEANFILES += $(dist_vapi_DATA) -endif - -endif - -clean-local: - rm -f *~ - --include $(top_srcdir)/git.mk diff --git a/lib/colord/cd-test-private.c b/lib/colord/cd-test-private.c index ba8e246..b41ca4f 100644 --- a/lib/colord/cd-test-private.c +++ b/lib/colord/cd-test-private.c @@ -64,7 +64,11 @@ colord_it8_cri_util_func (void) /* load a CMF */ cmf = cd_it8_new (); - file = g_file_new_for_path ("../../data/cmf/CIE1931-2deg-XYZ.cmf"); + file = g_file_new_for_path ("../build/data/cmf/CIE1931-2deg-XYZ.cmf"); + if (!g_file_query_exists (file, NULL)) { + g_test_skip ("generated files not available"); + return; + } ret = cd_it8_load_from_file (cmf, file, &error); g_assert_no_error (error); g_assert (ret); @@ -73,7 +77,11 @@ colord_it8_cri_util_func (void) /* load the TCS */ tcs = cd_it8_new (); - file = g_file_new_for_path ("../../data/ref/CIE-TCS.sp"); + file = g_file_new_for_path ("../data/ref/CIE-TCS.sp"); + if (!g_file_query_exists (file, NULL)) { + g_test_skip ("generated files not available"); + return; + } ret = cd_it8_load_from_file (tcs, file, &error); g_assert_no_error (error); g_assert (ret); @@ -82,7 +90,11 @@ colord_it8_cri_util_func (void) /* load the test spectra */ test = cd_it8_new (); - file = g_file_new_for_path ("../../data/illuminant/CIE-F4.sp"); + file = g_file_new_for_path ("../build/data/illuminant/CIE-F4.sp"); + if (!g_file_query_exists (file, NULL)) { + g_test_skip ("generated files not available"); + return; + } ret = cd_it8_load_from_file (test, file, &error); g_assert_no_error (error); g_assert (ret); @@ -2404,7 +2416,7 @@ main (int argc, char **argv) g_test_add_func ("/colord/it8{ccmx}", colord_it8_ccmx_func); g_test_add_func ("/colord/it8{ccmx-util}", colord_it8_ccmx_util_func); g_test_add_func ("/colord/it8{spectra-util}", colord_it8_spectra_util_func); -if(0) g_test_add_func ("/colord/it8{cri-util}", colord_it8_cri_util_func); + g_test_add_func ("/colord/it8{cri-util}", colord_it8_cri_util_func); g_test_add_func ("/colord/it8{ccss}", colord_it8_ccss_func); g_test_add_func ("/colord/it8{spect}", colord_it8_spect_func); diff --git a/lib/colord/colord-daemon.test.in b/lib/colord/colord-daemon.test.in index b013435..3e01e7f 100644 --- a/lib/colord/colord-daemon.test.in +++ b/lib/colord/colord-daemon.test.in @@ -1,5 +1,5 @@ [Test] Description=colord daemon tests -Exec=env INSTALLED_TESTS=1 @libexecdir@/installed-tests/colord/cd-test-daemon +Exec=env INSTALLED_TESTS=1 @installedtestsdir@/cd-test-daemon Type=session Output=TAP diff --git a/lib/colord/colord-private.test.in b/lib/colord/colord-private.test.in index f22de37..fc413ec 100644 --- a/lib/colord/colord-private.test.in +++ b/lib/colord/colord-private.test.in @@ -1,5 +1,5 @@ [Test] Description=colord private tests -Exec=env INSTALLED_TESTS=1 @libexecdir@/installed-tests/colord/cd-test-private +Exec=env INSTALLED_TESTS=1 @installedtestsdir@/cd-test-private Type=session Output=TAP diff --git a/lib/colord/colord.map b/lib/colord/colord.map new file mode 100644 index 0000000..0bdb00a --- /dev/null +++ b/lib/colord/colord.map @@ -0,0 +1,6 @@ +{ +global: + cd_*; +local: + *; +}; diff --git a/lib/colord/colord.pc.in b/lib/colord/colord.pc.in deleted file mode 100644 index 604ac16..0000000 --- a/lib/colord/colord.pc.in +++ /dev/null @@ -1,13 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ -daemon_user=@daemon_user@ - -Name: colord -Description: colord is a system daemon for managing color devices -Version: @VERSION@ -Requires.private: @COLORD_REQUIRES_PRIVATE@ -Requires: glib-2.0, gobject-2.0, gio-2.0 -Libs: -L${libdir} -lcolord -lcolordprivate -Cflags: -I${includedir}/colord-1 diff --git a/lib/colord/meson.build b/lib/colord/meson.build new file mode 100644 index 0000000..ed556ca --- /dev/null +++ b/lib/colord/meson.build @@ -0,0 +1,271 @@ +cargs = [ + '-DG_LOG_DOMAIN="libcolord"', +] + +colord_version_h = configure_file( + input : 'cd-version.h.in', + output : 'cd-version.h', + configuration : conf +) + +install_headers( + 'colord.h', + 'colord-private.h', + subdir : 'colord-1', +) + +colord_incdir = include_directories('.') + +install_headers([ + 'cd-buffer.h', + 'cd-client.h', + 'cd-client-sync.h', + 'cd-color.h', + 'cd-device.h', + 'cd-device-sync.h', + 'cd-dom.h', + 'cd-edid.h', + 'cd-enum.h', + 'cd-icc.h', + 'cd-icc-store.h', + 'cd-icc-utils.h', + 'cd-interp-akima.h', + 'cd-interp-linear.h', + 'cd-interp.h', + 'cd-it8.h', + 'cd-it8-utils.h', + 'cd-math.h', + 'cd-profile.h', + 'cd-profile-sync.h', + 'cd-quirk.h', + 'cd-sensor.h', + 'cd-sensor-sync.h', + 'cd-spectrum.h', + 'cd-transform.h', + colord_version_h, + ], + subdir : 'colord-1/colord', +) + +shared_src = [ + 'cd-buffer.c', + 'cd-color.c', + 'cd-context-lcms.c', + 'cd-dom.c', + 'cd-edid.c', + 'cd-enum.c', + 'cd-icc.c', + 'cd-icc-store.c', + 'cd-icc-utils.c', + 'cd-interp-akima.c', + 'cd-interp.c', + 'cd-interp-linear.c', + 'cd-it8.c', + 'cd-it8-utils.c', + 'cd-math.c', + 'cd-quirk.c', + 'cd-spectrum.c', + 'cd-transform.c', +] + +mapfile = 'colord.map' +vflag = '-Wl,--version-script,@0@/@1@'.format(meson.current_source_dir(), mapfile) +colordprivate = shared_library( + 'colordprivate', + sources : shared_src, + soversion : lt_current, + version : lt_version, + dependencies : [ + giounix, + gudev, + lcms, + libm, + libudev, + ], + c_args : [ + cargs, + '-DLOCALSTATEDIR="' + localstatedir + '"', + ], + include_directories : [ + root_incdir, + lib_incdir, + ], + link_args : vflag, + link_depends : mapfile, + install : true +) +colord = shared_library( + 'colord', + sources : [ + 'cd-client.c', + 'cd-client-sync.c', + 'cd-device.c', + 'cd-device-sync.c', + 'cd-profile.c', + 'cd-profile-sync.c', + 'cd-sensor.c', + 'cd-sensor-sync.c', + shared_src, + ], + soversion : lt_current, + version : lt_version, + dependencies : [ + giounix, + gudev, + lcms, + libm, + libudev, + ], + c_args : [ + cargs, + '-DLOCALSTATEDIR="' + localstatedir + '"', + ], + link_with : colordprivate, + include_directories : [ + root_incdir, + lib_incdir, + ], + link_args : vflag, + link_depends : mapfile, + install : true +) + +pkgg = import('pkgconfig') +pkgg.generate( + libraries : colord, + requires : [ 'gio-2.0', 'gobject-2.0' ], + subdirs : 'colord-1', + version : meson.project_version(), + name : 'colord', + filebase : 'colord', + 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-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', + c_args : [ + cargs, + ], + 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('enable-vala') +libfoo_vapi = gnome.generate_vapi('colord', + sources: libcolord_girtarget[0], + install: true, +) +endif + +if get_option('enable-installed-tests') +con2 = configuration_data() +con2.set('installedtestsdir', + join_paths(get_option('prefix'), + get_option('libexecdir'), + 'installed-tests', 'colord')) +configure_file( + input : 'colord-daemon.test.in', + output : 'colord-daemon.test', + configuration : con2, + install: true, + install_dir: join_paths('share', 'installed-tests', 'colord'), +) +configure_file( + input : 'colord-private.test.in', + output : 'colord-private.test', + configuration : con2, + install: true, + install_dir: join_paths('share', 'installed-tests', 'colord'), +) +endif + +if get_option('enable-tests') + testdatadir = join_paths(meson.source_root(), 'data', 'tests') + e = executable( + 'colord-self-test-private', + sources : [ + 'cd-test-private.c', + 'cd-test-shared.h', + 'cd-test-shared.c', + ], + include_directories : [ + root_incdir, + lib_incdir, + ], + dependencies : [ + gio, + lcms, + ], + link_with : colordprivate, + c_args : [ + cargs, + '-DTESTDATADIR="' + testdatadir + '"', + ], + ) + test('colord-self-test-private', e) + e = executable( + 'colord-self-test-daemon', + sources : [ + 'cd-test-daemon.c', + 'cd-test-shared.h', + 'cd-test-shared.c', + ], + include_directories : [ + root_incdir, + lib_incdir, + ], + dependencies : [ + gio, + lcms, + ], + link_with : colord, + c_args : [ + cargs, + '-DTESTDATADIR="' + testdatadir + '"', + ], + ) + test('colord-self-test-daemon', e) +endif diff --git a/lib/colorhug/Makefile.am b/lib/colorhug/Makefile.am deleted file mode 100644 index 7f8a766..0000000 --- a/lib/colorhug/Makefile.am +++ /dev/null @@ -1,148 +0,0 @@ -if HAVE_INTROSPECTION --include $(INTROSPECTION_MAKEFILE) -INTROSPECTION_GIRS = -INTROSPECTION_SCANNER_ARGS = \ - --add-include-path=$(srcdir) \ - --add-include-path=$(top_builddir)/lib/colord -INTROSPECTION_COMPILER_ARGS = \ - --includedir=$(srcdir) \ - --includedir=$(top_builddir)/lib/colord -endif - -AM_CPPFLAGS = \ - $(GLIB_CFLAGS) \ - $(GUSB_CFLAGS) \ - $(LCMS_CFLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/lib \ - -I$(top_srcdir)/lib/colord \ - -I$(top_builddir)/lib \ - -I. \ - -DCD_COMPILATION \ - -DCD_COMPILATION \ - -DG_USB_API_IS_SUBJECT_TO_CHANGE \ - -DG_LOG_DOMAIN=\"Ch\" \ - -DTOP_SRCDIR=\""$(top_srcdir)"\" \ - -DPACKAGE_DATA_DIR=\""$(datadir)"\" - -COLORD_LIBS = \ - $(top_builddir)/lib/colord/libcolordprivate.la - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = \ - colorhug.pc - -lib_LTLIBRARIES = \ - libcolorhug.la - -libcolorhug_includedir = $(includedir)/colord-1/colorhug -libcolorhug_include_HEADERS = \ - ch-common.h \ - ch-device.h \ - ch-device-queue.h \ - ch-hash.h \ - ch-inhx32.h \ - ch-math.h \ - ch-version.h \ - colorhug.h - -libcolorhug_la_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 \ - ch-inhx32.c \ - ch-inhx32.h \ - ch-math.c \ - ch-math.h \ - ch-version.h \ - colorhug.h - -libcolorhug_la_LIBADD = \ - $(GLIB_LIBS) \ - $(GUSB_LIBS) \ - $(COLORD_LIBS) \ - $(GLIB_LIBS) \ - $(LCMS_LIBS) - -libcolorhug_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -export-dynamic \ - -no-undefined \ - -export-symbols-regex '^ch_.*' - -libcolorhug_la_CFLAGS = \ - $(WARN_CFLAGS) - -TESTS_ENVIRONMENT = \ - libtool --mode=execute valgrind \ - --quiet \ - --leak-check=full \ - --show-possibly-lost=no - -check_PROGRAMS = \ - ch-self-test - -ch_self_test_SOURCES = \ - ch-self-test.c - -ch_self_test_LDADD = \ - $(top_builddir)/lib/colord/libcolordprivate.la \ - $(GLIB_LIBS) \ - $(SELFTEST_LIBS) \ - $(LCMS_LIBS) \ - $(lib_LTLIBRARIES) \ - $(GUSB_LIBS) - -ch_self_test_CFLAGS = -DEGG_TEST $(AM_CFLAGS) $(WARN_CFLAGS) - -TESTS = ch-self-test - -CLEANFILES = *.log *.trs - -if HAVE_INTROSPECTION -introspection_sources = \ - ch-common.c \ - ch-common.h \ - ch-device.c \ - ch-device.h \ - ch-hash.c \ - ch-hash.h \ - ch-device-queue.c \ - ch-device-queue.h - -ColorHug-1.0.gir: libcolorhug.la -ColorHug_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0 GUsb-1.0 Colord-1.0 -ColorHug_1_0_gir_CFLAGS = $(AM_CPPFLAGS) -ColorHug_1_0_gir_SCANNERFLAGS = --identifier-prefix=Ch \ - --symbol-prefix=ch \ - --warn-all \ - --add-include-path=$(srcdir) \ - --c-include="colorhug.h" -ColorHug_1_0_gir_EXPORT_PACKAGES = colorhug -ColorHug_1_0_gir_LIBS = libcolorhug.la -ColorHug_1_0_gir_FILES = $(introspection_sources) -INTROSPECTION_GIRS += ColorHug-1.0.gir - -girdir = $(datadir)/gir-1.0 -gir_DATA = $(INTROSPECTION_GIRS) - -typelibdir = $(libdir)/girepository-1.0 -typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) - -CLEANFILES += $(gir_DATA) $(typelib_DATA) -endif - -EXTRA_DIST = \ - ch-version.h.in \ - colorhug.pc.in - -clean-local: - rm -f *~ - rm -f $(CLEANFILES) - --include $(top_srcdir)/git.mk diff --git a/lib/colorhug/colorhug.map b/lib/colorhug/colorhug.map new file mode 100644 index 0000000..d2df9dc --- /dev/null +++ b/lib/colorhug/colorhug.map @@ -0,0 +1,6 @@ +{ +global: + ch_*; +local: + *; +}; diff --git a/lib/colorhug/colorhug.pc.in b/lib/colorhug/colorhug.pc.in deleted file mode 100644 index 8bda3db..0000000 --- a/lib/colorhug/colorhug.pc.in +++ /dev/null @@ -1,13 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: colorhug -Description: ColorHug is a simple display hardware colorimeter -Version: @VERSION@ -Requires.private: gthread-2.0 -Requires: glib-2.0, gobject-2.0, gusb, colord -Libs: -L${libdir} -lcolorhug -Cflags: -I${includedir}/colord-1/colorhug - diff --git a/lib/colorhug/meson.build b/lib/colorhug/meson.build new file mode 100644 index 0000000..78868cf --- /dev/null +++ b/lib/colorhug/meson.build @@ -0,0 +1,132 @@ +cargs = [ + '-DG_LOG_DOMAIN="libcolorhug"', +] + +colorhug_version_h = configure_file( + input : 'ch-version.h.in', + output : 'ch-version.h', + configuration : conf, + install : true, + install_dir: join_paths(get_option('includedir'), 'colord-1/colorhug'), +) + +install_headers( + 'ch-common.h', + 'ch-device.h', + 'ch-device-queue.h', + 'ch-hash.h', + 'ch-inhx32.h', + 'ch-math.h', + 'colorhug.h', + subdir : 'colord-1/colorhug', +) + +mapfile = 'colorhug.map' +vflag = '-Wl,--version-script,@0@/@1@'.format(meson.current_source_dir(), mapfile) +colorhug = shared_library( + 'colorhug', + sources : [ + 'ch-common.c', + 'ch-device.c', + 'ch-device-queue.c', + 'ch-hash.c', + 'ch-inhx32.c', + 'ch-math.c', + ], + soversion : lt_current, + version : lt_version, + dependencies : [ + giounix, + gusb, + lcms, + libm, + libudev, + ], + c_args : [ + cargs, + '-DLOCALSTATEDIR="' + localstatedir + '"', + ], + link_with : colordprivate, + include_directories : [ + colord_incdir, + lib_incdir, + root_incdir, + ], + link_args : vflag, + link_depends : mapfile, + install : true +) + +pkgg = import('pkgconfig') +pkgg.generate( + libraries : colorhug, + requires : [ 'gio-2.0', 'gobject-2.0', 'gusb', 'colord' ], + subdirs : 'colord-1/colorhug', + version : meson.project_version(), + name : 'colorhug', + filebase : 'colorhug', + 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', + c_args : [ + cargs, + ], + link_with : colorhug, + dependencies : [ + gio, + glib, + lcms, + ], + includes : [ + 'Gio-2.0', + 'GObject-2.0', + 'GUsb-1.0', + libcolord_gir, + ], + install : true +) + +if get_option('enable-tests') + testdatadir = join_paths(meson.source_root(), 'data', 'tests') + e = executable( + 'ch-self-test', + sources : [ + 'ch-self-test.c', + ], + include_directories : [ + colord_incdir, + lib_incdir, + root_incdir, + ], + dependencies : [ + gio, + gusb, + lcms, + ], + link_with : [ + colordprivate, + colorhug, + ], + c_args : [ + cargs, + '-DTESTDATADIR="' + testdatadir + '"', + ], + ) + test('colorhug-self-test', e) +endif diff --git a/lib/compat/Makefile.am b/lib/compat/Makefile.am deleted file mode 100644 index a007bd2..0000000 --- a/lib/compat/Makefile.am +++ /dev/null @@ -1,42 +0,0 @@ -AM_CPPFLAGS = \ - $(GLIB_CFLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/lib \ - -I$(top_srcdir)/lib/colord \ - -I$(top_builddir)/lib \ - -I. \ - -DCD_COMPILATION \ - -DG_LOG_DOMAIN=\"Cd\" - -COLORD_LIBS = \ - $(top_builddir)/lib/colord/libcolord.la - -lib_LTLIBRARIES = \ - libcolordcompat.la - -libcolordcompat_includedir = $(includedir)/colord-1/colord -libcolordcompat_include_HEADERS = \ - cd-compat-edid.h - -libcolordcompat_la_SOURCES = \ - cd-compat-edid.c \ - cd-compat-edid.h - -libcolordcompat_la_LIBADD = \ - $(GLIB_LIBS) \ - $(COLORD_LIBS) - -libcolordcompat_la_LDFLAGS = \ - -avoid-version \ - -export-dynamic \ - -no-undefined \ - -export-symbols-regex '^cd_.*' - -libcolordcompat_la_CFLAGS = \ - $(WARN_CFLAGS) - -clean-local: - rm -f *~ - rm -f $(CLEANFILES) - --include $(top_srcdir)/git.mk diff --git a/lib/compat/meson.build b/lib/compat/meson.build new file mode 100644 index 0000000..5963801 --- /dev/null +++ b/lib/compat/meson.build @@ -0,0 +1,23 @@ +install_headers( + 'cd-compat-edid.h', + subdir : 'colord-1/colord', +) + +shared_module('colordcompat', + sources : [ + 'cd-compat-edid.c', + ], + include_directories : [ + colord_incdir, + lib_incdir, + root_incdir, + ], + install : true, + install_dir: get_option('libdir'), + c_args : cargs, + link_with : colord, + dependencies : [ + gio, + gudev, + ], +) diff --git a/lib/meson.build b/lib/meson.build new file mode 100644 index 0000000..8c3e545 --- /dev/null +++ b/lib/meson.build @@ -0,0 +1,8 @@ +lib_incdir = include_directories('.') + +subdir('colord') +subdir('colorhug') + +if get_option('enable-libcolordcompat') + subdir('compat') +endif diff --git a/m4/.gitignore b/m4/.gitignore deleted file mode 100644 index 0f4126c..0000000 --- a/m4/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.m4 diff --git a/m4/as-linguas.m4 b/m4/as-linguas.m4 deleted file mode 100644 index 92b28f7..0000000 --- a/m4/as-linguas.m4 +++ /dev/null @@ -1,24 +0,0 @@ -# Set ALL_ALL_LINGUAS based on the .po files present. Optional argument is the -# name of the po directory. $podir/LINGUAS.ignore can be used to ignore a -# subset of the po files. - -AC_DEFUN([AS_ALL_LINGUAS], -[ - AC_MSG_CHECKING([for linguas]) - podir="m4_default([$1],[$srcdir/po])" - linguas=`cd $podir && ls *.po 2>/dev/null | awk 'BEGIN { FS="."; ORS=" " } { print $[]1 }'` - if test -f "$podir/LINGUAS.ignore"; then - ALL_LINGUAS=""; - ignore_linguas=`sed -n -e 's/^\s\+\|\s\+$//g' -e '/^#/b' -e '/\S/!b' \ - -e 's/\s\+/\n/g' -e p "$podir/LINGUAS.ignore"`; - for lang in $linguas; do - if ! echo "$ignore_linguas" | grep -q "^${lang}$"; then - ALL_LINGUAS="$ALL_LINGUAS $lang"; - fi; - done; - else - ALL_LINGUAS="$linguas"; - fi; - AC_SUBST([ALL_LINGUAS]) - AC_MSG_RESULT($ALL_LINGUAS) -]) diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 deleted file mode 100644 index c3a8d69..0000000 --- a/m4/ax_check_compile_flag.m4 +++ /dev/null @@ -1,72 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS]) -# -# DESCRIPTION -# -# Check whether the given FLAG works with the current language's compiler -# or gives an error. (Warnings, however, are ignored) -# -# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on -# success/failure. -# -# If EXTRA-FLAGS is defined, it is added to the current language's default -# flags (e.g. CFLAGS) when the check is done. The check is thus made with -# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to -# force the compiler to issue an error when a bad flag is given. -# -# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this -# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. -# -# LICENSE -# -# Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de> -# Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com> -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see <http://www.gnu.org/licenses/>. -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -#serial 2 - -AC_DEFUN([AX_CHECK_COMPILE_FLAG], -[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX -AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl -AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ - ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS - _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], - [AS_VAR_SET(CACHEVAR,[yes])], - [AS_VAR_SET(CACHEVAR,[no])]) - _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) -AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes], - [m4_default([$2], :)], - [m4_default([$3], :)]) -AS_VAR_POPDEF([CACHEVAR])dnl -])dnl AX_CHECK_COMPILE_FLAGS diff --git a/m4/ax_check_define.m4 b/m4/ax_check_define.m4 deleted file mode 100644 index 4bc6948..0000000 --- a/m4/ax_check_define.m4 +++ /dev/null @@ -1,92 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_check_define.html -# =========================================================================== -# -# SYNOPSIS -# -# AC_CHECK_DEFINE([symbol], [ACTION-IF-FOUND], [ACTION-IF-NOT]) -# AX_CHECK_DEFINE([includes],[symbol], [ACTION-IF-FOUND], [ACTION-IF-NOT]) -# -# DESCRIPTION -# -# Complements AC_CHECK_FUNC but it does not check for a function but for a -# define to exist. Consider a usage like: -# -# AC_CHECK_DEFINE(__STRICT_ANSI__, CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500") -# -# LICENSE -# -# Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de> -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation; either version 3 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see <http://www.gnu.org/licenses/>. -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -#serial 8 - -AU_ALIAS([AC_CHECK_DEFINED], [AC_CHECK_DEFINE]) -AC_DEFUN([AC_CHECK_DEFINE],[ -AS_VAR_PUSHDEF([ac_var],[ac_cv_defined_$1])dnl -AC_CACHE_CHECK([for $1 defined], ac_var, -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ - #ifdef $1 - int ok; - #else - choke me - #endif -]])],[AS_VAR_SET(ac_var, yes)],[AS_VAR_SET(ac_var, no)])) -AS_IF([test AS_VAR_GET(ac_var) != "no"], [$2], [$3])dnl -AS_VAR_POPDEF([ac_var])dnl -]) - -AU_ALIAS([AX_CHECK_DEFINED], [AX_CHECK_DEFINE]) -AC_DEFUN([AX_CHECK_DEFINE],[ -AS_VAR_PUSHDEF([ac_var],[ac_cv_defined_$2_$1])dnl -AC_CACHE_CHECK([for $2 defined in $1], ac_var, -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <$1>]], [[ - #ifdef $2 - int ok; - #else - choke me - #endif -]])],[AS_VAR_SET(ac_var, yes)],[AS_VAR_SET(ac_var, no)])) -AS_IF([test AS_VAR_GET(ac_var) != "no"], [$3], [$4])dnl -AS_VAR_POPDEF([ac_var])dnl -]) - -AC_DEFUN([AX_CHECK_FUNC], -[AS_VAR_PUSHDEF([ac_var], [ac_cv_func_$2])dnl -AC_CACHE_CHECK([for $2], ac_var, -dnl AC_LANG_FUNC_LINK_TRY -[AC_LINK_IFELSE([AC_LANG_PROGRAM([$1 - #undef $2 - char $2 ();],[ - char (*f) () = $2; - return f != $2; ])], - [AS_VAR_SET(ac_var, yes)], - [AS_VAR_SET(ac_var, no)])]) -AS_IF([test AS_VAR_GET(ac_var) = yes], [$3], [$4])dnl -AS_VAR_POPDEF([ac_var])dnl -])# AC_CHECK_FUNC diff --git a/m4/ax_check_link_flag.m4 b/m4/ax_check_link_flag.m4 deleted file mode 100644 index e2d0d36..0000000 --- a/m4/ax_check_link_flag.m4 +++ /dev/null @@ -1,71 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_check_link_flag.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_CHECK_LINK_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS]) -# -# DESCRIPTION -# -# Check whether the given FLAG works with the linker or gives an error. -# (Warnings, however, are ignored) -# -# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on -# success/failure. -# -# If EXTRA-FLAGS is defined, it is added to the linker's default flags -# when the check is done. The check is thus made with the flags: "LDFLAGS -# EXTRA-FLAGS FLAG". This can for example be used to force the linker to -# issue an error when a bad flag is given. -# -# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this -# macro in sync with AX_CHECK_{PREPROC,COMPILE}_FLAG. -# -# LICENSE -# -# Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de> -# Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com> -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see <http://www.gnu.org/licenses/>. -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -#serial 2 - -AC_DEFUN([AX_CHECK_LINK_FLAG], -[AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_ldflags_$4_$1])dnl -AC_CACHE_CHECK([whether the linker accepts $1], CACHEVAR, [ - ax_check_save_flags=$LDFLAGS - LDFLAGS="$LDFLAGS $4 $1" - AC_LINK_IFELSE([AC_LANG_PROGRAM()], - [AS_VAR_SET(CACHEVAR,[yes])], - [AS_VAR_SET(CACHEVAR,[no])]) - LDFLAGS=$ax_check_save_flags]) -AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes], - [m4_default([$2], :)], - [m4_default([$3], :)]) -AS_VAR_POPDEF([CACHEVAR])dnl -])dnl AX_CHECK_LINK_FLAGS diff --git a/m4/gnome-compiler-flags.m4 b/m4/gnome-compiler-flags.m4 deleted file mode 100644 index 49ebb95..0000000 --- a/m4/gnome-compiler-flags.m4 +++ /dev/null @@ -1,184 +0,0 @@ -# gnome-compiler-flags.m4 -# -# serial 4 -# - -dnl GNOME_COMPILE_WARNINGS -dnl Turn on many useful compiler warnings and substitute the result into -dnl WARN_CFLAGS -dnl For now, only works on GCC -dnl Pass the default value of the --enable-compile-warnings configure option as -dnl the first argument to the macro, defaulting to 'yes'. -dnl Additional warning/error flags can be passed as an optional second argument. -dnl -dnl For example: GNOME_COMPILE_WARNINGS([maximum],[-Werror=some-flag -Wfoobar]) -AU_DEFUN([GNOME_COMPILE_WARNINGS],[ - dnl ****************************** - dnl More compiler warnings - dnl ****************************** - - AC_ARG_ENABLE(compile-warnings, - AS_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], - [Turn on compiler warnings]),, - [enable_compile_warnings="m4_default([$1],[yes])"]) - - if test "x$GCC" != xyes; then - enable_compile_warnings=no - fi - - warning_flags= - realsave_CFLAGS="$CFLAGS" - - dnl These are warning flags that aren't marked as fatal. Can be - dnl overridden on a per-project basis with -Wno-foo. - base_warn_flags=" \ - -Wall \ - -Wstrict-prototypes \ - -Wnested-externs \ - " - - dnl These compiler flags typically indicate very broken or suspicious - dnl code. Some of them such as implicit-function-declaration are - dnl just not default because gcc compiles a lot of legacy code. - dnl We choose to make this set into explicit errors. - base_error_flags=" \ - -Werror=missing-prototypes \ - -Werror=implicit-function-declaration \ - -Werror=pointer-arith \ - -Werror=init-self \ - -Werror=format-security \ - -Werror=format=2 \ - -Werror=missing-include-dirs \ - -Werror=return-type \ - " - - dnl Additional warning or error flags provided by the module author to - dnl allow stricter standards to be imposed on a per-module basis. - dnl The author can pass -W or -Werror flags here as they see fit. - additional_flags="m4_default([$2],[])" - - case "$enable_compile_warnings" in - no) - warning_flags="-w" - ;; - minimum) - warning_flags="-Wall" - ;; - yes|maximum|error) - warning_flags="$base_warn_flags $base_error_flags $additional_flags" - ;; - *) - AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) - ;; - esac - - if test "$enable_compile_warnings" = "error" ; then - warning_flags="$warning_flags -Werror" - fi - - dnl Check whether GCC supports the warning options - for option in $warning_flags; do - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $option" - AC_MSG_CHECKING([whether gcc understands $option]) - AC_TRY_COMPILE([], [], - has_option=yes, - has_option=no,) - CFLAGS="$save_CFLAGS" - AC_MSG_RESULT([$has_option]) - if test $has_option = yes; then - tested_warning_flags="$tested_warning_flags $option" - fi - unset has_option - unset save_CFLAGS - done - unset option - CFLAGS="$realsave_CFLAGS" - AC_MSG_CHECKING(what warning flags to pass to the C compiler) - AC_MSG_RESULT($tested_warning_flags) - - AC_ARG_ENABLE(iso-c, - AS_HELP_STRING([--enable-iso-c], - [Try to warn if code is not ISO C ]),, - [enable_iso_c=no]) - - AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) - complCFLAGS= - if test "x$enable_iso_c" != "xno"; then - if test "x$GCC" = "xyes"; then - case " $CFLAGS " in - *[\ \ ]-ansi[\ \ ]*) ;; - *) complCFLAGS="$complCFLAGS -ansi" ;; - esac - case " $CFLAGS " in - *[\ \ ]-pedantic[\ \ ]*) ;; - *) complCFLAGS="$complCFLAGS -pedantic" ;; - esac - fi - fi - AC_MSG_RESULT($complCFLAGS) - - WARN_CFLAGS="$tested_warning_flags $complCFLAGS" - AC_SUBST(WARN_CFLAGS) -], -[[$0: This macro is deprecated. You should use AX_COMPILER_FLAGS instead and -eliminate use of --enable-iso-c. -See: http://www.gnu.org/software/autoconf-archive/ax_compiler_flags.html#ax_compiler_flags]]) - -dnl For C++, do basically the same thing. - -AU_DEFUN([GNOME_CXX_WARNINGS],[ - AC_ARG_ENABLE(cxx-warnings, - AS_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] - [Turn on compiler warnings.]),, - [enable_cxx_warnings="m4_default([$1],[minimum])"]) - - AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) - warnCXXFLAGS= - if test "x$GXX" != xyes; then - enable_cxx_warnings=no - fi - if test "x$enable_cxx_warnings" != "xno"; then - if test "x$GXX" = "xyes"; then - case " $CXXFLAGS " in - *[\ \ ]-Wall[\ \ ]*) ;; - *) warnCXXFLAGS="-Wall -Wno-unused" ;; - esac - - ## -W is not all that useful. And it cannot be controlled - ## with individual -Wno-xxx flags, unlike -Wall - if test "x$enable_cxx_warnings" = "xyes"; then - warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual" - fi - fi - fi - AC_MSG_RESULT($warnCXXFLAGS) - - AC_ARG_ENABLE(iso-cxx, - AS_HELP_STRING([--enable-iso-cxx], - [Try to warn if code is not ISO C++ ]),, - [enable_iso_cxx=no]) - - AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) - complCXXFLAGS= - if test "x$enable_iso_cxx" != "xno"; then - if test "x$GXX" = "xyes"; then - case " $CXXFLAGS " in - *[\ \ ]-ansi[\ \ ]*) ;; - *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; - esac - - case " $CXXFLAGS " in - *[\ \ ]-pedantic[\ \ ]*) ;; - *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; - esac - fi - fi - AC_MSG_RESULT($complCXXFLAGS) - - WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" - AC_SUBST(WARN_CXXFLAGS) -], -[[$0: This macro is deprecated. You should use AX_COMPILER_FLAGS instead and -eliminate use of --enable-iso-cxx. -See: http://www.gnu.org/software/autoconf-archive/ax_compiler_flags.html#ax_compiler_flags]]) diff --git a/man/Makefile.am b/man/Makefile.am deleted file mode 100644 index 8c6e94e..0000000 --- a/man/Makefile.am +++ /dev/null @@ -1,45 +0,0 @@ -man_MANS_DIST = \ - colormgr.1 \ - cd-create-profile.1 \ - cd-fix-profile.1 \ - cd-it8.1 - -EXTRA_DIST = \ - colormgr.sgml \ - cd-create-profile.sgml \ - cd-fix-profile.sgml \ - cd-it8.sgml \ - $(man_MANS_DIST) - -if HAVE_DOCBOOK2MAN -man_MANS = \ - $(man_MANS_DIST) -endif - -if HAVE_DOCBOOK2MAN -colormgr.1: colormgr.sgml - $(AM_V_GEN) \ - docbook2man $? > /dev/null -cd-create-profile.1: cd-create-profile.sgml - $(AM_V_GEN) \ - docbook2man $? > /dev/null -cd-fix-profile.1: cd-fix-profile.sgml - $(AM_V_GEN) \ - docbook2man $? > /dev/null -cd-it8.1: cd-it8.sgml - $(AM_V_GEN) \ - docbook2man $? > /dev/null -endif - -MAINTAINERCLEANFILES = \ - manpage.links \ - manpage.log \ - manpage.refs \ - $(man_MANS) - -clean-local : - rm -f *~ - rm -f *.1 - rm -f manpage.* - --include $(top_srcdir)/git.mk diff --git a/man/meson.build b/man/meson.build new file mode 100644 index 0000000..f277959 --- /dev/null +++ b/man/meson.build @@ -0,0 +1,41 @@ +docbook2man = find_program('docbook2man') +custom_target('colormgr-man', + input : 'colormgr.sgml', + output : 'colormgr.1', + command : [ + docbook2man, '@INPUT@', + '--output', meson.current_build_dir(), + ], + install : true, + install_dir : join_paths(get_option('mandir'), 'man1'), +) +custom_target('cd-create-profile-man', + input : 'cd-create-profile.sgml', + output : 'cd-create-profile.1', + command : [ + docbook2man, '@INPUT@', + '--output', meson.current_build_dir(), + ], + install : true, + install_dir : join_paths(get_option('mandir'), 'man1'), +) +custom_target('cd-fix-profile-man', + input : 'cd-fix-profile.sgml', + output : 'cd-fix-profile.1', + command : [ + docbook2man, '@INPUT@', + '--output', meson.current_build_dir(), + ], + install : true, + install_dir : join_paths(get_option('mandir'), 'man1'), +) +custom_target('cd-it8-man', + input : 'cd-it8.sgml', + output : 'cd-it8.1', + command : [ + docbook2man, '@INPUT@', + '--output', meson.current_build_dir(), + ], + install : true, + install_dir : join_paths(get_option('mandir'), 'man1'), +) diff --git a/meson.build b/meson.build new file mode 100644 index 0000000..ba08e0c --- /dev/null +++ b/meson.build @@ -0,0 +1,251 @@ +project('colord', 'c', + version : '1.4.0', + license : 'LGPL-2.1+', + meson_version : '>=0.37.0' +) + +colord_version = meson.project_version() +varr = colord_version.split('.') +colord_major_version = varr[0] +colord_minor_version = varr[1] +colord_micro_version = varr[2] + +conf = configuration_data() +conf.set('FWUPD_MAJOR_VERSION', colord_major_version) +conf.set('FWUPD_MINOR_VERSION', colord_minor_version) +conf.set('FWUPD_MICRO_VERSION', colord_micro_version) +conf.set_quoted('PACKAGE_VERSION', colord_version) + +# libtool versioning - this applies to libcolord +# +# See http://sources.redhat.com/autobook/autobook/autobook_91.html#SEC91 for details +# +# - If interfaces have been changed or added, but binary compatibility +# has been preserved, change: +# CURRENT += 1 +# REVISION = 0 +# AGE += 1 +# - If binary compatibility has been broken (eg removed or changed +# interfaces), change: +# CURRENT += 1 +# REVISION = 0 +# AGE = 0 +# - If the interface is the same as the previous version, but bugs are +# fixed, change: +# REVISION += 1 +lt_current = '2' +lt_revision = '5' +lt_age = '0' +lt_version = '@0@.@1@.@2@'.format(lt_current, lt_age, lt_revision) + +# get suported warning flags +test_args = [ + '-fstack-protector-strong', + '-Waggregate-return', + '-Wunused', + '-Warray-bounds', + '-Wcast-align', + '-Wclobbered', + '-Wdeclaration-after-statement', + '-Wempty-body', + '-Wextra', + '-Wformat=2', + '-Wformat-nonliteral', + '-Wformat-security', + '-Wformat-signedness', + '-Wignored-qualifiers', + '-Wimplicit-function-declaration', + '-Winit-self', + '-Wmissing-declarations', + '-Wmissing-format-attribute', + '-Wmissing-include-dirs', + '-Wmissing-noreturn', + '-Wmissing-parameter-type', + '-Wmissing-prototypes', + '-Wnested-externs', + '-Wno-discarded-qualifiers', + '-Wno-missing-field-initializers', + '-Wno-strict-aliasing', + '-Wno-suggest-attribute=format', + '-Wno-unused-parameter', + '-Wold-style-definition', + '-Woverride-init', + '-Wpointer-arith', + '-Wreturn-type', + '-Wshadow', + '-Wsign-compare', + '-Wstrict-aliasing', + '-Wstrict-prototypes', + '-Wswitch-default', + '-Wtype-limits', + '-Wundef', + '-Wuninitialized', + '-Wunused-but-set-variable', + '-Wwrite-strings' +] +cc = meson.get_compiler('c') +foreach arg: test_args + if cc.has_argument(arg) + add_project_arguments(arg, language : 'c') + endif +endforeach + +# enable full RELRO where possible +# FIXME: until https://github.com/mesonbuild/meson/issues/1140 is fixed +global_link_args = [] +test_link_args = [ + '-Wl,-z,relro', + '-Wl,-z,now', +] +foreach arg: test_link_args + if cc.has_argument(arg) + global_link_args += arg + endif +endforeach +add_global_link_arguments( + global_link_args, + language: 'c' +) + +gio = dependency('gio-2.0', version : '>= 2.45.8') +glib = dependency('glib-2.0') +gmodule = dependency('gmodule-2.0') +giounix = dependency('gio-unix-2.0', version : '>= 2.45.8') +lcms = dependency('lcms2', version : '>= 2.6') +sqlite = dependency('sqlite3') +systemd = dependency('systemd') +libsystemd = dependency('libsystemd') +gusb = dependency('gusb', version : '>= 0.2.7') +gudev = dependency('gudev-1.0') +libm = cc.find_library('m', required: false) +udev = dependency('udev') +libudev = dependency('libudev') + +if cc.has_header('pwd.h') + conf.set('HAVE_PWD_H', '1') +endif +if cc.has_header('syslog.h') + conf.set('HAVE_SYSLOG_H', '1') +endif +if cc.has_header('unistd.h') + conf.set('HAVE_UNISTD_H', '1') +endif +if cc.has_function('getuid', prefix : '#include<unistd.h>') + conf.set('HAVE_GETUID', '1') +endif + +if get_option('enable-libcolordcompat') + conf.set('BUILD_LIBCOLORDCOMPAT', '1') +endif +if get_option('enable-session-example') + gnome_desktop = dependency('gnome-desktop-3.0', version : '>= 0.2.7') + colord_gtk = dependency('colord-gtk', version : '>= 0.1.24') +endif +if get_option('enable-bash-completion') + bash_completion = dependency('bash-completion', version : '>= 2.0') +endif + +if get_option('enable-sane') + sane = dependency('sane-backends') + dbus = dependency('dbus-1') + conf.set('HAVE_SANE', '1') +endif + +if get_option('enable-argyllcms-sensor') + spotread = find_program('spotread') + conf.set('HAVE_ARGYLLCMS_SENSOR', '1') +endif + +if get_option('enable-print-profiles') + colprof = find_program('colprof') + conf.set_quoted('TOOL_COLPROF', colprof.path()) +endif + +if get_option('enable-vala') + vapigen = find_program('vapigen') +endif + +if get_option('enable-reverse') + conf.set('CD_BUILD_REVERSE', '1') +endif + +conf.set_quoted('DAEMON_USER', get_option('with-daemon-user')) +if get_option('with-daemon-user') == 'root' + message('RUNNING THIS AS root IS NOT A GOOD IDEA SEE --with-daemon-user') +endif + +polkit = dependency('polkit-gobject-1', version : '>= 0.103') +if polkit.version().version_compare('>= 0.114') + conf.set('POLKIT_HAS_AUTOPTR_MACROS', '1') +endif + +if meson.version().version_compare('>0.41.0') + valgrind = dependency('valgrind', required: false) +else + valgrind = dependency('valgrindXXX', required: false) +endif + +if valgrind.found() + conf.set('HAVE_VALGRIND', '1') +endif + +gnome = import('gnome') +i18n = import('i18n') + +add_project_arguments('-DCD_COMPILATION', language: 'c') + +conf.set_quoted('SYSCONFDIR', get_option('sysconfdir')) +conf.set_quoted('BINDIR', + join_paths(get_option('prefix'), + get_option('bindir'))) +conf.set_quoted('LIBDIR', + join_paths(get_option('prefix'), + get_option('libdir'))) +conf.set_quoted('DATADIR', + join_paths(get_option('prefix'), + get_option('datadir'))) +conf.set_quoted('LIBEXECDIR', + join_paths(get_option('prefix'), + get_option('libexecdir'))) +conf.set_quoted('LOCALSTATEDIR', + join_paths(get_option('prefix'), + get_option('localstatedir'))) + +cd_system_profiles_dir = join_paths(get_option('prefix'), + get_option('localstatedir'), + 'lib', 'colord', 'icc') +conf.set_quoted('CD_SYSTEM_PROFILES_DIR', cd_system_profiles_dir) + +conf.set_quoted('GETTEXT_PACKAGE', meson.project_name()) +conf.set_quoted('PACKAGE_NAME', meson.project_name()) +conf.set_quoted('VERSION', meson.project_version()) +conf.set_quoted('LOCALEDIR', get_option('localedir')) +configure_file( + output : 'config.h', + configuration : conf +) + +localstatedir = join_paths(get_option('prefix'), + get_option('localstatedir')) + +root_incdir = include_directories('.') + +subdir('lib') +subdir('po') + +# this needs libcolord +subdir('client') +subdir('contrib') +subdir('doc') + +# this needs client/cd-create-profile +subdir('data') + +# this needs data/profiles/*.icc +subdir('man') +subdir('policy') +subdir('rules') +subdir('src') + +meson.add_install_script('meson_post_install.sh', + localstatedir, get_option('with-daemon-user')) diff --git a/meson_options.txt b/meson_options.txt new file mode 100644 index 0000000..1a49d0d --- /dev/null +++ b/meson_options.txt @@ -0,0 +1,11 @@ +option('enable-session-example', type : 'boolean', value : false, description : 'Enable session example') +option('enable-bash-completion', type : 'boolean', value : true, description : 'Enable bash completion') +option('enable-libcolordcompat', type : 'boolean', value : false, description : 'Enable libcolordcompat.so which is used by ArgyllCMS') +option('enable-argyllcms-sensor', type : 'boolean', value : true, description : 'Enable ArgllCMS sensor') +option('enable-reverse', type : 'boolean', value : false, description : 'Enable reverse engineering tools') +option('enable-sane', type : 'boolean', value : false, description : 'Enable SANE support') +option('enable-vala', type : 'boolean', value : false, description : 'Build vala bindings') +option('enable-print-profiles', type : 'boolean', value : false, description : 'Build extra print profiles') +option('enable-tests', type : 'boolean', value : true, description : 'Build self tests') +option('enable-installed-tests', type : 'boolean', value : false, description : 'Install tests') +option('with-daemon-user', type : 'string', value : 'root', description : 'User for running the colord daemon') diff --git a/meson_post_install.sh b/meson_post_install.sh new file mode 100644 index 0000000..7904473 --- /dev/null +++ b/meson_post_install.sh @@ -0,0 +1,16 @@ +#!/bin/sh +if [ -z $MESON_INSTALL_PREFIX ]; then + echo 'This is meant to be ran from Meson only!' + exit 1 +fi + +localstatedir=$1 +daemon_user=$2 + +echo 'Creating stateful directory' +mkdir -p ${DESTDIR}${localstatedir}/lib/colord/icc +ls -l ${DESTDIR}${localstatedir}/lib +if [ `id -u` = 0 ] ; then + chown ${daemon_user} ${DESTDIR}${localstatedir}/lib/colord + chmod 0755 ${DESTDIR}${localstatedir}/lib/colord +fi diff --git a/po/LINGUAS b/po/LINGUAS new file mode 100644 index 0000000..d856253 --- /dev/null +++ b/po/LINGUAS @@ -0,0 +1,50 @@ +as +bn_IN +ca +cs +da +de +el +en_GB +eo +es +eu +fi +fr +gl +gu +he +hi +hu +id +is +it +ja +kk +kn +ko +lt +lv +ml +mr +nb +nl +oc +or +pa +pl +pt_BR +pt +ro +ru +sk +sl +sr@latin +sr +sv +ta +th +tr +uk +zh_CN +zh_TW diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 30a13cd..52340c4 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -1,3 +1,2 @@ -contrib/session-helper/cd-debug.c contrib/session-helper/cd-example.ui policy/org.freedesktop.color.policy.in diff --git a/po/meson.build b/po/meson.build new file mode 100644 index 0000000..6b9a7bc --- /dev/null +++ b/po/meson.build @@ -0,0 +1,6 @@ +i18n.gettext(meson.project_name(), + preset : 'glib', + args: [ + '--default-domain=' + meson.project_name(), + ] +) diff --git a/policy/Makefile.am b/policy/Makefile.am deleted file mode 100644 index 14e01ae..0000000 --- a/policy/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -org.freedesktop.color.policy.in: org.freedesktop.color.policy.in.in Makefile - $(AM_V_GEN)if test "x$(daemon_user)" != "xroot"; then \ - sed -e "s|<!--@ANNOTATE_OWNER@-->|<annotate key=\"org.freedesktop.policykit.owner\">unix-user:$(daemon_user)</annotate>|g" $< > $@ ; \ - else \ - sed -e "/^\s*<!--@ANNOTATE_OWNER@-->\s*$$/d;s|<!--@ANNOTATE_OWNER@-->||g" $< > $@ ; \ - fi - -@INTLTOOL_POLICY_RULE@ -polkit_policydir = $(datadir)/polkit-1/actions -polkit_policy_in_files = org.freedesktop.color.policy.in -polkit_policy_DATA = $(polkit_policy_in_files:.policy.in=.policy) -#polkit_policy_DATA = \ -# org.freedesktop.color.policy - -EXTRA_DIST = org.freedesktop.color.policy.in.in -CLEANFILES = \ - org.freedesktop.color.policy \ - org.freedesktop.color.policy.in - --include $(top_srcdir)/git.mk diff --git a/policy/meson.build b/policy/meson.build new file mode 100644 index 0000000..7aaffae --- /dev/null +++ b/policy/meson.build @@ -0,0 +1,15 @@ +con2 = configuration_data() +con2.set('DAEMON_USER', get_option('with-daemon-user')) +policy_in = configure_file( + input : 'org.freedesktop.color.policy.in.in', + output : 'org.freedesktop.color.policy.in', + configuration : con2, +) +i18n.merge_file( + input: policy_in, + output: 'org.freedesktop.color.policy', + install: true, + install_dir: join_paths(get_option('datadir'), 'polkit-1', 'actions') , + type: 'xml', + po_dir: join_paths(meson.source_root(), 'po') +) diff --git a/policy/org.freedesktop.color.policy.in.in b/policy/org.freedesktop.color.policy.in.in index 1675a3f..1753ecc 100644 --- a/policy/org.freedesktop.color.policy.in.in +++ b/policy/org.freedesktop.color.policy.in.in @@ -17,90 +17,90 @@ <!-- SECURITY: - Normal users should not have to authenticate to add devices --> - <_description>Create a color managed device</_description> - <_message>Authentication is required to create a color managed device</_message> + <description>Create a color managed device</description> + <message>Authentication is required to create a color managed device</message> <icon_name>application-vnd.iccprofile</icon_name> <defaults> <allow_any>auth_admin</allow_any> <allow_inactive>no</allow_inactive> <allow_active>yes</allow_active> </defaults> - <!--@ANNOTATE_OWNER@--> + <annotate key="org.freedesktop.policykit.owner">unix-user:@DAEMON_USER@</annotate> </action> <action id="org.freedesktop.color-manager.create-profile"> <!-- SECURITY: - Normal users should not have to authenticate to add profiles --> - <_description>Create a color profile</_description> - <_message>Authentication is required to create a color profile</_message> + <description>Create a color profile</description> + <message>Authentication is required to create a color profile</message> <icon_name>application-vnd.iccprofile</icon_name> <defaults> <allow_any>auth_admin</allow_any> <allow_inactive>no</allow_inactive> <allow_active>yes</allow_active> </defaults> - <!--@ANNOTATE_OWNER@--> + <annotate key="org.freedesktop.policykit.owner">unix-user:@DAEMON_USER@</annotate> </action> <action id="org.freedesktop.color-manager.delete-device"> <!-- SECURITY: - Normal users should not have to authenticate to delete devices --> - <_description>Remove a color managed device</_description> - <_message>Authentication is required to remove a color managed device</_message> + <description>Remove a color managed device</description> + <message>Authentication is required to remove a color managed device</message> <icon_name>application-vnd.iccprofile</icon_name> <defaults> <allow_any>auth_admin</allow_any> <allow_inactive>no</allow_inactive> <allow_active>yes</allow_active> </defaults> - <!--@ANNOTATE_OWNER@--> + <annotate key="org.freedesktop.policykit.owner">unix-user:@DAEMON_USER@</annotate> </action> <action id="org.freedesktop.color-manager.delete-profile"> <!-- SECURITY: - Normal users should not have to authenticate to delete profiles --> - <_description>Remove a color profile</_description> - <_message>Authentication is required to remove a color profile</_message> + <description>Remove a color profile</description> + <message>Authentication is required to remove a color profile</message> <icon_name>application-vnd.iccprofile</icon_name> <defaults> <allow_any>auth_admin</allow_any> <allow_inactive>no</allow_inactive> <allow_active>yes</allow_active> </defaults> - <!--@ANNOTATE_OWNER@--> + <annotate key="org.freedesktop.policykit.owner">unix-user:@DAEMON_USER@</annotate> </action> <action id="org.freedesktop.color-manager.modify-device"> <!-- SECURITY: - Normal users should not have to authenticate to modify devices --> - <_description>Modify color settings for a device</_description> - <_message>Authentication is required to modify the color settings for a device</_message> + <description>Modify color settings for a device</description> + <message>Authentication is required to modify the color settings for a device</message> <icon_name>application-vnd.iccprofile</icon_name> <defaults> <allow_any>auth_admin</allow_any> <allow_inactive>no</allow_inactive> <allow_active>yes</allow_active> </defaults> - <!--@ANNOTATE_OWNER@--> + <annotate key="org.freedesktop.policykit.owner">unix-user:@DAEMON_USER@</annotate> </action> <action id="org.freedesktop.color-manager.modify-profile"> <!-- SECURITY: - Normal users should not have to authenticate to modify profiles --> - <_description>Modify a color profile</_description> - <_message>Authentication is required to modify a color profile</_message> + <description>Modify a color profile</description> + <message>Authentication is required to modify a color profile</message> <icon_name>application-vnd.iccprofile</icon_name> <defaults> <allow_any>auth_admin</allow_any> <allow_inactive>no</allow_inactive> <allow_active>yes</allow_active> </defaults> - <!--@ANNOTATE_OWNER@--> + <annotate key="org.freedesktop.policykit.owner">unix-user:@DAEMON_USER@</annotate> </action> <action id="org.freedesktop.color-manager.install-system-wide"> @@ -112,15 +112,15 @@ set a profile set to all-white or all-black and thus make the other sessions unusable. --> - <_description>Install system color profiles</_description> - <_message>Authentication is required to install the color profile for all users</_message> + <description>Install system color profiles</description> + <message>Authentication is required to install the color profile for all users</message> <icon_name>application-vnd.iccprofile</icon_name> <defaults> <allow_any>auth_admin</allow_any> <allow_inactive>no</allow_inactive> <allow_active>auth_admin_keep</allow_active> </defaults> - <!--@ANNOTATE_OWNER@--> + <annotate key="org.freedesktop.policykit.owner">unix-user:@DAEMON_USER@</annotate> </action> <action id="org.freedesktop.color-manager.device-inhibit"> @@ -128,15 +128,15 @@ - Normal users should not have to authenticate to profile devices. --> - <_description>Inhibit color profile selection</_description> - <_message>Authentication is required to disable profile matching for a device</_message> + <description>Inhibit color profile selection</description> + <message>Authentication is required to disable profile matching for a device</message> <icon_name>application-vnd.iccprofile</icon_name> <defaults> <allow_any>auth_admin</allow_any> <allow_inactive>no</allow_inactive> <allow_active>yes</allow_active> </defaults> - <!--@ANNOTATE_OWNER@--> + <annotate key="org.freedesktop.policykit.owner">unix-user:@DAEMON_USER@</annotate> </action> <action id="org.freedesktop.color-manager.sensor-lock"> @@ -144,15 +144,15 @@ - Normal users should not have to authenticate to use the colorimeter device. --> - <_description>Use color sensor</_description> - <_message>Authentication is required to use the color sensor</_message> + <description>Use color sensor</description> + <message>Authentication is required to use the color sensor</message> <icon_name>application-vnd.iccprofile</icon_name> <defaults> <allow_any>auth_admin</allow_any> <allow_inactive>no</allow_inactive> <allow_active>yes</allow_active> </defaults> - <!--@ANNOTATE_OWNER@--> + <annotate key="org.freedesktop.policykit.owner">unix-user:@DAEMON_USER@</annotate> </action> </policyconfig> diff --git a/rules/69-cd-sensors.rules.in b/rules/69-cd-sensors.rules.in index 1927ed2..e24071c 100644 --- a/rules/69-cd-sensors.rules.in +++ b/rules/69-cd-sensors.rules.in @@ -102,6 +102,6 @@ ENV{COLORD_SENSOR_KIND}=="*?", ENV{ID_MODEL}=="", IMPORT{builtin}="usb_id" ENV{COLORD_SENSOR_KIND}=="*?", ENV{ID_MODEL_FROM_DATABASE}=="", IMPORT{builtin}="hwdb --subsystem=usb" # Allow the daemon to access the color devices -ENV{COLORD_SENSOR_KIND}=="*?", GROUP="@daemon_user@" +ENV{COLORD_SENSOR_KIND}=="*?", GROUP="@DAEMON_USER@" LABEL="gcm_rules_end" diff --git a/rules/Makefile.am b/rules/Makefile.am deleted file mode 100644 index 9448b9b..0000000 --- a/rules/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -udevrules_DATA = \ - 69-cd-sensors.rules \ - 95-cd-devices.rules - -EXTRA_DIST = \ - 95-cd-devices.rules - -MAINTAINERCLEANFILES = \ - 69-cd-sensors.rules - --include $(top_srcdir)/git.mk diff --git a/rules/meson.build b/rules/meson.build new file mode 100644 index 0000000..4e7800e --- /dev/null +++ b/rules/meson.build @@ -0,0 +1,13 @@ +con2 = configuration_data() +con2.set('DAEMON_USER', get_option('with-daemon-user')) +sensor_rules_in = configure_file( + input : '69-cd-sensors.rules.in', + output : '69-cd-sensors.rules', + configuration : con2, +) +install_data([ + sensor_rules_in, + '95-cd-devices.rules', + ], + install_dir : join_paths(udev.get_pkgconfig_variable('udevdir'), 'rules.d') +) diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 28abb55..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,178 +0,0 @@ -SUBDIRS = \ - plugins \ - sensors - -introspectiondir = $(datadir)/dbus-1/interfaces -dist_introspection_DATA = \ - org.freedesktop.ColorManager.xml \ - org.freedesktop.ColorManager.Device.xml \ - org.freedesktop.ColorManager.Sensor.xml \ - org.freedesktop.ColorManager.Profile.xml - -AM_CPPFLAGS = \ - $(PIE_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(GLIB_UNIX_CFLAGS) \ - $(POLKIT_CFLAGS) \ - $(LCMS_CFLAGS) \ - $(GUDEV_CFLAGS) \ - $(GUSB_CFLAGS) \ - $(SQLITE_CFLAGS) \ - $(LIBSYSTEMD_CFLAGS) \ - -I$(top_srcdir)/lib \ - -I$(top_builddir)/lib \ - -I$(top_srcdir)/lib/colord \ - -DG_LOG_DOMAIN=\"Cd\" \ - -DLIBEXECDIR=\"$(libexecdir)\" \ - -DLIBDIR=\"$(libdir)\" \ - -DDATADIR=\"$(datadir)\" \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DLOCALSTATEDIR=\""$(localstatedir)"\" \ - -DVERSION="\"$(VERSION)\"" \ - -DDAEMON_USER="\"$(daemon_user)\"" \ - -DCD_COMPILATION \ - -DCD_DISABLE_DEPRECATED \ - -DG_UDEV_API_IS_SUBJECT_TO_CHANGE \ - -DG_USB_API_IS_SUBJECT_TO_CHANGE \ - -DCD_SYSTEM_PROFILES_DIR="\"$(CD_SYSTEM_PROFILES_DIR)"\" \ - -DLOCALEDIR=\""$(localedir)"\" - -COLORD_PRIVATE_LIBS = \ - $(top_builddir)/lib/colord/libcolordprivate.la - -cd-resources.c: colord.gresource.xml $(dist_introspection_DATA) - $(AM_V_GEN) \ - glib-compile-resources \ - --sourcedir=$(srcdir) \ - --sourcedir=$(top_builddir)/data \ - --target=$@ \ - --generate-source \ - --c-name cd \ - $(srcdir)/colord.gresource.xml -cd-resources.h: colord.gresource.xml - $(AM_V_GEN) \ - glib-compile-resources \ - --sourcedir=$(srcdir) \ - --sourcedir=$(top_builddir)/data \ - --target=$@ \ - --generate-header \ - --c-name cd \ - $(srcdir)/colord.gresource.xml - -libexec_PROGRAMS = \ - colord - -colord_SOURCES = \ - cd-common.c \ - cd-common.h \ - cd-debug.c \ - cd-debug.h \ - cd-resources.c \ - cd-resources.h \ - cd-device-array.c \ - cd-device-array.h \ - cd-device.c \ - cd-device-db.c \ - cd-device-db.h \ - cd-device.h \ - cd-inhibit.c \ - cd-inhibit.h \ - cd-mapping-db.c \ - cd-mapping-db.h \ - cd-plugin.c \ - cd-plugin.h \ - cd-profile-array.c \ - cd-profile-array.h \ - cd-profile-db.c \ - cd-profile-db.h \ - cd-profile.c \ - cd-profile.h \ - cd-sensor.c \ - cd-sensor.h \ - cd-main.c - -colord_SOURCES += \ - cd-sensor-client.c \ - cd-sensor-client.h - -colord_LDADD = \ - $(LIBM) \ - $(SQLITE_LIBS) \ - $(POLKIT_LIBS) \ - $(LCMS_LIBS) \ - $(GUDEV_LIBS) \ - $(GUSB_LIBS) \ - $(LIBSYSTEMD_LIBS) \ - $(COLORD_PRIVATE_LIBS) \ - $(GLIB_LIBS) \ - $(GLIB_UNIX_LIBS) - -colord_LDFLAGS = \ - $(PIE_LDFLAGS) \ - $(RELRO_LDFLAGS) - -colord_CFLAGS = \ - $(WARN_CFLAGS) - -TESTS_ENVIRONMENT = \ - libtool --mode=execute valgrind \ - --quiet \ - --leak-check=full \ - --show-possibly-lost=no - -check_PROGRAMS = \ - cd-self-test - -cd_self_test_SOURCES = \ - cd-common.c \ - cd-common.h \ - cd-device-array.c \ - cd-device-array.h \ - cd-device.c \ - cd-device-db.c \ - cd-device-db.h \ - cd-device.h \ - cd-inhibit.c \ - cd-inhibit.h \ - cd-mapping-db.c \ - cd-mapping-db.h \ - cd-profile-array.c \ - cd-profile-array.h \ - cd-profile-db.c \ - cd-profile-db.h \ - cd-profile.c \ - cd-profile.h \ - cd-resources.c \ - cd-resources.h \ - cd-self-test.c - -cd_self_test_LDADD = \ - $(COLORD_PRIVATE_LIBS) \ - $(POLKIT_LIBS) \ - $(LCMS_LIBS) \ - $(SQLITE_LIBS) \ - $(LIBSYSTEMD_LIBS) \ - $(GLIB_LIBS) \ - $(GLIB_UNIX_LIBS) - -cd_self_test_CFLAGS = $(WARN_CFLAGS) - -install-data-hook: - if test -w $(DESTDIR)$(prefix)/; then \ - mkdir -p $(DESTDIR)$(CD_SYSTEM_PROFILES_DIR); \ - chown $(daemon_user) $(DESTDIR)$(localstatedir)/lib/colord; \ - chmod 0755 $(DESTDIR)$(localstatedir)/lib/colord; \ - fi - -BUILT_SOURCES = \ - cd-resources.c \ - cd-resources.h - -CLEANFILES = $(BUILT_SOURCES) *.log *.trs - -EXTRA_DIST = \ - colord.gresource.xml - -TESTS = cd-self-test - --include $(top_srcdir)/git.mk diff --git a/src/cd-main.c b/src/cd-main.c index 4574c63..359316b 100644 --- a/src/cd-main.c +++ b/src/cd-main.c @@ -44,9 +44,10 @@ #include "cd-profile-db.h" #include "cd-profile.h" #include "cd-icc-store.h" -#include "cd-resources.h" #include "cd-sensor-client.h" +#include "colord-resources.h" + typedef struct { GDBusConnection *connection; GDBusNodeInfo *introspection_daemon; diff --git a/src/cd-profile.c b/src/cd-profile.c index feb9850..7d722fe 100644 --- a/src/cd-profile.c +++ b/src/cd-profile.c @@ -34,7 +34,8 @@ #include "cd-common.h" #include "cd-profile.h" #include "cd-profile-db.h" -#include "cd-resources.h" + +#include "colord-resources.h" static void cd_profile_finalize (GObject *object); static void cd_profile_set_filename (CdProfile *profile, diff --git a/src/colord.gresource.xml b/src/colord.gresource.xml index 1989e93..bed1183 100644 --- a/src/colord.gresource.xml +++ b/src/colord.gresource.xml @@ -5,22 +5,23 @@ <file preprocess="xml-stripblanks" compressed="true">org.freedesktop.ColorManager.Device.xml</file> <file preprocess="xml-stripblanks" compressed="true">org.freedesktop.ColorManager.Profile.xml</file> <file preprocess="xml-stripblanks" compressed="true">org.freedesktop.ColorManager.Sensor.xml</file> - + </gresource> + <gresource prefix="/org/freedesktop/colord/profiles"> <!-- build in these common profiles to avoid seeking lots of small files when the daemon is loaded at boot time --> - <file>profiles/AdobeRGB1998.icc</file> - <file>profiles/AppleRGB.icc</file> - <file>profiles/Bluish.icc</file> - <file>profiles/CIE-RGB.icc</file> - <file>profiles/ColorMatchRGB.icc</file> - <file>profiles/NTSC-RGB.icc</file> - <file>profiles/PAL-RGB.icc</file> - <file>profiles/ProPhotoRGB.icc</file> - <file>profiles/SMPTE-C-RGB.icc</file> - <file>profiles/sRGB.icc</file> - <file>profiles/SwappedRedAndGreen.icc</file> - <file>profiles/x11-colors.icc</file> + <file>AdobeRGB1998.icc</file> + <file>AppleRGB.icc</file> + <file>Bluish.icc</file> + <file>CIE-RGB.icc</file> + <file>ColorMatchRGB.icc</file> + <file>NTSC-RGB.icc</file> + <file>PAL-RGB.icc</file> + <file>ProPhotoRGB.icc</file> + <file>SMPTE-C-RGB.icc</file> + <file>sRGB.icc</file> + <file>SwappedRedAndGreen.icc</file> + <file>x11-colors.icc</file> </gresource> </gresources> diff --git a/src/meson.build b/src/meson.build new file mode 100644 index 0000000..f2c2a25 --- /dev/null +++ b/src/meson.build @@ -0,0 +1,109 @@ +src_incdir = include_directories('.') + +subdir('plugins') +subdir('sensors') + +cargs = ['-DG_LOG_DOMAIN="Cd"'] + +install_data([ + 'org.freedesktop.ColorManager.xml', + 'org.freedesktop.ColorManager.Device.xml', + 'org.freedesktop.ColorManager.Sensor.xml', + 'org.freedesktop.ColorManager.Profile.xml', + ], + install_dir : join_paths(get_option('datadir'), 'dbus-1', 'interfaces') +) + +resources_src = gnome.compile_resources( + 'colord-resources', + 'colord.gresource.xml', + source_dir : [ + '.', + '../data/profiles', + ], + c_name : 'cd', + dependencies : generated_iccs, +) + +executable( + 'colord', + resources_src, + sources : [ + 'cd-common.c', + 'cd-debug.c', + 'cd-device-array.c', + 'cd-device.c', + 'cd-device-db.c', + 'cd-inhibit.c', + 'cd-inhibit.h', + 'cd-main.c', + 'cd-mapping-db.c', + 'cd-plugin.c', + 'cd-plugin.h', + 'cd-profile-array.c', + 'cd-profile.c', + 'cd-profile-db.c', + 'cd-sensor.c', + 'cd-sensor-client.c', + ], + include_directories : [ + colord_incdir, + lib_incdir, + root_incdir, + ], + dependencies : [ + giounix, + gmodule, + gudev, + gusb, + lcms, + libsystemd, + polkit, + sqlite, + ], + link_with : colordprivate, + c_args : [ + cargs, + ], + install : true, + install_dir : get_option('libexecdir') +) + +if get_option('enable-tests') + e = executable( + 'cd-self-test', + sources : [ + 'cd-common.c', + 'cd-device-array.c', + 'cd-device.c', + 'cd-device-db.c', + 'cd-inhibit.c', + 'cd-mapping-db.c', + 'cd-profile-array.c', + 'cd-profile-db.c', + 'cd-profile.c', + 'cd-self-test.c', + ], + include_directories : [ + colord_incdir, + lib_incdir, + root_incdir, + ], + dependencies : [ + giounix, + gmodule, + gudev, + gusb, + lcms, + polkit, + sqlite, + ], + link_with : [ + colordprivate, + ], + c_args : [ + cargs, + ], + ) + test('cd-self-test', e) +endif diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am deleted file mode 100644 index 7b65d4e..0000000 --- a/src/plugins/Makefile.am +++ /dev/null @@ -1,55 +0,0 @@ -## We require new-style dependency handling. -AUTOMAKE_OPTIONS = 1.7 - -CD_GLIB2_LIBS = \ - $(top_builddir)/lib/packagekit-glib2/libpackagekit-glib2.la - -AM_CPPFLAGS = \ - $(GIO_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(GUDEV_CFLAGS) \ - -DG_LOG_DOMAIN=\"Cd\" \ - -DCD_COMPILATION \ - -DCOLORD_SANE_BINARY=\""$(libexecdir)/colord-sane"\" \ - -I$(top_srcdir)/lib \ - -I$(top_builddir)/lib \ - -I$(top_srcdir)/lib/colord \ - -I$(top_srcdir)/src - -# plugins -plugindir = $(libdir)/colord-plugins -noinst_LTLIBRARIES = \ - libcd_plugin_example.la - -libcd_plugin_example_la_SOURCES = cd-plugin-example.c -libcd_plugin_example_la_LIBADD = $(CD_PLUGIN_LIBS) -libcd_plugin_example_la_LDFLAGS = -module -avoid-version -libcd_plugin_example_la_CFLAGS = $(CD_PLUGIN_CFLAGS) $(WARN_CFLAGS) - -plugin_LTLIBRARIES = \ - libcd_plugin_camera.la \ - libcd_plugin_scanner.la - -libcd_plugin_camera_la_SOURCES = cd-plugin-camera.c -libcd_plugin_camera_la_LIBADD = $(GUDEV_LIBS) -libcd_plugin_camera_la_LDFLAGS = -module -avoid-version -libcd_plugin_camera_la_CFLAGS = $(GUDEV_CFLAGS) $(WARN_CFLAGS) - -libcd_plugin_scanner_la_SOURCES = cd-plugin-scanner.c -libcd_plugin_scanner_la_LIBADD = $(GUDEV_LIBS) -libcd_plugin_scanner_la_LDFLAGS = -module -avoid-version -libcd_plugin_scanner_la_CFLAGS = $(GUDEV_CFLAGS) $(WARN_CFLAGS) - -if HAVE_SANE - -plugin_LTLIBRARIES += \ - libcd_plugin_sane.la - -libcd_plugin_sane_la_SOURCES = cd-plugin-sane.c -libcd_plugin_sane_la_LIBADD = $(GUDEV_LIBS) -libcd_plugin_sane_la_LDFLAGS = -module -avoid-version -libcd_plugin_sane_la_CFLAGS = $(GUDEV_CFLAGS) $(WARN_CFLAGS) - -endif # HAVE_SANE - --include $(top_srcdir)/git.mk diff --git a/src/plugins/meson.build b/src/plugins/meson.build new file mode 100644 index 0000000..d1784cd --- /dev/null +++ b/src/plugins/meson.build @@ -0,0 +1,76 @@ +cargs = ['-DG_LOG_DOMAIN="Cd"'] + +shared_module('cd-plugin-example', + sources : [ + 'cd-plugin-example.c', + ], + include_directories : [ + colord_incdir, + lib_incdir, + root_incdir, + src_incdir, + ], + c_args : cargs, + dependencies : [ + gio, + ], +) +shared_module('cd-plugin-camera', + sources : [ + 'cd-plugin-camera.c', + ], + include_directories : [ + colord_incdir, + lib_incdir, + root_incdir, + src_incdir, + ], + install : true, + install_dir: join_paths(get_option('libdir'), 'colord-plugins'), + c_args : cargs, + dependencies : [ + gio, + gudev, + ], +) +shared_module('cd-plugin-scanner', + sources : [ + 'cd-plugin-scanner.c', + ], + include_directories : [ + colord_incdir, + lib_incdir, + root_incdir, + src_incdir, + ], + install : true, + install_dir: join_paths(get_option('libdir'), 'colord-plugins'), + c_args : cargs, + dependencies : [ + gio, + gudev, + ], +) +if get_option('enable-sane') + shared_module('cd-plugin-sane', + sources : [ + 'cd-plugin-sane.c', + ], + include_directories : [ + colord_incdir, + lib_incdir, + root_incdir, + src_incdir, + ], + install : true, + install_dir: join_paths(get_option('libdir'), 'colord-plugins'), + c_args : [ + cargs, + '-DCOLORD_SANE_BINARY="' + join_paths(get_option('libexecdir'), 'colord-sane' + '"'), + ], + dependencies : [ + gio, + gudev, + ], + ) +endif diff --git a/src/sensors/Makefile.am b/src/sensors/Makefile.am deleted file mode 100644 index 782dab0..0000000 --- a/src/sensors/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -SUBDIRS = \ - argyll \ - colorhug \ - dtp94 \ - dummy \ - huey \ - munki \ - spark - --include $(top_srcdir)/git.mk diff --git a/src/sensors/argyll/Makefile.am b/src/sensors/argyll/Makefile.am deleted file mode 100644 index 728f661..0000000 --- a/src/sensors/argyll/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -AM_CPPFLAGS = \ - $(GLIB_CFLAGS) \ - $(GUSB_CFLAGS) \ - $(GUDEV_CFLAGS) \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/lib \ - -I$(top_builddir)/lib \ - -I$(top_srcdir)/lib/colord \ - -DG_LOG_DOMAIN=\"Cd\" \ - -DCD_COMPILATION \ - -DG_UDEV_API_IS_SUBJECT_TO_CHANGE \ - -DG_USB_API_IS_SUBJECT_TO_CHANGE \ - -DLOCALEDIR=\""$(localedir)"\" - -if HAVE_ARGYLLCMS_SENSOR -plugindir = $(libdir)/colord-sensors -plugin_LTLIBRARIES = \ - libcolord_sensor_argyll.la -libcolord_sensor_argyll_la_SOURCES = \ - cd-spawn.c \ - cd-spawn.h \ - cd-sensor-argyll.c -libcolord_sensor_argyll_la_LIBADD = $(GLIB_LIBS) $(GUSB_LIBS) -libcolord_sensor_argyll_la_LDFLAGS = -module -avoid-version -libcolord_sensor_argyll_la_CFLAGS = $(WARN_CFLAGS) -endif - --include $(top_srcdir)/git.mk diff --git a/src/sensors/argyll/meson.build b/src/sensors/argyll/meson.build new file mode 100644 index 0000000..68025ca --- /dev/null +++ b/src/sensors/argyll/meson.build @@ -0,0 +1,20 @@ +shared_module('cd-sensor-argyll', + sources : [ + 'cd-sensor-argyll.c', + 'cd-spawn.c', + ], + include_directories : [ + src_incdir, + colord_incdir, + lib_incdir, + root_incdir, + ], + install : true, + install_dir: join_paths(get_option('libdir'), 'colord-sensors'), + c_args : cargs, + dependencies : [ + gio, + gusb, + gudev, + ], +) diff --git a/src/sensors/colorhug/Makefile.am b/src/sensors/colorhug/Makefile.am deleted file mode 100644 index 91ee841..0000000 --- a/src/sensors/colorhug/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -AM_CPPFLAGS = \ - $(GLIB_CFLAGS) \ - $(GUSB_CFLAGS) \ - $(GUDEV_CFLAGS) \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/lib \ - -I$(top_builddir)/lib \ - -I$(top_srcdir)/lib/colord \ - -DG_LOG_DOMAIN=\"Cd\" \ - -DCD_COMPILATION \ - -DG_UDEV_API_IS_SUBJECT_TO_CHANGE \ - -DG_USB_API_IS_SUBJECT_TO_CHANGE \ - -DLOCALEDIR=\""$(localedir)"\" - -plugindir = $(libdir)/colord-sensors -plugin_LTLIBRARIES = \ - libcolord_sensor_colorhug.la - -libcolord_sensor_colorhug_la_SOURCES = \ - cd-sensor-colorhug.c -libcolord_sensor_colorhug_la_LIBADD = \ - $(GLIB_LIBS) \ - $(GUSB_LIBS) \ - $(top_builddir)/lib/colorhug/libcolorhug.la -libcolord_sensor_colorhug_la_LDFLAGS = -module -avoid-version -libcolord_sensor_colorhug_la_CFLAGS = $(WARN_CFLAGS) - --include $(top_srcdir)/git.mk diff --git a/src/sensors/colorhug/meson.build b/src/sensors/colorhug/meson.build new file mode 100644 index 0000000..cb24b91 --- /dev/null +++ b/src/sensors/colorhug/meson.build @@ -0,0 +1,20 @@ +shared_module('cd-sensor-colorhug', + sources : [ + 'cd-sensor-colorhug.c', + ], + include_directories : [ + src_incdir, + colord_incdir, + lib_incdir, + root_incdir, + ], + install : true, + install_dir: join_paths(get_option('libdir'), 'colord-sensors'), + c_args : cargs, + link_with : colorhug, + dependencies : [ + gio, + gusb, + gudev, + ], +) diff --git a/src/sensors/dtp94/Makefile.am b/src/sensors/dtp94/Makefile.am deleted file mode 100644 index 39f0349..0000000 --- a/src/sensors/dtp94/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -AM_CPPFLAGS = \ - $(GLIB_CFLAGS) \ - $(GUSB_CFLAGS) \ - $(GUDEV_CFLAGS) \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/lib \ - -I$(top_builddir)/lib \ - -I$(top_srcdir)/lib/colord \ - -DG_LOG_DOMAIN=\"Cd\" \ - -DCD_COMPILATION \ - -DG_UDEV_API_IS_SUBJECT_TO_CHANGE \ - -DG_USB_API_IS_SUBJECT_TO_CHANGE \ - -DLOCALEDIR=\""$(localedir)"\" - -plugindir = $(libdir)/colord-sensors -plugin_LTLIBRARIES = \ - libcolord_sensor_dtp94.la - -libcolord_sensor_dtp94_la_SOURCES = \ - dtp94-device.c \ - dtp94-device.h \ - dtp94-enum.c \ - dtp94-enum.h \ - cd-sensor-dtp94.c -libcolord_sensor_dtp94_la_LIBADD = \ - $(GLIB_LIBS) \ - $(GUSB_LIBS) -libcolord_sensor_dtp94_la_LDFLAGS = -module -avoid-version -libcolord_sensor_dtp94_la_CFLAGS = $(WARN_CFLAGS) - --include $(top_srcdir)/git.mk diff --git a/src/sensors/dtp94/meson.build b/src/sensors/dtp94/meson.build new file mode 100644 index 0000000..591894e --- /dev/null +++ b/src/sensors/dtp94/meson.build @@ -0,0 +1,21 @@ +shared_module('cd-sensor-dtp94', + sources : [ + 'cd-sensor-dtp94.c', + 'dtp94-device.c', + 'dtp94-enum.c', + ], + include_directories : [ + src_incdir, + colord_incdir, + lib_incdir, + root_incdir, + ], + install : true, + install_dir: join_paths(get_option('libdir'), 'colord-sensors'), + c_args : cargs, + dependencies : [ + gio, + gusb, + gudev, + ], +) diff --git a/src/sensors/dummy/Makefile.am b/src/sensors/dummy/Makefile.am deleted file mode 100644 index 49bc28c..0000000 --- a/src/sensors/dummy/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -AM_CPPFLAGS = \ - $(GLIB_CFLAGS) \ - $(GUSB_CFLAGS) \ - $(LCMS_CFLAGS) \ - $(GUDEV_CFLAGS) \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/lib \ - -I$(top_builddir)/lib \ - -I$(top_srcdir)/lib/colord \ - -DG_LOG_DOMAIN=\"Cd\" \ - -DCD_COMPILATION \ - -DLOCALEDIR=\""$(localedir)"\" - -# sensor plugins -plugindir = $(libdir)/colord-sensors -plugin_LTLIBRARIES = \ - libcolord_sensor_dummy.la - -libcolord_sensor_dummy_la_SOURCES = cd-sensor-dummy.c -libcolord_sensor_dummy_la_LIBADD = $(GLIB_LIBS) -libcolord_sensor_dummy_la_LDFLAGS = -module -avoid-version -libcolord_sensor_dummy_la_CFLAGS = $(WARN_CFLAGS) - --include $(top_srcdir)/git.mk diff --git a/src/sensors/dummy/meson.build b/src/sensors/dummy/meson.build new file mode 100644 index 0000000..0f416f6 --- /dev/null +++ b/src/sensors/dummy/meson.build @@ -0,0 +1,19 @@ +shared_module('cd-sensor-dummy', + sources : [ + 'cd-sensor-dummy.c', + ], + include_directories : [ + src_incdir, + colord_incdir, + lib_incdir, + root_incdir, + ], + install : true, + install_dir: join_paths(get_option('libdir'), 'colord-sensors'), + c_args : cargs, + dependencies : [ + gio, + gusb, + gudev, + ], +) diff --git a/src/sensors/huey/Makefile.am b/src/sensors/huey/Makefile.am deleted file mode 100644 index b4661a2..0000000 --- a/src/sensors/huey/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -AM_CPPFLAGS = \ - $(GLIB_CFLAGS) \ - $(GUSB_CFLAGS) \ - $(GUDEV_CFLAGS) \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/lib \ - -I$(top_builddir)/lib \ - -I$(top_srcdir)/lib/colord \ - -DG_LOG_DOMAIN=\"Cd\" \ - -DCD_COMPILATION \ - -DG_UDEV_API_IS_SUBJECT_TO_CHANGE \ - -DG_USB_API_IS_SUBJECT_TO_CHANGE \ - -DLOCALEDIR=\""$(localedir)"\" - -plugindir = $(libdir)/colord-sensors -plugin_LTLIBRARIES = \ - libcolord_sensor_huey.la - -libcolord_sensor_huey_la_SOURCES = \ - huey-ctx.c \ - huey-ctx.h \ - huey-device.c \ - huey-device.h \ - huey-enum.c \ - huey-enum.h \ - cd-sensor-huey.c -libcolord_sensor_huey_la_LIBADD = \ - $(GLIB_LIBS) \ - $(GUSB_LIBS) -libcolord_sensor_huey_la_LDFLAGS = -module -avoid-version -libcolord_sensor_huey_la_CFLAGS = $(WARN_CFLAGS) - --include $(top_srcdir)/git.mk diff --git a/src/sensors/huey/meson.build b/src/sensors/huey/meson.build new file mode 100644 index 0000000..792b7a8 --- /dev/null +++ b/src/sensors/huey/meson.build @@ -0,0 +1,22 @@ +shared_module('cd-sensor-huey', + sources : [ + 'cd-sensor-huey.c', + 'huey-ctx.c', + 'huey-device.c', + 'huey-enum.c', + ], + include_directories : [ + src_incdir, + colord_incdir, + lib_incdir, + root_incdir, + ], + install : true, + install_dir: join_paths(get_option('libdir'), 'colord-sensors'), + c_args : cargs, + dependencies : [ + gio, + gusb, + gudev, + ], +) diff --git a/src/sensors/meson.build b/src/sensors/meson.build new file mode 100644 index 0000000..f9f557b --- /dev/null +++ b/src/sensors/meson.build @@ -0,0 +1,28 @@ +subdir('argyll') +subdir('colorhug') +subdir('dtp94') +subdir('dummy') +subdir('huey') +subdir('munki') +subdir('spark') + +cargs = ['-DG_LOG_DOMAIN="Cd"'] + +if get_option('enable-reverse') + executable( + 'cd-parse-beagle', + sources : [ + 'cd-parse-beagle.c', + ], + include_directories : [ + root_incdir, + ], + dependencies : [ + gio, + ], + link_with : colordprivate, + c_args : [ + cargs, + ], + ) +endif diff --git a/src/sensors/munki/Makefile.am b/src/sensors/munki/Makefile.am deleted file mode 100644 index 008cac1..0000000 --- a/src/sensors/munki/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -if FALSE -libcolord_sensor_munki_la_SOURCES = \ - munki-enum.c \ - munki-enum.h \ - cd-sensor-munki.c -libcolord_sensor_munki_la_LIBADD = $(GLIB_LIBS) -libcolord_sensor_munki_la_LDFLAGS = -module -avoid-version -libcolord_sensor_munki_la_CFLAGS = $(WARN_CFLAGS) -endif - --include $(top_srcdir)/git.mk diff --git a/src/sensors/munki/meson.build b/src/sensors/munki/meson.build new file mode 100644 index 0000000..167e2f8 --- /dev/null +++ b/src/sensors/munki/meson.build @@ -0,0 +1,20 @@ +if get_option('enable-reverse') + shared_module('cd-sensor-munki', + sources : [ + 'cd-sensor-munki.c', + 'munki-enum.c', + ], + include_directories : [ + src_incdir, + colord_incdir, + lib_incdir, + root_incdir, + ], + c_args : cargs, + dependencies : [ + gio, + gusb, + gudev, + ], + ) +endif diff --git a/src/sensors/spark/Makefile.am b/src/sensors/spark/Makefile.am deleted file mode 100644 index a1163c5..0000000 --- a/src/sensors/spark/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -AM_CPPFLAGS = \ - $(GLIB_CFLAGS) \ - $(GUSB_CFLAGS) \ - $(GUDEV_CFLAGS) \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/lib \ - -I$(top_builddir)/lib \ - -I$(top_srcdir)/lib/colord \ - -DG_LOG_DOMAIN=\"Cd\" \ - -DCD_COMPILATION \ - -DG_UDEV_API_IS_SUBJECT_TO_CHANGE \ - -DG_USB_API_IS_SUBJECT_TO_CHANGE \ - -DLOCALEDIR=\""$(localedir)"\" - -plugindir = $(libdir)/colord-sensors -plugin_LTLIBRARIES = \ - libcolord_sensor_spark.la - -libcolord_sensor_spark_la_SOURCES = \ - osp-device.c \ - osp-device.h \ - osp-enum.c \ - osp-enum.h \ - cd-sensor-spark.c -libcolord_sensor_spark_la_LIBADD = \ - $(GLIB_LIBS) \ - $(GUSB_LIBS) -libcolord_sensor_spark_la_LDFLAGS = -module -avoid-version -libcolord_sensor_spark_la_CFLAGS = $(WARN_CFLAGS) - --include $(top_srcdir)/git.mk diff --git a/src/sensors/spark/meson.build b/src/sensors/spark/meson.build new file mode 100644 index 0000000..0957e04 --- /dev/null +++ b/src/sensors/spark/meson.build @@ -0,0 +1,21 @@ +shared_module('cd-sensor-spark', + sources : [ + 'cd-sensor-spark.c', + 'osp-device.c', + 'osp-enum.c', + ], + include_directories : [ + src_incdir, + colord_incdir, + lib_incdir, + root_incdir, + ], + install : true, + install_dir: join_paths(get_option('libdir'), 'colord-sensors'), + c_args : cargs, + dependencies : [ + gio, + gusb, + gudev, + ], +) |