Index: head/graphics/jpeg-turbo/files/patch-md5_md5.c =================================================================== --- head/graphics/jpeg-turbo/files/patch-md5_md5.c (revision 477109) +++ head/graphics/jpeg-turbo/files/patch-md5_md5.c (nonexistent) @@ -1,11 +0,0 @@ ---- md5/md5.c.orig 2017-07-07 20:31:10 UTC -+++ md5/md5.c -@@ -54,6 +54,8 @@ static void MD5Transform(unsigned int [4 - #include - #define le32toh(x) OSSwapLittleToHostInt32(x) - #define htole32(x) OSSwapHostToLittleInt32(x) -+#elif defined(__FreeBSD__) -+#include - #endif - - /* Property changes on: head/graphics/jpeg-turbo/files/patch-md5_md5.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/jpeg-turbo/Makefile =================================================================== --- head/graphics/jpeg-turbo/Makefile (revision 477109) +++ head/graphics/jpeg-turbo/Makefile (revision 477110) @@ -1,60 +1,49 @@ # Created by: Denis Podolskiy # $FreeBSD$ PORTNAME= jpeg-turbo -PORTVERSION= 1.5.3 +PORTVERSION= 2.0.0 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 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_BSD3CLAUSE= ${WRKSRC}/LICENSE.md LICENSE_FILE_IJG= ${WRKSRC}/README.ijg -LICENSE_FILE_ZLIB= ${WRKSRC}/simd/jsimdext.inc +LICENSE_FILE_ZLIB= ${WRKSRC}/LICENSE.md LICENSE_PERMS_IJG= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -USES= cpe libtool pathfix -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-jpeg8 +USES= cmake:outsource cpe USE_LDCONFIG= yes -INSTALL_TARGET= install-strip -TEST_TARGET= test +CMAKE_ON= WITH_JPEG8 CPE_VENDOR= d.r.commander CPE_PRODUCT= libjpeg-turbo +TEST_TARGET= test PORTDOCS= * -PORTEXAMPLES= * +DOCSDIR= ${PREFIX}/share/doc/libjpeg-turbo -OPTIONS_DEFINE= DOCS EXAMPLES +OPTIONS_DEFINE= DOCS -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 -USES+= jpeg PLIST_SUB+= JPEG="@comment " LIBTURBOJPEG="" .else -CONFIGURE_ARGS+=--without-turbojpeg +CMAKE_OFF= WITH_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 477109) +++ head/graphics/jpeg-turbo/distinfo (revision 477110) @@ -1,3 +1,3 @@ -TIMESTAMP = 1514013995 -SHA256 (libjpeg-turbo-1.5.3.tar.gz) = b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523 -SIZE (libjpeg-turbo-1.5.3.tar.gz) = 1658672 +TIMESTAMP = 1532858291 +SHA256 (libjpeg-turbo-2.0.0.tar.gz) = 778876105d0d316203c928fd2a0374c8c01f755d0a00b12a1c8934aeccff8868 +SIZE (libjpeg-turbo-2.0.0.tar.gz) = 2158457 Index: head/graphics/jpeg-turbo/pkg-plist =================================================================== --- head/graphics/jpeg-turbo/pkg-plist (revision 477109) +++ head/graphics/jpeg-turbo/pkg-plist (revision 477110) @@ -1,26 +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.1.2 +%%JPEG%%lib/libjpeg.so.8.2.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%%lib/libturbojpeg.so.0.2.0 %%LIBTURBOJPEG%%libdata/pkgconfig/libturbojpeg.pc Index: head/graphics/libjpeg-turbo/Makefile =================================================================== --- head/graphics/libjpeg-turbo/Makefile (revision 477109) +++ head/graphics/libjpeg-turbo/Makefile (revision 477110) @@ -1,13 +1,13 @@ # Created by: Denis Podolskiy # $FreeBSD$ PKGNAMEPREFIX= lib PORTREVISION= 0 COMMENT= SIMD-accelerated JPEG codec library, provides libTurboJPEG MASTERDIR= ${.CURDIR:H}/jpeg-turbo SLAVE_PORT= yes -OPTIONS_EXCLUDE=DOCS EXAMPLES +OPTIONS_EXCLUDE=DOCS .include "${MASTERDIR}/Makefile"