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>

diff --git a/package/libsvg/Config.in b/package/libsvg/Config.in
index e3a5e729d0f63c1e49a82cf9b251976aab128562..741ef10c7a6321c75cde4f7d2f1a936ce3a7659a 100644 (file)
--- 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 a876c4e6c5573b8111a8176ea7570ce095457153..8b85d5a3d67d0a8878ff57de18d7564194722013 100644 (file)
--- 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 0a475f7ec85b325e4f42452056f9369140801239..6925e0122340ba0c31e213870d4361b36ee46cfb 100644 (file)
--- 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 6902aa89d2144daffc6b00538384afc604c71664..729680cafbe182e38a33de1db2fa65a62722d270 100644 (file)
--- 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)