Attachment 195603 Details for Bug 230143 – turbo-2.diff

[patch] turbo-2.diff

turbo-2.diff (text/plain), 4.31 KB, created by Antoine Brodin on 2018-07-29 18:32:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Antoine Brodin

Created: 2018-07-29 18:32:12 UTC

Size: 4.31 KB

patch

obsolete

>Index: graphics/jpeg-turbo/Makefile
>===================================================================
>--- graphics/jpeg-turbo/Makefile	(revision 475668)
>+++ graphics/jpeg-turbo/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	jpeg-turbo
>-PORTVERSION=	1.5.3
>+PORTVERSION=	2.0.0
> PORTREVISION?=	0
> CATEGORIES=	graphics
> MASTER_SITES=	SF/lib${PORTNAME}/${PORTVERSION}
>@@ -15,31 +15,23 @@
> 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 <bsd.port.options.mk>
> 
> .if ${ARCH} == i386 || ${ARCH} == amd64
>@@ -47,12 +39,9 @@
> .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
>Index: graphics/jpeg-turbo/distinfo
>===================================================================
>--- graphics/jpeg-turbo/distinfo	(revision 475668)
>+++ graphics/jpeg-turbo/distinfo	(working copy)
>@@ -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: graphics/jpeg-turbo/files/patch-md5_md5.c
>===================================================================
>--- graphics/jpeg-turbo/files/patch-md5_md5.c	(revision 475668)
>+++ 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 <libkern/OSByteOrder.h>
>- #define le32toh(x) OSSwapLittleToHostInt32(x)
>- #define htole32(x) OSSwapHostToLittleInt32(x)
>-+#elif defined(__FreeBSD__)
>-+#include <sys/endian.h>
>- #endif
>- 
>- /*
>
>Property changes on: 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: graphics/jpeg-turbo/pkg-plist
>===================================================================
>--- graphics/jpeg-turbo/pkg-plist	(revision 475668)
>+++ graphics/jpeg-turbo/pkg-plist	(working copy)
>@@ -10,7 +10,7 @@
> %%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
>@@ -22,5 +22,5 @@
> %%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: graphics/libjpeg-turbo/Makefile
>===================================================================
>--- graphics/libjpeg-turbo/Makefile	(revision 475668)
>+++ graphics/libjpeg-turbo/Makefile	(working copy)
>@@ -8,6 +8,6 @@
> 
> MASTERDIR=	${.CURDIR:H}/jpeg-turbo
> SLAVE_PORT=	yes
>-OPTIONS_EXCLUDE=DOCS EXAMPLES
>+OPTIONS_EXCLUDE=DOCS
> 
> .include "${MASTERDIR}/Makefile"

Actions: View | Diff

Attachments on bug 230143: 195585 | 195603