- Update jpeg-turbo to 1.5.1

- Add LICENSE
- Use the framework for tests

6 files changed, 51 insertions, 7 deletions

diff --git a/graphics/jpeg-turbo/Makefile b/graphics/jpeg-turbo/Makefile
index bd5dc8364c8d..19f107b9d4d8 100644
--- a/graphics/jpeg-turbo/Makefile
+++ b/graphics/jpeg-turbo/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	jpeg-turbo
-PORTVERSION=	1.4.2
+PORTVERSION=	1.5.1
 PORTREVISION?=	0
 CATEGORIES=	graphics
 MASTER_SITES=	SF/lib${PORTNAME}/${PORTVERSION}
@@ -11,12 +11,21 @@ DISTNAME=	lib${PORTNAME}-${PORTVERSION}
 MAINTAINER=	portmgr@FreeBSD.org
 COMMENT?=	SIMD-accelerated JPEG codec which replaces libjpeg
 
-USES=		cpe libtool
+LICENSE=	BSD3CLAUSE IJG ZLIB 
+LICENSE_COMB=	multi
+LICENSE_GROUPS_IJG=	FSF GPL
+LICENSE_NAME_IJG=	Independent JPEG Group License
+LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/turbojpeg.c
+LICENSE_FILE_IJG=	${WRKSRC}/README.ijg
+LICENSE_FILE_ZLIB=	${WRKSRC}/simd/jsimdext.inc
+LICENSE_PERMS_IJG=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
+USES=		cpe libtool pathfix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-jpeg8
 USE_LDCONFIG=	yes
-ALL_TARGET=	test
 INSTALL_TARGET=	install-strip
+TEST_TARGET=	test
 CPE_VENDOR=	d.r.commander
 CPE_PRODUCT=	libjpeg-turbo
 
diff --git a/graphics/jpeg-turbo/distinfo b/graphics/jpeg-turbo/distinfo
index f55f5f8c3372..46b95c5cca85 100644
--- a/graphics/jpeg-turbo/distinfo
+++ b/graphics/jpeg-turbo/distinfo
@@ -1,2 +1,3 @@
-SHA256 (libjpeg-turbo-1.4.2.tar.gz) = 521bb5d3043e7ac063ce3026d9a59cc2ab2e9636c655a2515af5f4706122233e
-SIZE (libjpeg-turbo-1.4.2.tar.gz) = 1569306
+TIMESTAMP = 1475991658
+SHA256 (libjpeg-turbo-1.5.1.tar.gz) = 41429d3d253017433f66e3d472b8c7d998491d2f41caa7306b8d9a6f2a2c666c
+SIZE (libjpeg-turbo-1.5.1.tar.gz) = 1650647
diff --git a/graphics/jpeg-turbo/files/patch-md5_md5.c b/graphics/jpeg-turbo/files/patch-md5_md5.c
index 3495ee0e272d..dfbd0b8b53ad 100644
--- a/graphics/jpeg-turbo/files/patch-md5_md5.c
+++ b/graphics/jpeg-turbo/files/patch-md5_md5.c
@@ -1,4 +1,4 @@
---- md5/md5.c.orig	2014-08-30 13:52:09 UTC
+--- md5/md5.c.orig	2016-09-20 23:36:59 UTC
 +++ md5/md5.c
 @@ -45,6 +45,8 @@ static void MD5Transform(unsigned int [4
  #include <libkern/OSByteOrder.h>
diff --git a/graphics/jpeg-turbo/pkg-plist b/graphics/jpeg-turbo/pkg-plist
index 7e8881a9ddd1..ef955e6d3279 100644
--- a/graphics/jpeg-turbo/pkg-plist
+++ b/graphics/jpeg-turbo/pkg-plist
@@ -10,7 +10,8 @@
 %%JPEG%%lib/libjpeg.a
 %%JPEG%%lib/libjpeg.so
 %%JPEG%%lib/libjpeg.so.8
-%%JPEG%%lib/libjpeg.so.8.0.2
+%%JPEG%%lib/libjpeg.so.8.1.2
+%%JPEG%%libdata/pkgconfig/libjpeg.pc
 %%JPEG%%man/man1/cjpeg.1.gz
 %%JPEG%%man/man1/djpeg.1.gz
 %%JPEG%%man/man1/jpegtran.1.gz
@@ -22,3 +23,4 @@
 %%LIBTURBOJPEG%%lib/libturbojpeg.so
 %%LIBTURBOJPEG%%lib/libturbojpeg.so.0
 %%LIBTURBOJPEG%%lib/libturbojpeg.so.0.1.0
+%%LIBTURBOJPEG%%libdata/pkgconfig/libturbojpeg.pc
diff --git a/graphics/libgphoto2/files/patch-camlibs_ax203_jpeg__memsrcdest.h b/graphics/libgphoto2/files/patch-camlibs_ax203_jpeg__memsrcdest.h
new file mode 100644
index 000000000000..f38bc4cd5012
--- /dev/null
+++ b/graphics/libgphoto2/files/patch-camlibs_ax203_jpeg__memsrcdest.h
@@ -0,0 +1,16 @@
+--- camlibs/ax203/jpeg_memsrcdest.h.orig	2015-08-08 15:57:29 UTC
++++ camlibs/ax203/jpeg_memsrcdest.h
+@@ -1,5 +1,7 @@
+ #include <jpeglib.h>
+ 
++#if JPEG_LIB_VERSION < 80
++
+ void
+ jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer,
+ 	unsigned long bufsize);
+@@ -7,3 +9,5 @@ jpeg_mem_src (j_decompress_ptr cinfo, un
+ void
+ jpeg_mem_dest (j_compress_ptr cinfo, unsigned char ** outbuffer,
+ 	unsigned long * outsize);
++
++#endif
diff --git a/graphics/libgphoto2/files/patch-camlibs_jl2005c_jpeg__memsrcdest.h b/graphics/libgphoto2/files/patch-camlibs_jl2005c_jpeg__memsrcdest.h
new file mode 100644
index 000000000000..a439119fbb33
--- /dev/null
+++ b/graphics/libgphoto2/files/patch-camlibs_jl2005c_jpeg__memsrcdest.h
@@ -0,0 +1,16 @@
+--- camlibs/jl2005c/jpeg_memsrcdest.h.orig	2015-08-08 15:57:29 UTC
++++ camlibs/jl2005c/jpeg_memsrcdest.h
+@@ -1,5 +1,7 @@
+ #include <jpeglib.h>
+ 
++#if JPEG_LIB_VERSION < 80
++
+ void
+ jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer,
+ 	unsigned long bufsize);
+@@ -7,3 +9,5 @@ jpeg_mem_src (j_decompress_ptr cinfo, un
+ void
+ jpeg_mem_dest (j_compress_ptr cinfo, unsigned char ** outbuffer,
+ 	unsigned long * outsize);
++
++#endif