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>
This commit is contained in:
parent
9da584ea2b
commit
a3bc78b13b
@ -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.
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user