git: c649b7e48298 - main - graphics/jpeg-turbo: Update to 2.1.1

[Daniel Engberg]

The branch main has been updated by diizzy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c649b7e482986dfdfa2875df051f482f0713c909

commit c649b7e482986dfdfa2875df051f482f0713c909
Author:     Daniel Engberg <diizzy at FreeBSD.org>
AuthorDate: 2021-09-19 18:52:03 +0000
Commit:     Daniel Engberg <diizzy at FreeBSD.org>
CommitDate: 2021-09-19 19:17:12 +0000

    graphics/jpeg-turbo: Update to 2.1.1
    
    Backport upstream commits:
    129f0cb76346ceede8f4d8d87dea8acb0809056c
    173900b1cabb027495ae530c71250bcedc9925d5
    
    exp-run by antoine
    Additional build tests on aarch64 by mikael
    
    PR:             258336
    Approved by:    arrowd
    Differential Revision:  https://reviews.freebsd.org/D31988
---
 graphics/jpeg-turbo/Makefile  | 10 +++++++---
 graphics/jpeg-turbo/distinfo  | 10 +++++++---
 graphics/jpeg-turbo/pkg-plist |  4 ++++
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/graphics/jpeg-turbo/Makefile b/graphics/jpeg-turbo/Makefile
index 34d99b80b35f..a763cb824ebf 100644
--- a/graphics/jpeg-turbo/Makefile
+++ b/graphics/jpeg-turbo/Makefile
@@ -1,11 +1,15 @@
 # Created by: Denis Podolskiy <bytestore at yandex.ru>
 
 PORTNAME=	jpeg-turbo
-PORTVERSION=	2.0.6
+DISTVERSION=	2.1.1
 PORTREVISION?=	0
 CATEGORIES=	graphics
-MASTER_SITES=	SF/lib${PORTNAME}/${PORTVERSION}
-DISTNAME=	lib${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	SF/lib${PORTNAME}/${DISTVERSION}
+DISTNAME=	lib${PORTNAME}-${DISTVERSION}
+
+PATCH_SITES=	https://github.com/libjpeg-turbo/libjpeg-turbo/commit/
+PATCHFILES=	173900b1cabb027495ae530c71250bcedc9925d5.patch:-p1 \
+		129f0cb76346ceede8f4d8d87dea8acb0809056c.patch:-p1
 
 MAINTAINER=	portmgr at FreeBSD.org
 COMMENT?=	SIMD-accelerated JPEG codec which replaces libjpeg
diff --git a/graphics/jpeg-turbo/distinfo b/graphics/jpeg-turbo/distinfo
index 85cd570680a9..6615302b3bdd 100644
--- a/graphics/jpeg-turbo/distinfo
+++ b/graphics/jpeg-turbo/distinfo
@@ -1,3 +1,7 @@
-TIMESTAMP = 1605684017
-SHA256 (libjpeg-turbo-2.0.6.tar.gz) = d74b92ac33b0e3657123ddcf6728788c90dc84dcb6a52013d758af3c4af481bb
-SIZE (libjpeg-turbo-2.0.6.tar.gz) = 2192315
+TIMESTAMP = 1631014994
+SHA256 (libjpeg-turbo-2.1.1.tar.gz) = b76aaedefb71ba882cbad4e9275b30c2ae493e3195be0a099425b5c6b99bd510
+SIZE (libjpeg-turbo-2.1.1.tar.gz) = 2256321
+SHA256 (173900b1cabb027495ae530c71250bcedc9925d5.patch) = 68e98cdb80e989840018fdad500073cf2f291b73693ae0da5b5964d65d6ad580
+SIZE (173900b1cabb027495ae530c71250bcedc9925d5.patch) = 1873
+SHA256 (129f0cb76346ceede8f4d8d87dea8acb0809056c.patch) = 0d0cb4e04c52151cbd44292e7d5c3c1f9bbf230123048e18125459ee8b56cc97
+SIZE (129f0cb76346ceede8f4d8d87dea8acb0809056c.patch) = 1991
diff --git a/graphics/jpeg-turbo/pkg-plist b/graphics/jpeg-turbo/pkg-plist
index ae21a2a923b9..a2ff841b8b09 100644
--- a/graphics/jpeg-turbo/pkg-plist
+++ b/graphics/jpeg-turbo/pkg-plist
@@ -7,6 +7,10 @@
 %%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