From patchwork Mon Dec 5 19:55:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 6278 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 "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4NQvRk4RqPz3wgN for ; Mon, 5 Dec 2022 19:55:46 +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 "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4NQvRj3HjNzmW; Mon, 5 Dec 2022 19:55:45 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4NQvRj2NcHz30BH; Mon, 5 Dec 2022 19:55:45 +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 "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4NQvRh3NBQz2xPk for ; Mon, 5 Dec 2022 19:55:44 +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) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4NQvRg4tftzMQ; Mon, 5 Dec 2022 19:55:43 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1670270143; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=1DaJ2lzEsAMwVCidi74E90pCWpB5qmgtjllOhkHBQW8=; b=NoUWYshZ67zWZsiNYcpC3c9cX9L5NEO+Az4N4dQWmGguyWmPMNKhWP6M4hOSSSjs/VYW6W GoOX2qzRYsu2VLDw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1670270143; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=1DaJ2lzEsAMwVCidi74E90pCWpB5qmgtjllOhkHBQW8=; b=VMSiaU/Ve/hRzTwt37DDHiCvbdglrPE1T1BsRGtpcjOsnGxxwn8WGwaYhRXUmIMhiYjx5B VcntloGuM4LJ9XqzVvRs4tYa89jOFG2+/N1S+/OWWOVJjjLGS4oRQ7pIdoeouG378HlUM1 nwhpd/4W84A25NMr19x8QVZ342Zc9AexwzmfWvIKNfoY1NBlGKpSHyLz8CUAwoB7+RZEX6 aCTkUYMilYH5Z7O9Pqp/S8eyDHuBmwuTMqcJNXxJf0c26JJ0DNCsUmhf1gCoDrcHK3BjfL z1Cz+eWQnYgKlfceUDdvtR5J66nnBKUIOSfqHYTwpxfyF6vXKCCmut8goqegDw== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH] libjpeg: Update to 2.1.4 Date: Mon, 5 Dec 2022 20:55:22 +0100 Message-Id: <20221205195522.134173-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 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" Signed-off-by: Stefan Schantl --- libjpeg/libjpeg.nm | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/libjpeg/libjpeg.nm b/libjpeg/libjpeg.nm index 1dea7aa92..b4d7b0eb0 100644 --- a/libjpeg/libjpeg.nm +++ b/libjpeg/libjpeg.nm @@ -4,7 +4,7 @@ ############################################################################### name = libjpeg -version = 1.4.2 +version = 2.1.4 release = 1 thisapp = libjpeg-turbo-%{version} @@ -27,18 +27,28 @@ source_dl = http://sourceforge.net/projects/libjpeg-turbo/files/%{version}/ build requires - autoconf - automake + cmake gcc-c++ - libtool nasm end - configure_options += \ - --enable-shared + # NASM object files are missing GNU Property note for Intel CET, + # force it on the resulting library + LDFLAGS +="-Wl,-z,ibt -Wl,-z,shstk" - prepare_cmds - autoreconf -vfi + export LD_LIBRARY_PATH = %{DIR_APP} + + build + %{cmake} . \ + -DCMAKE_SKIP_RPATH:BOOL=YES \ + -DCMAKE_SKIP_INSTALL_RPATH:BOOL=YES \ + -DENABLE_STATIC:BOOL=NO + + make %{PARALLELISMFLAGS} + end + + test + make test end end