diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-12-30 12:21:59 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-12-30 12:21:59 +0100 |
| commit | a3bc78b13bdb32f28c76d8fb9f9acd5197ed3bb6 (patch) | |
| tree | 1e01a6c88cadd74c348a6134b865f30e59459cb1 | |
| parent | 9da584ea2b3319f8f36eb2b3380fb976f6a13572 (diff) | |
| download | buildroot-a3bc78b13bdb32f28c76d8fb9f9acd5197ed3bb6.tar.gz buildroot-a3bc78b13bdb32f28c76d8fb9f9acd5197ed3bb6.zip | |
minidlna, libsvg: do not use libjpeg directly, use jpeg
libjpeg should not be selected directly, as it is one implementation
of the virtual jpeg package. Consequently, this commit moves minidlna
and libsvg to use the jpeg virtual package instead.
The build has been tested with both libjpeg and jpeg-turbo variants.
Fixes:
http://autobuild.buildroot.org/results/a12/a12760dea9e9d7ca62d14d0821539cc4b0c76835/
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | package/libsvg/Config.in | 2 | ||||
| -rw-r--r-- | package/libsvg/libsvg.mk | 2 | ||||
| -rw-r--r-- | package/minidlna/Config.in | 2 | ||||
| -rw-r--r-- | package/minidlna/minidlna.mk | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/package/libsvg/Config.in b/package/libsvg/Config.in index e3a5e729d0..741ef10c7a 100644 --- a/package/libsvg/Config.in +++ b/package/libsvg/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_LIBSVG bool "libsvg" select BR2_PACKAGE_LIBPNG - select BR2_PACKAGE_LIBJPEG + select BR2_PACKAGE_JPEG select BR2_PACKAGE_LIBXML2 if !BR2_PACKAGE_EXPAT help Libsvg provides a parser for SVG content in files or buffers. diff --git a/package/libsvg/libsvg.mk b/package/libsvg/libsvg.mk index a876c4e6c5..8b85d5a3d6 100644 --- a/package/libsvg/libsvg.mk +++ b/package/libsvg/libsvg.mk @@ -6,7 +6,7 @@ LIBSVG_VERSION = 0.1.4 LIBSVG_SITE = http://cairographics.org/snapshots -LIBSVG_DEPENDENCIES = host-pkgconf libpng libjpeg +LIBSVG_DEPENDENCIES = host-pkgconf libpng jpeg LIBSVG_INSTALL_STAGING = YES LIBSVG_LICENSE = LGPLv2+ LIBSVG_LICENSE_FILES = COPYING diff --git a/package/minidlna/Config.in b/package/minidlna/Config.in index 0a475f7ec8..6925e01223 100644 --- a/package/minidlna/Config.in +++ b/package/minidlna/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_MINIDLNA select BR2_PACKAGE_LIBOGG select BR2_PACKAGE_LIBID3TAG # selects zlib select BR2_PACKAGE_LIBEXIF - select BR2_PACKAGE_LIBJPEG + select BR2_PACKAGE_JPEG select BR2_PACKAGE_SQLITE select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE depends on !BR2_nios2 # ffmpeg diff --git a/package/minidlna/minidlna.mk b/package/minidlna/minidlna.mk index 6902aa89d2..729680cafb 100644 --- a/package/minidlna/minidlna.mk +++ b/package/minidlna/minidlna.mk @@ -11,7 +11,7 @@ MINIDLNA_LICENSE_FILES = COPYING LICENCE.miniupnpd MINIDLNA_DEPENDENCIES = \ $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-gettext \ - ffmpeg flac libvorbis libogg libid3tag libexif libjpeg sqlite \ + ffmpeg flac libvorbis libogg libid3tag libexif jpeg sqlite \ host-xutil_makedepend ifeq ($(BR2_STATIC_LIBS),y) |
