From: Stefan Schantl <Stevee@ipfire.org>
Date: Thu, 30 Jul 2009 09:23:03 +0000 (+0200)
Subject: Updated libjpeg to version 7.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a0db09a11303771804e014dd5b5a2a5d5e43d0b;p=ipfire-3.x.git

Updated libjpeg to version 7.
---

diff --git a/lfs/libjpeg b/lfs/libjpeg
index 95ad1c156..76cc65d87 100644
--- a/lfs/libjpeg
+++ b/lfs/libjpeg
@@ -25,7 +25,7 @@
 include Config
 
 PKG_NAME   = libjpeg
-PKG_VER    = 6b
+PKG_VER    = 7
 PKG_REL    = 0
 
 THISAPP    = $(PKG_NAME)-$(PKG_VER)
@@ -88,8 +88,8 @@ $(OBJECT): $(objects)
 			--prefix=/usr \
 			--disable-static \
 			--enable-shared	
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/libjpeg-6b-buffferoverflow.patch
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/libjpeg-6b-c++.patch
+	#cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/libjpeg-6b-buffferoverflow.patch
+	#cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/libjpeg-6b-c++.patch
 	cd $(DIR_APP) && make $(PARALLELISMFLAGS)
 	cd $(DIR_APP) && make install
 
diff --git a/src/rootfiles/core/libjpeg b/src/rootfiles/core/libjpeg
index e6db4f08d..7c310ea84 100644
--- a/src/rootfiles/core/libjpeg
+++ b/src/rootfiles/core/libjpeg
@@ -8,8 +8,8 @@
 #usr/include/jmorecfg.h
 #usr/include/jpeglib.h
 usr/lib/libjpeg.so
-usr/lib/libjpeg.so.62
-usr/lib/libjpeg.so.62.0.0
+usr/lib/libjpeg.so.7
+usr/lib/libjpeg.so.7.0.0
 #usr/share/man/man1/cjpeg.1
 #usr/share/man/man1/djpeg.1
 #usr/share/man/man1/jpegtran.1