diff --git a/graphics/jpeg-turbo/Makefile b/graphics/jpeg-turbo/Makefile index 316185793f2d..e892a2da31c2 100644 --- a/graphics/jpeg-turbo/Makefile +++ b/graphics/jpeg-turbo/Makefile @@ -1,55 +1,60 @@ PORTNAME= jpeg-turbo -DISTVERSION= 2.1.5.1 +DISTVERSION= 3.0.0 PORTREVISION?= 0 CATEGORIES= graphics MASTER_SITES= SF/lib${PORTNAME}/${DISTVERSION} DISTNAME= lib${PORTNAME}-${DISTVERSION} +PATCH_SITES= https://github.com/libjpeg-turbo/libjpeg-turbo/commit/ +PATCHFILES= 035ea386d1b6a99a8a1e2ab57cc1fc903569136c.patch:-p1 + 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 USES= cmake cpe pathfix 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} == i386 || ${ARCH} == amd64 BUILD_DEPENDS+= nasm:devel/nasm .endif .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 d809d074ddc5..80ed86f3deae 100644 --- a/graphics/jpeg-turbo/distinfo +++ b/graphics/jpeg-turbo/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1675923680 -SHA256 (libjpeg-turbo-2.1.5.1.tar.gz) = 2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf -SIZE (libjpeg-turbo-2.1.5.1.tar.gz) = 2264936 +TIMESTAMP = 1689030143 +SHA256 (libjpeg-turbo-3.0.0.tar.gz) = c77c65fcce3d33417b2e90432e7a0eb05f59a7fff884022a9d931775d583bfaa +SIZE (libjpeg-turbo-3.0.0.tar.gz) = 2799663 +SHA256 (035ea386d1b6a99a8a1e2ab57cc1fc903569136c.patch) = 6acb276db2875b9929b2d6697c5cb22b842fec35bc325fbcc0d0b795ee582900 +SIZE (035ea386d1b6a99a8a1e2ab57cc1fc903569136c.patch) = 4194 diff --git a/graphics/jpeg-turbo/pkg-plist b/graphics/jpeg-turbo/pkg-plist index a2ff841b8b09..47381dba38f7 100644 --- a/graphics/jpeg-turbo/pkg-plist +++ b/graphics/jpeg-turbo/pkg-plist @@ -1,30 +1,30 @@ %%JPEG%%bin/cjpeg %%JPEG%%bin/djpeg %%JPEG%%bin/jpegtran %%JPEG%%bin/rdjpgcom %%JPEG%%bin/wrjpgcom %%JPEG%%include/jconfig.h %%JPEG%%include/jerror.h %%JPEG%%include/jmorecfg.h %%JPEG%%include/jpeglib.h %%JPEG%%lib/cmake/libjpeg-turbo/libjpeg-turboConfig.cmake %%JPEG%%lib/cmake/libjpeg-turbo/libjpeg-turboConfigVersion.cmake %%JPEG%%lib/cmake/libjpeg-turbo/libjpeg-turboTargets-%%CMAKE_BUILD_TYPE%%.cmake %%JPEG%%lib/cmake/libjpeg-turbo/libjpeg-turboTargets.cmake %%JPEG%%lib/libjpeg.a %%JPEG%%lib/libjpeg.so %%JPEG%%lib/libjpeg.so.8 -%%JPEG%%lib/libjpeg.so.8.2.2 +%%JPEG%%lib/libjpeg.so.8.3.2 %%JPEG%%libdata/pkgconfig/libjpeg.pc %%JPEG%%man/man1/cjpeg.1.gz %%JPEG%%man/man1/djpeg.1.gz %%JPEG%%man/man1/jpegtran.1.gz %%JPEG%%man/man1/rdjpgcom.1.gz %%JPEG%%man/man1/wrjpgcom.1.gz %%LIBTURBOJPEG%%bin/tjbench %%LIBTURBOJPEG%%include/turbojpeg.h %%LIBTURBOJPEG%%lib/libturbojpeg.a %%LIBTURBOJPEG%%lib/libturbojpeg.so %%LIBTURBOJPEG%%lib/libturbojpeg.so.0 -%%LIBTURBOJPEG%%lib/libturbojpeg.so.0.2.0 +%%LIBTURBOJPEG%%lib/libturbojpeg.so.0.3.0 %%LIBTURBOJPEG%%libdata/pkgconfig/libturbojpeg.pc diff --git a/graphics/libjpeg-turbo/Makefile b/graphics/libjpeg-turbo/Makefile index 7fecedb3cb07..0f8ffe24ae3d 100644 --- a/graphics/libjpeg-turbo/Makefile +++ b/graphics/libjpeg-turbo/Makefile @@ -1,11 +1,11 @@ PKGNAMEPREFIX= lib PORTREVISION= 1 COMMENT= SIMD-accelerated JPEG codec library, provides libTurboJPEG -WWW= https://libjpeg-turbo.virtualgl.org/ +WWW= https://libjpeg-turbo.org/ MASTERDIR= ${.CURDIR:H}/jpeg-turbo SLAVE_PORT= yes OPTIONS_EXCLUDE=DOCS .include "${MASTERDIR}/Makefile"