From patchwork Sun Apr 5 13:17:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 2895 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 48wDjz2jxVz3yBs for ; Sun, 5 Apr 2020 13:17:43 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48wDjy0ZpLz1pG; Sun, 5 Apr 2020 13:17:42 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48wDjx4hDQz2xrL; Sun, 5 Apr 2020 13:17:41 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 48wDjt6HvWz2xm4 for ; Sun, 5 Apr 2020 13:17:38 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 48wDjt2sHlzph for ; Sun, 5 Apr 2020 13:17:38 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1586092658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=sjb8LCwhzDRE5PDd52yPGQSo2nJsNtRkhU6oGrxyJfE=; b=H2eKlFyrbDzRQVFwfsEvKgtF2PpVr0Hav23ZxQ0ZJzUAeMCDbJqTEqql/51KJ4VoKz0Rfo 6+17qlD/NgRVI0Dw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1586092658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=sjb8LCwhzDRE5PDd52yPGQSo2nJsNtRkhU6oGrxyJfE=; b=AmVsjT1y/fV5K1zxeqbSQK5LCJLc0I08wlk+d0JYkFVx44609ABf70a9hD8kmqZxvVGktJ K9Ek2s78QHYqqzfSvkQs4FuBz1TPjEQPweoU6IMCAyJX7fyzjfimf6QBgsIKC/CpjxTzLS HA26GDDIYrpSdBGjCz+uGOcTXuU/68R+hrDrnshsrfVICNJRw8HLc1TGkJac1H31QK9sxZ Bhzjj9g/Tby3QunjEQ2rCIg09cLbVtBtagUnQdLoEE1JYIVdzgjap9rU3WuSB6gaRPCOer CluSonwdokZes6s8qE1aZFaTJIesWh9+vSzzsb+kf+DWAF+w1CcizJpRziUEiQ== From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH v2] libjpeg: Update to 2.0.4 Date: Sun, 5 Apr 2020 15:17:33 +0200 Message-Id: <20200405131733.6913-1-matthias.fischer@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.mailfrom=matthias.fischer@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" For details see: https://sourceforge.net/projects/libjpeg-turbo/files/2.0.4/ Signed-off-by: Matthias Fischer --- 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 # +# Copyright (C) 2007-2020 IPFire Team # # # # 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) -