At least lcms wasn't deterministicly detected from sysroot. This will allow to export LCMS_ENABLED=False when lcms isn't in PACKAGECONFIG. Upstream-Status: Inappropriate [configuration] Signed-off-by: Martin Jansa diff -uNr Imaging-1.1.7.orig/setup.py Imaging-1.1.7/setup.py --- Imaging-1.1.7.orig/setup.py 2013-07-22 10:17:02.081457075 +0200 +++ Imaging-1.1.7/setup.py 2013-07-22 13:10:09.029707492 +0200 @@ -39,6 +39,12 @@ TIFF_ROOT = None FREETYPE_ROOT = os.environ['STAGING_LIBDIR'], os.environ['STAGING_INCDIR'] LCMS_ROOT = None +TCL_ENABLED = os.getenv('TCL_ENABLED', "True") +JPEG_ENABLED = os.getenv('JPEG_ENABLED', "True") +ZLIB_ENABLED = os.getenv('ZLIB_ENABLED', "True") +TIFF_ENABLED = os.getenv('TIFF_ENABLED', "True") +FREETYPE_ENABLED = os.getenv('FREETYPE_ENABLED', "True") +LCMS_ENABLED = os.getenv('LCMS_ENABLED', "True") # FIXME: add mechanism to explicitly *disable* the use of a library @@ -220,22 +226,22 @@ zlib = jpeg = tiff = freetype = tcl = tk = lcms = None feature = feature() - if find_include_file(self, "zlib.h"): + if ZLIB_ENABLED == 'True' and find_include_file(self, "zlib.h"): if find_library_file(self, "z"): feature.zlib = "z" elif sys.platform == "win32" and find_library_file(self, "zlib"): feature.zlib = "zlib" # alternative name - if find_include_file(self, "jpeglib.h"): + if JPEG_ENABLED == 'True' and find_include_file(self, "jpeglib.h"): if find_library_file(self, "jpeg"): feature.jpeg = "jpeg" elif sys.platform == "win32" and find_library_file(self, "libjpeg"): feature.jpeg = "libjpeg" # alternative name - if find_library_file(self, "tiff"): + if TIFF_ENABLED == 'True' and find_library_file(self, "tiff"): feature.tiff = "tiff" - if find_library_file(self, "freetype"): + if FREETYPE_ENABLED == 'True' and find_library_file(self, "freetype"): # look for freetype2 include files freetype_version = 0 for dir in self.compiler.include_dirs: @@ -256,11 +262,11 @@ if dir: add_directory(self.compiler.include_dirs, dir, 0) - if find_include_file(self, "lcms.h"): + if LCMS_ENABLED == 'True' and find_include_file(self, "lcms.h"): if find_library_file(self, "lcms"): feature.lcms = "lcms" - if _tkinter and find_include_file(self, "tk.h"): + if TCL_ENABLED == 'True' and _tkinter and find_include_file(self, "tk.h"): # the library names may vary somewhat (e.g. tcl84 or tcl8.4) version = TCL_VERSION[0] + TCL_VERSION[2] if find_library_file(self, "tcl" + version): ckages/gtk-engines?id=8d2f8e65e01ea07335c3d172866d1ccbd10ebdcc&showmsg=1'>Expand)AuthorFiles 2008-10-18bb files: Revert the introduction of FILE_PRHolger Hans Peter Freyther4 2008-10-15[PR] Change PR to FILE_PR and intro PR as FILE_PR + DISTRO_PRHolger Hans Peter Freyther4 2008-10-15mtn2git: remove .mtn2git_empty files in non-empty directoriesJan Luebbe2 2008-09-28gtk-sato-engine add latest from pokyMichael Lauer3 2008-09-05gtk-engines: update to 2.15.4Koen Kooi1 2008-01-26divers: replace '=' definition of dbg packages with '+=' for 43 files. fixes...Rolf Leggewie2 2007-12-13divers: fix spelling mistake in license (GPL2 -> GPLv2).Rolf Leggewie2 2007-10-19gtk-clearlooks-engine: fix debug packaging (from Poky)Marcin Juszkiewicz1 2007-08-01gtk-sato-engine: add 0.1 from pokyKoen Kooi2 2007-07-16gtk-engines: Inherit gtk-binver in 2.6.5Florian Boor1 2007-05-25gtk-engines: remove hard-coded paths. Closes 2364.Rolf Leggewie5 2007-05-06gtk-sato-engine: New recipe for svn Manuel Teira1 2006-12-29gtk-industrial-engine: dropped not fetchable versionsMarcin Juszkiewicz3 2006-10-16add gtk-binver parsing gtk_binary_version out of .pc file. close #1455Michael Lauer1 2006-10-10Remove MAINTAINER fields from recipes, add MAINTAINER file to replace them.Koen Kooi11 2006-04-15gtk-engines: add 2.7.4Koen Kooi1 2006-01-08Add PACKAGES_DYNAMIC to the appropriate .bb files.Richard Purdie3 2005-08-28gtk-engines: add .bb for new release 2.6.5Philipp Zabel1 2005-08-01Add clearlooks gtk engineKoen Kooi1 2005-07-27added gtk-industrial-engine 0.2.46.0Marcin Juszkiewicz1 2005-07-09LICENSE = GPL -> LICENSE = "GPL"Holger Freyther3 2005-06-30import clean BK tree at cset 1.3670Koen Kooi8 2005-04-18update gtk-engines to 2.6.3Phil Blundell1 2005-02-20Merge bk://oe-devel.bkbits.net/openembeddednslu2-linux.adm@bkbits.net1 2005-02-16gtk-industrial-engine_0.2.36.5.bb:Koen Kooi1 2005-01-25xrandr_cvs.bb:Greg Gilbert1 2004-12-11added gtk-industrial-engine_0.2.36.4.bbNigel Kostiuck1 2004-12-11Merge bk://oe-devel@oe-devel.bkbits.net/openembeddedNigel Kostiuck1 2004-12-09Merge oe-devel@oe-devel.bkbits.net:openembeddedChris Larson