From mboxrd@z Thu Jan  1 00:00:00 1970
From: Marcel Lorenz <lorenz.marcel@web.de>
To: development@lists.ipfire.org
Subject: [PATCH] libjpeg: update to 1.4.2
Date: Thu, 18 Feb 2016 12:56:54 +0100
Message-ID: <1455796614-1829-1-git-send-email-lorenz.marcel@web.de>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7470826268241245949=="
List-Id: <development.lists.ipfire.org>

--===============7470826268241245949==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

---
 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 @@
=20
 include Config
=20
-VER        =3D 1.3.1
+VER        =3D 1.4.2
=20
 THISAPP    =3D libjpeg-turbo-$(VER)
 DL_FILE    =3D $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D libjpeg
-PAK_VER    =3D ipfire-beta1
+DEPS       =3D ""
=20
 ############################################################################=
###
 # Top-level Rules
@@ -42,7 +42,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D 2c3a68129dac443a72815ff5bb374b05
+$(DL_FILE)_MD5 =3D 86b0d5f7507c2e6c21c00219162c3c44
=20
 install : $(TARGET)
=20
@@ -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=3D/usr --enable-static --enable-shared
+	cd $(DIR_APP) && ./configure --with-jpeg8 --prefix=3D/usr --disable-static =
--mandir=3D/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)
--=20
1.9.1


--===============7470826268241245949==--