Index: head/graphics/jpeg-turbo/Makefile =================================================================== --- head/graphics/jpeg-turbo/Makefile (revision 423878) +++ head/graphics/jpeg-turbo/Makefile (revision 423879) @@ -1,50 +1,59 @@ # Created by: Denis Podolskiy # $FreeBSD$ PORTNAME= jpeg-turbo -PORTVERSION= 1.4.2 +PORTVERSION= 1.5.1 PORTREVISION?= 0 CATEGORIES= graphics MASTER_SITES= SF/lib${PORTNAME}/${PORTVERSION} 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 PORTDOCS= * PORTEXAMPLES= * OPTIONS_DEFINE= DOCS EXAMPLES DOCS_MAKE_ARGS= docdir="${DOCSDIR}" DOCS_MAKE_ARGS_OFF= dist_doc_DATA="" EXAMPLES_MAKE_ARGS= exampledir="${EXAMPLESDIR}" EXAMPLES_MAKE_ARGS_OFF= dist_example_DATA="" .include .if ${ARCH} == i386 || ${ARCH} == amd64 BUILD_DEPENDS+= nasm:devel/nasm .endif .if ${SLAVE_PORT} == yes # libturbojpeg.a has to be built with PIC for virtualgl CONFIGURE_ARGS+=--with-pic PLIST_SUB+= JPEG="@comment " LIBTURBOJPEG="" .else CONFIGURE_ARGS+=--without-turbojpeg CONFLICTS_INSTALL= jpeg-[0-9]* PLIST_SUB+= JPEG="" LIBTURBOJPEG="@comment " .endif .include Index: head/graphics/jpeg-turbo/distinfo =================================================================== --- head/graphics/jpeg-turbo/distinfo (revision 423878) +++ head/graphics/jpeg-turbo/distinfo (revision 423879) @@ -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 Index: head/graphics/jpeg-turbo/files/patch-md5_md5.c =================================================================== --- head/graphics/jpeg-turbo/files/patch-md5_md5.c (revision 423878) +++ head/graphics/jpeg-turbo/files/patch-md5_md5.c (revision 423879) @@ -1,11 +1,11 @@ ---- 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 #define le32toh(x) OSSwapLittleToHostInt32(x) #define htole32(x) OSSwapHostToLittleInt32(x) +#elif defined(__FreeBSD__) +#include #endif /* Index: head/graphics/jpeg-turbo/pkg-plist =================================================================== --- head/graphics/jpeg-turbo/pkg-plist (revision 423878) +++ head/graphics/jpeg-turbo/pkg-plist (revision 423879) @@ -1,24 +1,26 @@ %%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/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 %%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.1.0 +%%LIBTURBOJPEG%%libdata/pkgconfig/libturbojpeg.pc Index: head/graphics/libgphoto2/files/patch-camlibs_ax203_jpeg__memsrcdest.h =================================================================== --- head/graphics/libgphoto2/files/patch-camlibs_ax203_jpeg__memsrcdest.h (nonexistent) +++ head/graphics/libgphoto2/files/patch-camlibs_ax203_jpeg__memsrcdest.h (revision 423879) @@ -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 + ++#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 Property changes on: head/graphics/libgphoto2/files/patch-camlibs_ax203_jpeg__memsrcdest.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/libgphoto2/files/patch-camlibs_jl2005c_jpeg__memsrcdest.h =================================================================== --- head/graphics/libgphoto2/files/patch-camlibs_jl2005c_jpeg__memsrcdest.h (nonexistent) +++ head/graphics/libgphoto2/files/patch-camlibs_jl2005c_jpeg__memsrcdest.h (revision 423879) @@ -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 + ++#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 Property changes on: head/graphics/libgphoto2/files/patch-camlibs_jl2005c_jpeg__memsrcdest.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/multimedia/libv4l/files/patch-lib_libv4lconvert_jpeg__memsrcdest.h =================================================================== --- head/multimedia/libv4l/files/patch-lib_libv4lconvert_jpeg__memsrcdest.h (nonexistent) +++ head/multimedia/libv4l/files/patch-lib_libv4lconvert_jpeg__memsrcdest.h (revision 423879) @@ -0,0 +1,16 @@ +--- lib/libv4lconvert/jpeg_memsrcdest.h.orig 2012-05-10 18:10:34 UTC ++++ lib/libv4lconvert/jpeg_memsrcdest.h +@@ -1,5 +1,7 @@ + #include + ++#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 Property changes on: head/multimedia/libv4l/files/patch-lib_libv4lconvert_jpeg__memsrcdest.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property