xF: optionally colour manage X11

Bump liberty.

CMakeLists.txt

@@ -153,6 +153,9 @@ if (WITH_X11 AND NOT x11_FOUND)
 	message (FATAL_ERROR "Some X11 libraries were not found")
 endif ()
 
+pkg_check_modules (lcms2 lcms2)
+option (WITH_LCMS2 "Build xF with X11 colour management" "${lcms2_FOUND}")
+
 pkg_check_modules (canberra libcanberra)
 set (canberra_SATISFIED FALSE)
 if (WITH_X11 AND canberra_FOUND)
@@ -169,6 +172,7 @@ endif ()
 # Generate a configuration file
 set (HAVE_LUA "${WITH_LUA}")
 set (HAVE_X11 "${WITH_X11}")
+set (HAVE_LCMS2 "${WITH_LCMS2}")
 set (HAVE_CANBERRA "${WITH_CANBERRA}")
 
 include (GNUInstallDirs)
@@ -228,6 +232,11 @@ if (WITH_XF)
 		target_link_directories (xF PRIVATE ${x11_LIBRARY_DIRS})
 		target_link_libraries (xF PRIVATE ${x11_LIBRARIES})
 	endif ()
+	if (WITH_LCMS2)
+		target_include_directories (xF PRIVATE ${lcms2_INCLUDE_DIRS})
+		target_link_directories (xF PRIVATE ${lcms2_LIBRARY_DIRS})
+		target_link_libraries (xF PRIVATE ${lcms2_LIBRARIES})
+	endif ()
 	if (WITH_CANBERRA)
 		target_include_directories (xF PRIVATE ${canberra_INCLUDE_DIRS})
 		target_link_directories (xF PRIVATE ${canberra_LIBRARY_DIRS})

README.adoc

@@ -97,7 +97,7 @@ Build-only dependencies: CMake, pkg-config, awk, liberty (included),
 Common runtime dependencies: openssl +
 Additionally for 'xC': any curses, lua >= 5.3 (optional), termo (included) +
 Additionally for 'xF': ncursesw, libunistring, termo (included),
- x11 + xft + libpng (X11), libcanberra (X11, optional)
+ x11 + xft + libpng (X11), lcms2 (X11, optional), libcanberra (X11, optional)
 
  $ git clone --recursive https://git.janouch.name/p/xK.git
  $ mkdir xK/build

config.h.in

@@ -8,6 +8,7 @@
 
 #cmakedefine HAVE_LUA
 #cmakedefine HAVE_X11
+#cmakedefine HAVE_LCMS2
 #cmakedefine HAVE_CANBERRA
 
 #cmakedefine01 ICONV_ACCEPTS_TRANSLIT

xF.c

@@ -33,6 +33,9 @@
 #ifdef HAVE_X11
 #define LIBERTY_XUI_WANT_X11
 #endif  // HAVE_X11
+#ifdef HAVE_LCMS2
+#define LIBERTY_XUI_WANT_LCMS2
+#endif
 #include "liberty/liberty-xui.c"
 
 // --- Configuration (application-specific) ------------------------------------