diff options
author | Robert Schwebel <r.schwebel@pengutronix.de> | 2011-07-16 17:42:36 +0200 |
---|---|---|
committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2011-07-16 22:45:37 +0200 |
commit | 69f48f1b37c0e3dd4bc444be1c6b6b36796c63a1 (patch) | |
tree | 3ebfd4c4072e2b8859c3057d9cc6ba01788f5702 /rules/lcms.make | |
parent | 70c7d69ca93bb23f8c06cc6882ded3cdf26ef1ad (diff) | |
download | ptxdist-69f48f1b37c0e3dd4bc444be1c6b6b36796c63a1.tar.gz ptxdist-69f48f1b37c0e3dd4bc444be1c6b6b36796c63a1.tar.xz |
Revert "lcms: version bump 1.17 -> 2.2"
This reverts commit 5fb317c986ff664d0c25206ec2c799fdadb0267a.
It turned out that lcms1 is incompatible to lcms2.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Diffstat (limited to 'rules/lcms.make')
-rw-r--r-- | rules/lcms.make | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/rules/lcms.make b/rules/lcms.make index 954763cf2..f1ff6886c 100644 --- a/rules/lcms.make +++ b/rules/lcms.make @@ -16,13 +16,13 @@ PACKAGES-$(PTXCONF_LCMS) += lcms # # Paths and names # -LCMS_VERSION := 2.2 -LCMS := lcms2-$(LCMS_VERSION) -LCMS_MD5 := aaf33c7c25675e6163189ba488ae20f5 +LCMS_VERSION := 1.18a +LCMS_MD5 := f4abfe1c57ea3f633c2e9d034e74e3e8 +LCMS := lcms-$(LCMS_VERSION) LCMS_SUFFIX := tar.gz LCMS_URL := $(PTXCONF_SETUP_SFMIRROR)/lcms/$(LCMS).$(LCMS_SUFFIX) LCMS_SOURCE := $(SRCDIR)/$(LCMS).$(LCMS_SUFFIX) -LCMS_DIR := $(BUILDDIR)/lcms-2.0 +LCMS_DIR := $(BUILDDIR)/lcms-1.18 # ---------------------------------------------------------------------------- # Get @@ -46,7 +46,8 @@ LCMS_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ --without-tiff \ --without-zlib \ - --without-jpeg + --without-jpeg \ + --without-python # ---------------------------------------------------------------------------- # Target-Install @@ -61,12 +62,7 @@ $(STATEDIR)/lcms.targetinstall: @$(call install_fixup, lcms,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>") @$(call install_fixup, lcms,DESCRIPTION,missing) - @$(call install_lib, lcms, 0, 0, 0644, liblcms2) - - # FIXME - # /usr/bin/transicc - # /usr/bin/psicc - # /usr/bin/linkicc + @$(call install_lib, lcms, 0, 0, 0644, liblcms) @$(call install_finish, lcms) |