summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/jpeg-turbo/Makefile7
-rw-r--r--graphics/jpeg-turbo/distinfo8
-rw-r--r--graphics/jpeg-turbo/pkg-plist4
-rw-r--r--graphics/libjpeg-turbo/Makefile2
4 files changed, 14 insertions, 7 deletions
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,10 +1,13 @@
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/
@@ -28,6 +31,8 @@ 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
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
@@ -14,7 +14,7 @@
%%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
@@ -26,5 +26,5 @@
%%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
@@ -2,7 +2,7 @@ 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