For details see: https://sourceforge.net/projects/libjpeg-turbo/files/2.0.4/

Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org --- config/rootfiles/common/libjpeg | 9 ++++----- lfs/libjpeg | 25 +++++++++++++++---------- 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/config/rootfiles/common/libjpeg b/config/rootfiles/common/libjpeg index 1c56023c4..eb74d2c50 100644 --- a/config/rootfiles/common/libjpeg +++ b/config/rootfiles/common/libjpeg @@ -9,23 +9,22 @@ #usr/include/jmorecfg.h #usr/include/jpeglib.h #usr/include/turbojpeg.h -#usr/lib/libjpeg.la #usr/lib/libjpeg.so usr/lib/libjpeg.so.8 -usr/lib/libjpeg.so.8.1.2 -#usr/lib/libturbojpeg.la +usr/lib/libjpeg.so.8.2.2 #usr/lib/libturbojpeg.so usr/lib/libturbojpeg.so.0 -usr/lib/libturbojpeg.so.0.1.0 +usr/lib/libturbojpeg.so.0.2.0 #usr/lib/pkgconfig/libjpeg.pc #usr/lib/pkgconfig/libturbojpeg.pc #usr/share/doc/libjpeg-turbo #usr/share/doc/libjpeg-turbo/LICENSE.md #usr/share/doc/libjpeg-turbo/README.ijg #usr/share/doc/libjpeg-turbo/README.md -#usr/share/doc/libjpeg-turbo/example.c +#usr/share/doc/libjpeg-turbo/example.txt #usr/share/doc/libjpeg-turbo/libjpeg.txt #usr/share/doc/libjpeg-turbo/structure.txt +#usr/share/doc/libjpeg-turbo/tjexample.c #usr/share/doc/libjpeg-turbo/usage.txt #usr/share/doc/libjpeg-turbo/wizard.txt #usr/share/man/man1/cjpeg.1 diff --git a/lfs/libjpeg b/lfs/libjpeg index 6251fc85b..1fbcdf02a 100644 --- a/lfs/libjpeg +++ b/lfs/libjpeg @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# 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,7 +24,7 @@

include Config

-VER = 1.5.1 +VER = 2.0.4

THISAPP = libjpeg-turbo-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 55deb139b0cac3c8200b75d485fc13f3 +$(DL_FILE)_MD5 = d01d9e0c28c27bc0de9f4e2e8ff49855

install : $(TARGET)

@@ -70,12 +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 \ - --with-jpeg8 \ - --disable-static\ - --mandir=/usr/share/man - 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) -