From 6d22e86294a423b1d90d6844cb8a45a5f5434819 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Wed, 1 Jan 2020 14:24:59 +0000
Subject: [PATCH] update to libjpeg-turbo-2.0.4, some security-related fixes,
 see release notes at
 https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/2.0.4

---
 graphics/jpeg/Makefile  | 15 ++++++---------
 graphics/jpeg/distinfo  |  4 ++--
 graphics/jpeg/pkg/PLIST |  4 ++--
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile
index 1a94291be30..06f4b064070 100644
--- a/graphics/jpeg/Makefile
+++ b/graphics/jpeg/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.65 2019/11/24 17:21:24 espie Exp $
+# $OpenBSD: Makefile,v 1.66 2020/01/01 14:24:59 sthen Exp $
 
 COMMENT=	SIMD-accelerated JPEG codec replacement of libjpeg
 
-V=		2.0.3
-DISTNAME=	jpeg-turbo-${V}
+V=		2.0.4
+DISTNAME=	libjpeg-turbo-${V}
 PKGNAME=	jpeg-${V}
 EPOCH=		0
 
@@ -18,7 +18,6 @@ HOMEPAGE=	https://libjpeg-turbo.org/
 PERMIT_PACKAGE=	Yes
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libjpeg-turbo/}
-DISTFILES=	libjpeg-turbo-${V}.tar.gz
 
 WANTLIB=	c
 
@@ -28,11 +27,9 @@ MODULES=	devel/cmake
 BUILD_DEPENDS=	devel/yasm
 .endif
 
-CONFIGURE_ARGS+=-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
-		-DWITH_TURBOJPEG=False
-DEBUG_PACKAGES = ${BUILD_PACKAGES}
-
-WRKDIST=	${WRKDIR}/lib${DISTNAME}
+CONFIGURE_ARGS+= -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
+		 -DWITH_TURBOJPEG=False
+DEBUG_PACKAGES=	${BUILD_PACKAGES}
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/jpeg
diff --git a/graphics/jpeg/distinfo b/graphics/jpeg/distinfo
index c625c9fa50f..48d35771961 100644
--- a/graphics/jpeg/distinfo
+++ b/graphics/jpeg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libjpeg-turbo-2.0.3.tar.gz) = QkbeUAVE1O5AjuVwSKpKrcbxZfwX8UHah2afIO0yQbc=
-SIZE (libjpeg-turbo-2.0.3.tar.gz) = 2161279
+SHA256 (libjpeg-turbo-2.0.4.tar.gz) = M92FR+/VVDY56JDvvy71LVoh34H69Bu5QGV6+RaiNAY=
+SIZE (libjpeg-turbo-2.0.4.tar.gz) = 2161812
diff --git a/graphics/jpeg/pkg/PLIST b/graphics/jpeg/pkg/PLIST
index 54b55b8ccb0..c32e3433223 100644
--- a/graphics/jpeg/pkg/PLIST
+++ b/graphics/jpeg/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.16 2018/10/01 07:08:22 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.17 2020/01/01 14:24:59 sthen Exp $
 @bin bin/cjpeg
 @bin bin/djpeg
 @bin bin/jpegtran
@@ -8,7 +8,7 @@ include/jconfig.h
 include/jerror.h
 include/jmorecfg.h
 include/jpeglib.h
-lib/libjpeg.a
+@static-lib lib/libjpeg.a
 @lib lib/libjpeg.so.${LIBjpeg_VERSION}
 lib/pkgconfig/libjpeg.pc
 @man man/man1/cjpeg.1