libcms 1.19 was released 2009, and is no longer maintained, so it is
about time. Python support has been removed. MD5 for the license file
has changed, but it's still the MIT License. Also make the tools
installable.

Signed-off-by: Roland Hieber <r.hie...@pengutronix.de>
---
 rules/lcms.in   | 13 +++++++++++--
 rules/lcms.make | 20 ++++++++++++--------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/rules/lcms.in b/rules/lcms.in
index b7bae423b..f03776c59 100644
--- a/rules/lcms.in
+++ b/rules/lcms.in
@@ -1,9 +1,18 @@
 ## SECTION=system_libraries
 
-config LCMS
+menuconfig LCMS
        tristate
-       prompt "lcms"
+       prompt "lcms                          "
        select LIBC_M
        help
          LittleCMS intends to be a small-footprint, speed
          optimized color management engine in open source form.
+
+if LCMS
+
+config LCMS_BIN
+       bool "install tools"
+       help
+         Install transicc, psicc, linkicc
+
+endif
diff --git a/rules/lcms.make b/rules/lcms.make
index 55bb10e6d..7ca10dd7a 100644
--- a/rules/lcms.make
+++ b/rules/lcms.make
@@ -16,15 +16,15 @@ PACKAGES-$(PTXCONF_LCMS) += lcms
 #
 # Paths and names
 #
-LCMS_VERSION           := 1.19
-LCMS_MD5               := 8af94611baf20d9646c7c2c285859818
-LCMS                   := lcms-$(LCMS_VERSION)
+LCMS_VERSION           := 2.9
+LCMS_MD5               := 45865f3faf3cc1a9778f89e255495331
+LCMS                   := lcms2-$(LCMS_VERSION)
 LCMS_SUFFIX            := tar.gz
 LCMS_URL               := $(call ptx/mirror, SF, lcms/$(LCMS).$(LCMS_SUFFIX))
 LCMS_SOURCE            := $(SRCDIR)/$(LCMS).$(LCMS_SUFFIX)
-LCMS_DIR               := $(BUILDDIR)/lcms-1.19
+LCMS_DIR               := $(BUILDDIR)/$(LCMS)
 LCMS_LICENSE           := MIT
-LCMS_LICENSE_FILES     := file://COPYING;md5=156745cad721a8783cb847e82b79f586
+LCMS_LICENSE_FILES     := file://COPYING;md5=6c786c3b7a4afbd3c990f1b81261d516
 
 # ----------------------------------------------------------------------------
 # Prepare
@@ -40,8 +40,7 @@ LCMS_AUTOCONF := \
        $(CROSS_AUTOCONF_USR) \
        --without-tiff \
        --without-zlib \
-       --without-jpeg \
-       --without-python
+       --without-jpeg
 
 # ----------------------------------------------------------------------------
 # Target-Install
@@ -56,8 +55,13 @@ $(STATEDIR)/lcms.targetinstall:
        @$(call install_fixup, lcms,AUTHOR,"Michael Olbrich 
<m.olbr...@pengutronix.de>")
        @$(call install_fixup, lcms,DESCRIPTION,missing)
 
-       @$(call install_lib, lcms, 0, 0, 0644, liblcms)
+       @$(call install_lib, lcms, 0, 0, 0644, liblcms2)
 
+ifdef PTXCONF_LCMS_BIN
+       @$(call install_copy, lcms, 0, 0, 0755, -, /usr/bin/transicc)
+       @$(call install_copy, lcms, 0, 0, 0755, -, /usr/bin/psicc)
+       @$(call install_copy, lcms, 0, 0, 0755, -, /usr/bin/linkicc)
+endif
        @$(call install_finish, lcms)
 
        @$(call touch)
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Reply via email to