NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

jpeg: rework jpeg-turbo simd support handling

Browse Source 
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 <peter@korsgaard.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Peter Korsgaard 2016-12-11 16:52:17 +01:00 committed by Thomas Petazzoni
parent b965cfc9f4
commit 6c5ff61a6a
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/jpeg-turbo/jpeg-turbo.mk
View File

@ -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)

9
package/jpeg/Config.in
View File

@ -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"