From nobody Sun Feb 26 14:05:00 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PPlkh4pNDz3td51; Sun, 26 Feb 2023 14:05:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PPlkh3BBrz3j9s; Sun, 26 Feb 2023 14:05:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677420300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fm1K2QJhIRxH5JaQyVtntF+JT2fB8JRgXTvQooFwWFk=; b=vvD/x62gFiTbjdLwgwycTFij9K1Mfx/r+B6XcKctiMAhIpxJRZKiUEQgAj9+1zGSPBYUnf QowV12kPGyqRY7kGsAMrnRRLZbFuD+/tfyHt/Vw5gzM5ynyRw9nDUVbQhuHHmdVtzUOvcw CQvmjixOp/nZ6MlCM4iglvUONPjYrg+v1TsRv1/3JuwBvdk61ISbT9/NtxYgqed7HdrGd8 SROINAhr7cXvUWeEdkIh+e+9sMAW0LmeuHPoW3u7LJYxTOalomL0frqFbO1EiS/T7ffCU6 hy9FYma5M34ML6rFaA8XV3ecxJsLKYmG1v7CB0EQ277SF7Xfs4GT3iQ8ta2XAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677420300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fm1K2QJhIRxH5JaQyVtntF+JT2fB8JRgXTvQooFwWFk=; b=EAttjtBKeDAMkCFVMEbTDjrpMhlytpqmrj0zMHvScXylDxy9BVRGEUue29wctluBi/CHNA K/qfs1OugJmOCGFkR+J74IGOi+8F+l5yJM+Leu5mUoXG/sD0T+vN2rfawTTGy3ziY0L+6b YPie0RAFKXhWMwOUGoyG6YCJWg/U3jFPgUpjsQHfgHnJReFUbhpaMcmwhfz4fJ4CCQl0yl SnoVL70dSA9p2/FxIQ+KAfn+y6fWRLTl0c5bFEmG3pIz5udcg8z5JN20IxFGVnBXlgFu1g UdPRppRJgmVYaFuK0AA44+8wel0YvDJn4m0sD2wesvbh1yXh41LrpvYR5Ow2mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677420300; a=rsa-sha256; cv=none; b=TaKHzHlhVvK2tWOdU8VZBUc/KjORMJry1maKRcUkNgqkCh1OQ2g+rM8mY4BCqY5n8ge0tS F9l6wK2p1isFleWyjAkDr0YqggN6/MWa90P2Ji4346lyGj9Xu8bFTRkpW1e44qHddW60zC UoYY9rlPMeY3bkW1rrlJjEadUq2JP8iH4T9SxBN09X3dJlvsCyRxuzxhkMyaZp7ckpZvyS 9Re01EwWFHjRcnTEZrE8dH/UUVeMuU6Wo2N+IxIROIVzGZice2r+hgi35NRDhkRxUEuCuS rbYIP7v3FhYOvORE5/vPXCY+bva4nOJnowQLaHdn6ONSILCQJdS6xjq+yo0PtQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PPlkh2Cmyzp1c; Sun, 26 Feb 2023 14:05:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31QE50qK060341; Sun, 26 Feb 2023 14:05:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31QE50VV060340; Sun, 26 Feb 2023 14:05:00 GMT (envelope-from git) Date: Sun, 26 Feb 2023 14:05:00 GMT Message-Id: <202302261405.31QE50VV060340@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: af0a1a520425 - main - graphics/jpeg-turbo: Update to 2.1.5.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: af0a1a520425ca097b861ea7889f829c84d402b6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=af0a1a520425ca097b861ea7889f829c84d402b6 commit af0a1a520425ca097b861ea7889f829c84d402b6 Author: Daniel Engberg AuthorDate: 2023-02-26 13:50:46 +0000 Commit: Daniel Engberg CommitDate: 2023-02-26 14:04:48 +0000 graphics/jpeg-turbo: Update to 2.1.5.1 * Minor rearrangement of Makefile for better readbility * Adjust port to not override cflags defined by framework Changelog: https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/2.1.5.1 PR: 269449 Reviewed by: desktop (tcberner) Exp-run by: antoine --- graphics/jpeg-turbo/Makefile | 19 ++++++++++++------- graphics/jpeg-turbo/distinfo | 6 +++--- graphics/jpeg-turbo/files/patch-CMakeLists.txt | 25 +++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 10 deletions(-) diff --git a/graphics/jpeg-turbo/Makefile b/graphics/jpeg-turbo/Makefile index dda015ed04fa..316185793f2d 100644 --- a/graphics/jpeg-turbo/Makefile +++ b/graphics/jpeg-turbo/Makefile @@ -1,5 +1,5 @@ PORTNAME= jpeg-turbo -DISTVERSION= 2.1.4 +DISTVERSION= 2.1.5.1 PORTREVISION?= 0 CATEGORIES= graphics MASTER_SITES= SF/lib${PORTNAME}/${DISTVERSION} @@ -9,25 +9,30 @@ MAINTAINER= desktop@FreeBSD.org COMMENT?= SIMD-accelerated JPEG codec which replaces libjpeg WWW?= https://libjpeg-turbo.org/ -LICENSE= BSD3CLAUSE IJG ZLIB -LICENSE_COMB= multi +LICENSE= BSD3CLAUSE IJG ZLIB +LICENSE_COMB= multi LICENSE_GROUPS_IJG= FSF GPL LICENSE_NAME_IJG= Independent JPEG Group License -LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/LICENSE.md +LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/LICENSE.md LICENSE_FILE_IJG= ${WRKSRC}/README.ijg LICENSE_FILE_ZLIB= ${WRKSRC}/LICENSE.md LICENSE_PERMS_IJG= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -USES= cmake cpe +USES= cmake cpe pathfix USE_LDCONFIG= yes -CMAKE_ON= WITH_JPEG8 + CPE_PRODUCT= libjpeg-turbo TEST_TARGET= test PORTDOCS= * DOCSDIR= ${PREFIX}/share/doc/libjpeg-turbo -OPTIONS_DEFINE= DOCS +CMAKE_ON= WITH_JPEG8 + +OPTIONS_DEFINE= DOCS OPTIMIZED_CFLAGS +OPTIONS_DEFAULT= OPTIMIZED_CFLAGS + +OPTIMIZED_CFLAGS_CFLAGS= -O3 .include diff --git a/graphics/jpeg-turbo/distinfo b/graphics/jpeg-turbo/distinfo index 94dcee611bb2..d809d074ddc5 100644 --- a/graphics/jpeg-turbo/distinfo +++ b/graphics/jpeg-turbo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1660686752 -SHA256 (libjpeg-turbo-2.1.4.tar.gz) = d3ed26a1131a13686dfca4935e520eb7c90ae76fbc45d98bb50a8dc86230342b -SIZE (libjpeg-turbo-2.1.4.tar.gz) = 2261822 +TIMESTAMP = 1675923680 +SHA256 (libjpeg-turbo-2.1.5.1.tar.gz) = 2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf +SIZE (libjpeg-turbo-2.1.5.1.tar.gz) = 2264936 diff --git a/graphics/jpeg-turbo/files/patch-CMakeLists.txt b/graphics/jpeg-turbo/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..339c381abded --- /dev/null +++ b/graphics/jpeg-turbo/files/patch-CMakeLists.txt @@ -0,0 +1,25 @@ +--- CMakeLists.txt.orig 2023-02-09 07:01:27 UTC ++++ CMakeLists.txt +@@ -393,14 +393,14 @@ if(MSVC) + add_definitions(-D_CRT_NONSTDC_NO_WARNINGS) + endif() + +-if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang") +- # Use the maximum optimization level for release builds +- foreach(var CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_RELWITHDEBINFO) +- if(${var} MATCHES "-O2") +- string(REGEX REPLACE "-O2" "-O3" ${var} "${${var}}") +- endif() +- endforeach() +-endif() ++#if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang") ++# # Use the maximum optimization level for release builds ++# foreach(var CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_RELWITHDEBINFO) ++# if(${var} MATCHES "-O2") ++# string(REGEX REPLACE "-O2" "-O3" ${var} "${${var}}") ++# endif() ++# endforeach() ++#endif() + + if(CMAKE_SYSTEM_NAME STREQUAL "SunOS") + if(CMAKE_C_COMPILER_ID MATCHES "SunPro")