X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Flibjpeg;h=6251fc85b4423918522b93ea5a36282b6623f156;hp=8b4c0778c980b9dd6a5ab5c99a23ff44dc404a6c;hb=15b1a3e360a277dc7481103f8ddcbf189033e3a6;hpb=188c4ba444b31343c29b311fcb2d0c0ba84e80ee

diff --git a/lfs/libjpeg b/lfs/libjpeg
index 8b4c0778c9..6251fc85b4 100644
--- a/lfs/libjpeg
+++ b/lfs/libjpeg
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2015  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,15 +24,13 @@
 
 include Config
 
-VER        = 1.3.1
+VER        = 1.5.1
 
 THISAPP    = libjpeg-turbo-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = libjpeg
-PAK_VER    = ipfire-beta1
 
 ###############################################################################
 # Top-level Rules
@@ -42,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 2c3a68129dac443a72815ff5bb374b05
+$(DL_FILE)_MD5 = 55deb139b0cac3c8200b75d485fc13f3
 
 install : $(TARGET)
 
@@ -72,9 +70,12 @@ $(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) && [ -e "libtool" ] || ln -svf /usr/bin/libtool libtool
+	cd $(DIR_APP) && ./configure --prefix=/usr \
+			--with-jpeg8 \
+			--disable-static\
+			--mandir=/usr/share/man
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
+