diff --git a/graphics/jpeg-turbo/Makefile b/graphics/jpeg-turbo/Makefile index eb7e57fac1c2..030c925c8da8 100644 --- a/graphics/jpeg-turbo/Makefile +++ b/graphics/jpeg-turbo/Makefile @@ -1,56 +1,53 @@ PORTNAME= jpeg-turbo -DISTVERSION= 3.1.0 +DISTVERSION= 3.1.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 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 +OPTIONS_DEFINE= DOCS .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 63302aa7e8ed..28053eb0a408 100644 --- a/graphics/jpeg-turbo/distinfo +++ b/graphics/jpeg-turbo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1735201226 -SHA256 (libjpeg-turbo-3.1.0.tar.gz) = 9564c72b1dfd1d6fe6274c5f95a8d989b59854575d4bbee44ade7bc17aa9bc93 -SIZE (libjpeg-turbo-3.1.0.tar.gz) = 2507094 +TIMESTAMP = 1749870510 +SHA256 (libjpeg-turbo-3.1.1.tar.gz) = aadc97ea91f6ef078b0ae3a62bba69e008d9a7db19b34e4ac973b19b71b4217c +SIZE (libjpeg-turbo-3.1.1.tar.gz) = 2506010 diff --git a/graphics/jpeg-turbo/files/patch-CMakeLists.txt b/graphics/jpeg-turbo/files/patch-CMakeLists.txt deleted file mode 100644 index ddca4a8dc9e4..000000000000 --- a/graphics/jpeg-turbo/files/patch-CMakeLists.txt +++ /dev/null @@ -1,25 +0,0 @@ ---- CMakeLists.txt.orig 2024-05-18 16:15:18 UTC -+++ CMakeLists.txt -@@ -418,14 +418,14 @@ endif() - add_definitions(-D_CRT_NONSTDC_NO_WARNINGS) - endif() - --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 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")