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>
This commit is contained in:
Martin Jansa 2014-08-09 11:29:57 +02:00
parent 4d4ab8fd32
commit e213115b0b
3 changed files with 2 additions and 18 deletions

View File

@ -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"

View File

@ -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"

View File

@ -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"