Date: Sun, 26 Feb 2023 14:05:00 GMT From: Daniel Engberg <diizzy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: af0a1a520425 - main - graphics/jpeg-turbo: Update to 2.1.5.1 Message-ID: <202302261405.31QE50VV060340@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=af0a1a520425ca097b861ea7889f829c84d402b6 commit af0a1a520425ca097b861ea7889f829c84d402b6 Author: Daniel Engberg <diizzy@FreeBSD.org> AuthorDate: 2023-02-26 13:50:46 +0000 Commit: Daniel Engberg <diizzy@FreeBSD.org> 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 <bsd.port.options.mk> 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")
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302261405.31QE50VV060340>