diff --git a/graphics/jpeg-turbo/Makefile b/graphics/jpeg-turbo/Makefile index 9c4e64f79dd5..bf4c9692f445 100644 --- a/graphics/jpeg-turbo/Makefile +++ b/graphics/jpeg-turbo/Makefile @@ -1,57 +1,57 @@ PORTNAME= jpeg-turbo -DISTVERSION= 3.0.2 +DISTVERSION= 3.0.3 #PORTREVISION?= 1 CATEGORIES= graphics MASTER_SITES= https://github.com/lib${PORTNAME}/lib${PORTNAME}/releases/download/${DISTVERSION}/ DISTNAME= lib${PORTNAME}-${DISTVERSION} 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_GROUPS_IJG= FSF GPL LICENSE_NAME_IJG= Independent JPEG Group License 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 BUILD_DEPENDS= ${BUILD_DEPENDS_${ARCH}} BUILD_DEPENDS_amd64= nasm:devel/nasm BUILD_DEPENDS_i386= nasm:devel/nasm USES= cmake cpe pathfix +CPE_PRODUCT= libjpeg-turbo USE_LDCONFIG= yes -CPE_PRODUCT= libjpeg-turbo TEST_TARGET= test PORTDOCS= * DOCSDIR= ${PREFIX}/share/doc/libjpeg-turbo CMAKE_ON= WITH_JPEG8 # See https://github.com/libjpeg-turbo/libjpeg-turbo/issues/705 CMAKE_ARGS= -DCMAKE_CTEST_ARGUMENTS="-E;'djpeg12-shared-3x2-float-prog-cmp|djpeg12-static-3x2-float-prog-cmp'" OPTIONS_DEFINE= DOCS OPTIMIZED_CFLAGS OPTIONS_DEFAULT= OPTIMIZED_CFLAGS OPTIMIZED_CFLAGS_CFLAGS= -O3 .include .if ${ARCH} == armv6 CMAKE_OFF= WITH_SIMD .endif .if ${SLAVE_PORT} == yes PLIST_SUB+= JPEG="@comment " LIBTURBOJPEG="" .else CMAKE_OFF+= WITH_TURBOJPEG CONFLICTS_INSTALL= mozjpeg PLIST_SUB+= JPEG="" LIBTURBOJPEG="@comment " .endif .include diff --git a/graphics/jpeg-turbo/distinfo b/graphics/jpeg-turbo/distinfo index b692a5d50d7a..ce3043ff4276 100644 --- a/graphics/jpeg-turbo/distinfo +++ b/graphics/jpeg-turbo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1706835477 -SHA256 (libjpeg-turbo-3.0.2.tar.gz) = c2ce515a78d91b09023773ef2770d6b0df77d674e144de80d63e0389b3a15ca6 -SIZE (libjpeg-turbo-3.0.2.tar.gz) = 2831164 +TIMESTAMP = 1716048857 +SHA256 (libjpeg-turbo-3.0.3.tar.gz) = 343e789069fc7afbcdfe44dbba7dbbf45afa98a15150e079a38e60e44578865d +SIZE (libjpeg-turbo-3.0.3.tar.gz) = 2832827 diff --git a/graphics/jpeg-turbo/files/patch-CMakeLists.txt b/graphics/jpeg-turbo/files/patch-CMakeLists.txt index 339c381abded..ddca4a8dc9e4 100644 --- a/graphics/jpeg-turbo/files/patch-CMakeLists.txt +++ b/graphics/jpeg-turbo/files/patch-CMakeLists.txt @@ -1,25 +1,25 @@ ---- CMakeLists.txt.orig 2023-02-09 07:01:27 UTC +--- CMakeLists.txt.orig 2024-05-18 16:15:18 UTC +++ CMakeLists.txt -@@ -393,14 +393,14 @@ if(MSVC) +@@ -418,14 +418,14 @@ endif() add_definitions(-D_CRT_NONSTDC_NO_WARNINGS) endif() --if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang") +-if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "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") ++#if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "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")