aboutsummaryrefslogtreecommitdiff
path: root/package/jpeg
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <jacmet@sunsite.dk>2012-12-13 23:58:11 +0100
committerGravatar Peter Korsgaard <jacmet@sunsite.dk>2012-12-14 00:03:32 +0100
commit21dd3e777b5b9eb40c6e0fe9fadcf0c7fcc63901 (patch)
tree22cac2a11a428a7af3695554cf734f92f9d0f20a /package/jpeg
parent39348d803bda0c0f33805b06d302669293e4d38a (diff)
downloadbuildroot-21dd3e777b5b9eb40c6e0fe9fadcf0c7fcc63901.tar.gz
buildroot-21dd3e777b5b9eb40c6e0fe9fadcf0c7fcc63901.tar.bz2
package: add selection between libjpeg and jpeg-turbo
Introduce a virtual 'jpeg' package, which pulls in either libjpeg or jpeg-turbo depending on a choice selection. Rename jpeg package to libjpeg so we can reuse 'jpeg' for the virtual package, making the change transparent to existing users and all the packages using libjpeg. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/jpeg')
-rw-r--r--package/jpeg/Config.in27
-rw-r--r--package/jpeg/jpeg.mk15
2 files changed, 30 insertions, 12 deletions
diff --git a/package/jpeg/Config.in b/package/jpeg/Config.in
index 36d73c51c9..9508faf24d 100644
--- a/package/jpeg/Config.in
+++ b/package/jpeg/Config.in
@@ -1,6 +1,33 @@
config BR2_PACKAGE_JPEG
+ bool "jpeg support"
+ help
+ Select the desired JPEG library provider.
+
+if BR2_PACKAGE_JPEG
+
+choice
+ prompt "jpeg variant"
+ default BR2_PACKAGE_JPEG_TURBO if (BR2_X86_CPU_HAS_MMX || BR2_ARM_CPU_HAS_NEON)
+ help
+ Select the older stable version, or the newer developer version
+
+config BR2_PACKAGE_LIBJPEG
bool "jpeg"
help
The ubiquitous C library for manipulating JPEG images.
http://www.ijg.org/
+
+config BR2_PACKAGE_JPEG_TURBO
+ bool "jpeg-turbo"
+ help
+ Libjpeg-turbo is a derivative of libjpeg that uses SIMD
+ instructions (MMX, SSE2, NEON) to accelerate baseline JPEG
+ compression and decompression on x86, x86-64, and ARM
+ systems.
+
+ http://www.libjpeg-turbo.org
+
+endchoice
+
+endif
diff --git a/package/jpeg/jpeg.mk b/package/jpeg/jpeg.mk
index d7ef25a8ce..9f40e6f789 100644
--- a/package/jpeg/jpeg.mk
+++ b/package/jpeg/jpeg.mk
@@ -1,18 +1,9 @@
#############################################################
#
-# jpeg (libraries needed by some apps)
+# jpeg
#
#############################################################
-JPEG_VERSION = 8d
-JPEG_SITE = http://www.ijg.org/files/
-JPEG_SOURCE = jpegsrc.v$(JPEG_VERSION).tar.gz
-JPEG_INSTALL_STAGING = YES
-define JPEG_REMOVE_USELESS_TOOLS
- rm -f $(addprefix $(TARGET_DIR)/usr/bin/,cjpeg djpeg jpegtrans rdjpgcom wrjpgcom)
-endef
+jpeg: $(if $(BR2_PACKAGE_JPEG_TURBO),jpeg-turbo,libjpeg)
-JPEG_POST_INSTALL_TARGET_HOOKS += JPEG_REMOVE_USELESS_TOOLS
-
-$(eval $(autotools-package))
-$(eval $(host-autotools-package))
+host-jpeg: host-libjpeg