From 6c5ff61a6aa1b81ee1ca4e54f16fe97a8f56aeac Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 11 Dec 2016 16:52:17 +0100 Subject: [PATCH] jpeg: rework jpeg-turbo simd support handling In preperation for adding more architectures to the jpeg-turbo simd handling, introduce a hidden BR2_PACKAGE_JPEG_SIMDS_SUPPORT symbol and use that to enable simd support and default to jpeg-turbo, instead of open coding it in both places. While we are at it, reword the help text to be more useful. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- package/jpeg-turbo/jpeg-turbo.mk | 2 +- package/jpeg/Config.in | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/jpeg-turbo/jpeg-turbo.mk b/package/jpeg-turbo/jpeg-turbo.mk index c3de04af7e..e2b7e63b9a 100644 --- a/package/jpeg-turbo/jpeg-turbo.mk +++ b/package/jpeg-turbo/jpeg-turbo.mk @@ -15,7 +15,7 @@ JPEG_TURBO_DEPENDENCIES = host-pkgconf JPEG_TURBO_CONF_OPTS = --with-jpeg8 -ifeq ($(BR2_X86_CPU_HAS_MMX)$(BR2_ARM_CPU_HAS_NEON),y) +ifeq ($(BR2_PACKAGE_JPEG_SIMD_SUPPORT),y) JPEG_TURBO_CONF_OPTS += --with-simd # x86 simd support needs nasm JPEG_TURBO_DEPENDENCIES += $(if $(BR2_X86_CPU_HAS_MMX),host-nasm) diff --git a/package/jpeg/Config.in b/package/jpeg/Config.in index f337aeb956..170e58c5d9 100644 --- a/package/jpeg/Config.in +++ b/package/jpeg/Config.in @@ -3,13 +3,18 @@ config BR2_PACKAGE_JPEG help Select the desired JPEG library provider. +# jpeg-turbo has simd support for some architectures +config BR2_PACKAGE_JPEG_SIMD_SUPPORT + bool + default y if BR2_X86_CPU_HAS_MMX || BR2_ARM_CPU_HAS_NEON + if BR2_PACKAGE_JPEG choice prompt "jpeg variant" - default BR2_PACKAGE_JPEG_TURBO if (BR2_X86_CPU_HAS_MMX || BR2_ARM_CPU_HAS_NEON) + default BR2_PACKAGE_JPEG_TURBO if BR2_PACKAGE_JPEG_SIMD_SUPPORT help - Select the older stable version, or the newer developer version + Select the normal libjpeg or libjpeg-turbo. config BR2_PACKAGE_LIBJPEG bool "jpeg" -- 2.30.2