glib: Update to 2.68.3

[people/pmueller/ipfire-2.x.git] / lfs / libjpeg

diff --git a/lfs/libjpeg b/lfs/libjpeg
index 5e0785926eb3d07e5d90e99bf5495bee4dc3a142..1fbcdf02a5da3ed02df2b9e72ce6a95bc8fa0d66 100644 (file)
--- a/lfs/libjpeg
+++ b/lfs/libjpeg
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2020  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.0
+VER        = 2.0.4
 
 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 = e1e65cc711a1ade1322c06ad4a647741
+$(DL_FILE)_MD5 = d01d9e0c28c27bc0de9f4e2e8ff49855
 
 install : $(TARGET)
 
@@ -72,9 +70,17 @@ $(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) && make $(MAKETUNING)
-       cd $(DIR_APP) && make install
+       cd $(DIR_APP) && mkdir -pv build
+       cd $(DIR_APP)/build && cmake .. \
+               -DCMAKE_INSTALL_PREFIX=/usr \
+               -DCMAKE_BUILD_TYPE=RELEASE \
+               -DENABLE_STATIC=FALSE \
+               -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/libjpeg-turbo \
+               -DCMAKE_INSTALL_MANDIR=/usr/share/man \
+               -DCMAKE_INSTALL_DEFAULT_LIBDIR=/usr/lib \
+               -DWITH_JPEG8=1
+       cd $(DIR_APP)/build && make $(MAKETUNING)
+       cd $(DIR_APP)/build && make install
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)