summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--rules/libjpeg.in15
-rw-r--r--rules/libjpeg.make8
2 files changed, 19 insertions, 4 deletions
diff --git a/rules/libjpeg.in b/rules/libjpeg.in
index 30cea58f3..e9f1b667f 100644
--- a/rules/libjpeg.in
+++ b/rules/libjpeg.in
@@ -1,7 +1,18 @@
## SECTION=system_libraries
-config LIBJPEG
+menuconfig LIBJPEG
tristate
- prompt "libjpeg"
+ prompt "libjpeg "
help
libjpeg is a library for handling the JPEG (JFIF) image format.
+
+if LIBJPEG
+
+config LIBJPEG_BIN
+ bool
+ prompt "Install libjpeg binaries cjpeg and djpeg"
+ help
+ cjpeg and djpeg are simple bineries to convert some basic image
+ formats to jpeg (cjpeg) or convert them back from jpeg (djpeg)
+
+endif
diff --git a/rules/libjpeg.make b/rules/libjpeg.make
index c86d4089b..3ca715ec7 100644
--- a/rules/libjpeg.make
+++ b/rules/libjpeg.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBJPEG) += libjpeg
#
# Paths and names
#
-LIBJPEG_VERSION := 8a
-LIBJPEG_MD5 := 5146e68be3633c597b0d14d3ed8fa2ea
+LIBJPEG_VERSION := 9a
+LIBJPEG_MD5 := 3353992aecaee1805ef4109aadd433e7
LIBJPEG_SUFFIX := tar.gz
LIBJPEG := jpeg-$(LIBJPEG_VERSION)
LIBJPEG_TARBALL := jpegsrc.v$(LIBJPEG_VERSION).$(LIBJPEG_SUFFIX)
@@ -47,6 +47,10 @@ $(STATEDIR)/libjpeg.targetinstall:
@$(call install_fixup, libjpeg,DESCRIPTION,missing)
@$(call install_lib, libjpeg, 0, 0, 0644, libjpeg)
+ifdef PTXCONF_LIBJPEG_BIN
+ @$(call install_copy, libjpeg, 0, 0, 0755, -, /usr/bin/cjpeg)
+ @$(call install_copy, libjpeg, 0, 0, 0755, -, /usr/bin/djpeg)
+endif
@$(call install_finish, libjpeg)