aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-graphics
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-08-09 11:29:57 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2014-08-11 10:59:17 +0200
commite213115b0b7b001eb5973d42dcae3bb1532a8583 (patch)
tree87b7845eb21a4bdc4e6d979d8e1f33dbc2c4a1ec /meta-oe/recipes-graphics
parent4d4ab8fd320b58323033c12cf705e7b3ce10d659 (diff)
downloadmeta-openembedded-contrib-e213115b0b7b001eb5973d42dcae3bb1532a8583.tar.gz
libungif: remove and use giflib everywhere
* giflib says it's API and ABI compatible with libungif which was in wide use while the LZW compression algorithm was patented. * the selection between giflib and libungif wasn't ever determinictic because of conflicts in sysroot * resolves couple of undeterministic dependencies and: WARNING: The recipe giflib is trying to install files into a shared area when those files already exist. Those files and their manifest location are: sysroots/qemuarm/usr/include/gif_lib.h Matched in manifest-qemuarm-libungif.populate_sysroot Please verify which package should provide the above files. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-graphics')
-rw-r--r--meta-oe/recipes-graphics/fbida/fbida_git.bb2
-rw-r--r--meta-oe/recipes-graphics/leptonica/leptonica_1.70.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-oe/recipes-graphics/fbida/fbida_git.bb b/meta-oe/recipes-graphics/fbida/fbida_git.bb
index f4dd01d8bb..41c14b88af 100644
--- a/meta-oe/recipes-graphics/fbida/fbida_git.bb
+++ b/meta-oe/recipes-graphics/fbida/fbida_git.bb
@@ -18,7 +18,7 @@ S = "${WORKDIR}/git"
EXTRA_OEMAKE = "STRIP="
PACKAGECONFIG ??= "gif png"
-PACKAGECONFIG[gif] = ",,libungif"
+PACKAGECONFIG[gif] = ",,giflib"
PACKAGECONFIG[png] = ",,libpng"
PACKAGECONFIG[tiff] = ",,tiff"
PACKAGECONFIG[motif] = ",,libx11 libxext libxpm libxt openmotif"
diff --git a/meta-oe/recipes-graphics/leptonica/leptonica_1.70.bb b/meta-oe/recipes-graphics/leptonica/leptonica_1.70.bb
index 6d57da7430..e826e05bf8 100644
--- a/meta-oe/recipes-graphics/leptonica/leptonica_1.70.bb
+++ b/meta-oe/recipes-graphics/leptonica/leptonica_1.70.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "A pedagogically-oriented open source site containing software that is broadly useful for image processing and image analysis applications"
-DEPENDS = "jpeg tiff libpng zlib libungif"
+DEPENDS = "jpeg tiff libpng zlib giflib"
LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://leptonica-license.txt;md5=20cdd3af097ca431b82004c691f406a6"