From mboxrd@z Thu Jan 1 00:00:00 1970
From: Matthias Fischer <matthias.fischer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] libjpeg: Update to 2.0.4
Date: Sat, 04 Apr 2020 21:55:25 +0200
Message-ID: <20200404195525.3186-1-matthias.fischer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3080611014432346646=="
List-Id: <development.lists.ipfire.org>
--===============3080611014432346646==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
For details see:
https://sourceforge.net/projects/libjpeg-turbo/files/2.0.4/
Signed-off-by: Matthias Fischer <matthias.fischer(a)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(a)ipfire.org> =
#
+# Copyright (C) 2007-2020 IPFire Team <info(a)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 @@
=20
include Config
=20
-VER =3D 1.5.1
+VER =3D 2.0.4
=20
THISAPP =3D libjpeg-turbo-$(VER)
DL_FILE =3D $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects =3D $(DL_FILE)
=20
$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D 55deb139b0cac3c8200b75d485fc13f3
+$(DL_FILE)_MD5 =3D d01d9e0c28c27bc0de9f4e2e8ff49855
=20
install : $(TARGET)
=20
@@ -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=3D/usr \
- --with-jpeg8 \
- --disable-static\
- --mandir=3D/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=3D/usr \
+ -DCMAKE_BUILD_TYPE=3DRELEASE \
+ -DENABLE_STATIC=3DFALSE \
+ -DCMAKE_INSTALL_DOCDIR=3D/usr/share/doc/libjpeg-turbo \
+ -DCMAKE_INSTALL_MANDIR=3D/usr/share/man \
+ -DCMAKE_INSTALL_DEFAULT_LIBDIR=3D/usr/lib \
+ -DWITH_JPEG8=3D1
+ cd $(DIR_APP)/build && make $(MAKETUNING)
+ cd $(DIR_APP)/build && make install
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
-
--=20
2.18.0
--===============3080611014432346646==--