Attachment #195603 for bug #230143




# $FreeBSD$

PORTNAME=	jpeg-turbo
PORTVERSION=	2.0.0
PORTREVISION?=	0
CATEGORIES=	graphics
MASTER_SITES=	SF/lib${PORTNAME}/${PORTVERSION}

LICENSE_COMB=	multi
LICENSE_GROUPS_IJG=	FSF GPL
LICENSE_NAME_IJG=	Independent JPEG Group License
LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/LICENSE.md
LICENSE_FILE_IJG=	${WRKSRC}/README.ijg
LICENSE_FILE_ZLIB=	${WRKSRC}/LICENSE.md
LICENSE_PERMS_IJG=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

USES=		cmake:outsource cpe
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--with-jpeg8
USE_LDCONFIG=	yes
CMAKE_ON=	WITH_JPEG8
TEST_TARGET=	test
CPE_VENDOR=	d.r.commander
CPE_PRODUCT=	libjpeg-turbo
TEST_TARGET=	test

PORTDOCS=	*
DOCSDIR=	${PREFIX}/share/doc/libjpeg-turbo

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

.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
CMAKE_OFF=	WITH_TURBOJPEG
CONFLICTS_INSTALL=	jpeg-[0-9]*
PLIST_SUB+=	JPEG="" LIBTURBOJPEG="@comment "
.endif

Lines 1-3 Link Here

(-)graphics/jpeg-turbo/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1514013995	1	TIMESTAMP = 1532858291
2	SHA256 (libjpeg-turbo-1.5.3.tar.gz) = b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523	2	SHA256 (libjpeg-turbo-2.0.0.tar.gz) = 778876105d0d316203c928fd2a0374c8c01f755d0a00b12a1c8934aeccff8868
3	SIZE (libjpeg-turbo-1.5.3.tar.gz) = 1658672	3	SIZE (libjpeg-turbo-2.0.0.tar.gz) = 2158457

Lines 1-11 Link Here

(-)graphics/jpeg-turbo/files/patch-md5_md5.c (-11 lines)
1	--- md5/md5.c.orig 2017-07-07 20:31:10 UTC
2	+++ md5/md5.c
3	@@ -54,6 +54,8 @@ static void MD5Transform(unsigned int [4
4	#include <libkern/OSByteOrder.h>
5	#define le32toh(x) OSSwapLittleToHostInt32(x)
6	#define htole32(x) OSSwapHostToLittleInt32(x)
7	+#elif defined(__FreeBSD__)
8	+#include <sys/endian.h>
9	#endif
10
11	/*

Lines 10-16 Link Here

(-)graphics/jpeg-turbo/pkg-plist (-2 / +2 lines)
10	%%JPEG%%lib/libjpeg.a	10	%%JPEG%%lib/libjpeg.a
11	%%JPEG%%lib/libjpeg.so	11	%%JPEG%%lib/libjpeg.so
12	%%JPEG%%lib/libjpeg.so.8	12	%%JPEG%%lib/libjpeg.so.8
13	%%JPEG%%lib/libjpeg.so.8.1.2	13	%%JPEG%%lib/libjpeg.so.8.2.2
14	%%JPEG%%libdata/pkgconfig/libjpeg.pc	14	%%JPEG%%libdata/pkgconfig/libjpeg.pc
15	%%JPEG%%man/man1/cjpeg.1.gz	15	%%JPEG%%man/man1/cjpeg.1.gz
16	%%JPEG%%man/man1/djpeg.1.gz	16	%%JPEG%%man/man1/djpeg.1.gz
Lines 22-26 Link Here
22	%%LIBTURBOJPEG%%lib/libturbojpeg.a	22	%%LIBTURBOJPEG%%lib/libturbojpeg.a
23	%%LIBTURBOJPEG%%lib/libturbojpeg.so	23	%%LIBTURBOJPEG%%lib/libturbojpeg.so
24	%%LIBTURBOJPEG%%lib/libturbojpeg.so.0	24	%%LIBTURBOJPEG%%lib/libturbojpeg.so.0
25	%%LIBTURBOJPEG%%lib/libturbojpeg.so.0.1.0	25	%%LIBTURBOJPEG%%lib/libturbojpeg.so.0.2.0
26	%%LIBTURBOJPEG%%libdata/pkgconfig/libturbojpeg.pc	26	%%LIBTURBOJPEG%%libdata/pkgconfig/libturbojpeg.pc

Lines 8-13 Link Here

(-)graphics/libjpeg-turbo/Makefile (-1 / +1 lines)
8		8
9	MASTERDIR= ${.CURDIR:H}/jpeg-turbo	9	MASTERDIR= ${.CURDIR:H}/jpeg-turbo
10	SLAVE_PORT= yes	10	SLAVE_PORT= yes
11	OPTIONS_EXCLUDE=DOCS EXAMPLES	11	OPTIONS_EXCLUDE=DOCS
12		12
13	.include "${MASTERDIR}/Makefile"	13	.include "${MASTERDIR}/Makefile"

Return to bug 230143

Lines 2-8 Link Here

(-)graphics/jpeg-turbo/Makefile (-20 / +9 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= jpeg-turbo	4	PORTNAME= jpeg-turbo
5	PORTVERSION= 1.5.3	5	PORTVERSION= 2.0.0
6	PORTREVISION?= 0	6	PORTREVISION?= 0
7	CATEGORIES= graphics	7	CATEGORIES= graphics
8	MASTER_SITES= SF/lib${PORTNAME}/${PORTVERSION}	8	MASTER_SITES= SF/lib${PORTNAME}/${PORTVERSION}
Lines 15-45 Link Here
15	LICENSE_COMB= multi	15	LICENSE_COMB= multi
16	LICENSE_GROUPS_IJG= FSF GPL	16	LICENSE_GROUPS_IJG= FSF GPL
17	LICENSE_NAME_IJG= Independent JPEG Group License	17	LICENSE_NAME_IJG= Independent JPEG Group License
18	LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/turbojpeg.c	18	LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/LICENSE.md
19	LICENSE_FILE_IJG= ${WRKSRC}/README.ijg	19	LICENSE_FILE_IJG= ${WRKSRC}/README.ijg
20	LICENSE_FILE_ZLIB= ${WRKSRC}/simd/jsimdext.inc	20	LICENSE_FILE_ZLIB= ${WRKSRC}/LICENSE.md
21	LICENSE_PERMS_IJG= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept	21	LICENSE_PERMS_IJG= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
22		22
23	USES= cpe libtool pathfix	23	USES= cmake:outsource cpe
24	GNU_CONFIGURE= yes
25	CONFIGURE_ARGS= --with-jpeg8
26	USE_LDCONFIG= yes	24	USE_LDCONFIG= yes
27	INSTALL_TARGET= install-strip	25	CMAKE_ON= WITH_JPEG8
28	TEST_TARGET= test
29	CPE_VENDOR= d.r.commander	26	CPE_VENDOR= d.r.commander
30	CPE_PRODUCT= libjpeg-turbo	27	CPE_PRODUCT= libjpeg-turbo
		28	TEST_TARGET= test
31		29
32	PORTDOCS= *	30	PORTDOCS= *
33	PORTEXAMPLES= *	31	DOCSDIR= ${PREFIX}/share/doc/libjpeg-turbo
34		32
35	OPTIONS_DEFINE= DOCS EXAMPLES	33	OPTIONS_DEFINE= DOCS
36		34
37	DOCS_MAKE_ARGS= docdir="${DOCSDIR}"
38	DOCS_MAKE_ARGS_OFF= dist_doc_DATA=""
39
40	EXAMPLES_MAKE_ARGS= exampledir="${EXAMPLESDIR}"
41	EXAMPLES_MAKE_ARGS_OFF= dist_example_DATA=""
42
43	.include <bsd.port.options.mk>	35	.include <bsd.port.options.mk>
44		36
45	.if ${ARCH} == i386 \|\| ${ARCH} == amd64	37	.if ${ARCH} == i386 \|\| ${ARCH} == amd64
Lines 47-58 Link Here
47	.endif	39	.endif
48		40
49	.if ${SLAVE_PORT} == yes	41	.if ${SLAVE_PORT} == yes
50	# libturbojpeg.a has to be built with PIC for virtualgl
51	CONFIGURE_ARGS+=--with-pic
52	USES+= jpeg
53	PLIST_SUB+= JPEG="@comment " LIBTURBOJPEG=""	42	PLIST_SUB+= JPEG="@comment " LIBTURBOJPEG=""
54	.else	43	.else
55	CONFIGURE_ARGS+=--without-turbojpeg	44	CMAKE_OFF= WITH_TURBOJPEG
56	CONFLICTS_INSTALL= jpeg-[0-9]*	45	CONFLICTS_INSTALL= jpeg-[0-9]*
57	PLIST_SUB+= JPEG="" LIBTURBOJPEG="@comment "	46	PLIST_SUB+= JPEG="" LIBTURBOJPEG="@comment "
58	.endif	47	.endif