diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-08-09 11:29:57 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-08-11 10:59:17 +0200 |
commit | e213115b0b7b001eb5973d42dcae3bb1532a8583 (patch) | |
tree | 87b7845eb21a4bdc4e6d979d8e1f33dbc2c4a1ec | |
parent | 4d4ab8fd320b58323033c12cf705e7b3ce10d659 (diff) | |
download | meta-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>
-rw-r--r-- | meta-oe/recipes-extended/libungif/libungif_4.1.4.bb | 16 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/fbida/fbida_git.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/leptonica/leptonica_1.70.bb | 2 |
3 files changed, 2 insertions, 18 deletions
diff --git a/meta-oe/recipes-extended/libungif/libungif_4.1.4.bb b/meta-oe/recipes-extended/libungif/libungif_4.1.4.bb deleted file mode 100644 index aa05653846..0000000000 --- a/meta-oe/recipes-extended/libungif/libungif_4.1.4.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "shared library for GIF images" -SECTION = "libs" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=ae11c61b04b2917be39b11f78d71519a" - -SRC_URI = "${SOURCEFORGE_MIRROR}/giflib/libungif-4.x/libungif-${PV}/libungif-${PV}.tar.bz2" -SRC_URI[md5sum] = "76865bc1bed90ecb5992a1edcc4d6c15" -SRC_URI[sha256sum] = "708a7eac218d3fd8e8dfb13f1089d4e1e98246985180a17d6ecfca5a6bd4d332" - -inherit autotools lib_package - -PACKAGES =+ "${PN}-utils" - -FILES_${PN}-utils = "${bindir}/*" - -BBCLASSEXTEND = "native" 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" |