package/jpeg: convert to the virtual-package infrastructure

Since this package is implemented via a choice rather than the usual
separate-package providers, we only need BR2_PACKAGE_HAS_JPEG to be
always defined when the 'jpeg' package is selected.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Eric Le Bihan <eric.le.bihan.dev@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Cc: Mike Zick <minimod@morethan.org>
Reviewed-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/jpeg/Config.in b/package/jpeg/Config.in
index b7cdfeb79a18c6a33d558728e9978590478b8b86..3042d247f917e7125cf6feb3fd3d62f69cb4b809 100644 (file)
--- a/package/jpeg/Config.in
+++ b/package/jpeg/Config.in
@@ -30,6 +30,9 @@ config BR2_PACKAGE_JPEG_TURBO
 
 endchoice
 
+config BR2_PACKAGE_HAS_JPEG
+       def_bool y
+
 config BR2_PACKAGE_PROVIDES_JPEG
        string
        default "libjpeg"    if BR2_PACKAGE_LIBJPEG

diff --git a/package/jpeg/jpeg.mk b/package/jpeg/jpeg.mk
index 3695bc818dcc9111faf8ec49be2a002b53e5897a..2d56be6a7cfa4e297b1af5ea2fcbbebd707083de 100644 (file)
--- a/package/jpeg/jpeg.mk
+++ b/package/jpeg/jpeg.mk
@@ -4,14 +4,4 @@
 #
 ################################################################################
 
-JPEG_SOURCE =
-JPEG_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_JPEG))
-
-ifeq ($(JPEG_DEPENDENCIES),)
-define JPEG_CONFIGURE_CMDS
-       echo "No JPEG implementation defined. Configuration error"
-       exit 1
-endef
-endif
-
-$(eval $(generic-package))
+$(eval $(virtual-package))