[PATCH] libjpeg: Update to 1.4.2

[PATCH] libjpeg: Update to 1.4.2

[Alexander Marx]

[-- Attachment #1: Type: text/plain, Size: 575 bytes --]

Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
---
 libjpeg/libjpeg.nm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libjpeg/libjpeg.nm b/libjpeg/libjpeg.nm
index 50c8b35..1dea7aa 100644
--- a/libjpeg/libjpeg.nm
+++ b/libjpeg/libjpeg.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = libjpeg
-version    = 1.2.0
-release    = 2
+version    = 1.4.2
+release    = 1
 thisapp    = libjpeg-turbo-%{version}
 
 groups     = System/Libraries
-- 
2.6.3

[PATCH] libjpeg: update to 1.4.2

[Marcel Lorenz]

[-- Attachment #1: Type: text/plain, Size: 140 bytes --]

Hi,

pelase not forget to merge the netpbm 10.47.61 patch from me.
The old will fail build with the new lib!

Greetinges,
Marcel
-- 
2.9.3

[PATCH] libjpeg: update to 1.4.2

[Marcel Lorenz]

[-- Attachment #1: Type: text/plain, Size: 2801 bytes --]

---
 config/rootfiles/common/libjpeg | 19 ++++++++++++++++---
 lfs/libjpeg                     |  9 +++++----
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/config/rootfiles/common/libjpeg b/config/rootfiles/common/libjpeg
index 7ceb697..4df7565 100644
--- a/config/rootfiles/common/libjpeg
+++ b/config/rootfiles/common/libjpeg
@@ -12,13 +12,13 @@
 #usr/lib/libjpeg.a
 #usr/lib/libjpeg.la
 #usr/lib/libjpeg.so
-usr/lib/libjpeg.so.62
-usr/lib/libjpeg.so.62.1.0
+usr/lib/libjpeg.so.8
+usr/lib/libjpeg.so.8.0.2
 #usr/lib/libturbojpeg.a
 #usr/lib/libturbojpeg.la
 #usr/lib/libturbojpeg.so
 usr/lib/libturbojpeg.so.0
-usr/lib/libturbojpeg.so.0.0.0
+usr/lib/libturbojpeg.so.0.1.0
 #usr/man/man1/cjpeg.1
 #usr/man/man1/djpeg.1
 #usr/man/man1/jpegtran.1
@@ -31,3 +31,16 @@ usr/lib/libturbojpeg.so.0.0.0
 #usr/share/doc/structure.txt
 #usr/share/doc/usage.txt
 #usr/share/doc/wizard.txt
+#usr/share/man/man1/cjpeg.1
+#usr/share/man/man1/djpeg.1
+#usr/share/man/man1/jpegtran.1
+#usr/share/man/man1/rdjpgcom.1
+#usr/share/man/man1/wrjpgcom.1
+#usr/share/doc/libjpeg-turbo
+#usr/share/doc/libjpeg-turbo/README
+#usr/share/doc/libjpeg-turbo/README-turbo.txt
+#usr/share/doc/libjpeg-turbo/example.c
+#usr/share/doc/libjpeg-turbo/libjpeg.txt
+#usr/share/doc/libjpeg-turbo/structure.txt
+#usr/share/doc/libjpeg-turbo/usage.txt
+#usr/share/doc/libjpeg-turbo/wizard.txt
diff --git a/lfs/libjpeg b/lfs/libjpeg
index 8b4c077..7751b31 100644
--- a/lfs/libjpeg
+++ b/lfs/libjpeg
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.3.1
+VER        = 1.4.2
 
 THISAPP    = libjpeg-turbo-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libjpeg
-PAK_VER    = ipfire-beta1
+DEPS       = ""
 
 ###############################################################################
 # Top-level Rules
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 2c3a68129dac443a72815ff5bb374b05
+$(DL_FILE)_MD5 = 86b0d5f7507c2e6c21c00219162c3c44
 
 install : $(TARGET)
 
@@ -72,9 +72,10 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --enable-static --enable-shared
+	cd $(DIR_APP) && ./configure --with-jpeg8 --prefix=/usr --disable-static --mandir=/usr/share/man
 	cd $(DIR_APP) && [ -e "libtool" ] || ln -svf /usr/bin/libtool libtool
 	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && rm -f /usr/lib/libjpeg.so*
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
-- 
1.9.1