Attachment #156605 for bug #200095

View | Details | Raw Unified | Return to bug 200095
Collapse All | Expand All




# $FreeBSD$

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

MAINTAINER=	bytestore@yandex.ru
COMMENT?=	SIMD-accelerated JPEG codec which replaces libjpeg

BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm

ONLY_FOR_ARCHS=	amd64 i386
USES=		cpe libtool
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--with-jpeg8

EXAMPLES_MAKE_ARGS=	exampledir="${EXAMPLESDIR}"
EXAMPLES_MAKE_ARGS_OFF=	dist_example_DATA=""

.include <bsd.port.options.mk>

.if ${ARCH} == i386 || ${ARCH} == amd64
BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
.endif

.if ${SLAVE_PORT} == yes
CONFIGURE_ARGS+=--with-pic
PLIST_SUB+=	JPEG="@comment " LIBTURBOJPEG=""
.else

Lines 1-2 Link Here

(-)graphics/jpeg-turbo/distinfo (-2 / +2 lines)
1	SHA256 (libjpeg-turbo-1.3.1.tar.gz) = c132907417ddc40ed552fe53d6b91d5fecbb14a356a60ddc7ea50d6be9666fb9	1	SHA256 (libjpeg-turbo-1.4.0.tar.gz) = d93ad8546b510244f863b39b4c0da0fa4c0d53a77b61a8a3880f258c232bbbee
2	SIZE (libjpeg-turbo-1.3.1.tar.gz) = 1390282	2	SIZE (libjpeg-turbo-1.4.0.tar.gz) = 1524645




--- jchuff.c.orig	2013-09-28 03:23:49 UTC
+++ jchuff.c
@@ -391,7 +391,16 @@ dump_buffer (working_state * state)
 #endif
 
 
-#define BUFSIZE (DCTSIZE2 * 2)
+/* Although it is exceedingly rare, it is possible for a Huffman-encoded
+ * coefficient block to be larger than the 128-byte unencoded block.  For each
+ * of the 64 coefficients, PUT_BITS is invoked twice, and each invocation can
+ * theoretically store 16 bits (for a maximum of 2048 bits or 256 bytes per
+ * encoded block.)  If, for instance, one artificially sets the AC
+ * coefficients to alternating values of 32767 and -32768 (using the JPEG
+ * scanning order-- 1, 8, 16, etc.), then this will produce an encoded block
+ * larger than 200 bytes.
+ */
+#define BUFSIZE (DCTSIZE2 * 4)
 
 #define LOAD_BUFFER() { \
   if (state->free_in_buffer < BUFSIZE) { \

Line 0 Link Here

(-)graphics/jpeg-turbo/files/patch-md5_md5.c (+11 lines)
	1	--- md5/md5.c.orig 2014-08-30 13:52:09 UTC
	2	+++ md5/md5.c
	3	@@ -45,6 +45,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 23-26 Link Here

(-)graphics/jpeg-turbo/pkg-plist (-1 / +1 lines)
23	%%LIBTURBOJPEG%%lib/libturbojpeg.a	23	%%LIBTURBOJPEG%%lib/libturbojpeg.a
24	%%LIBTURBOJPEG%%lib/libturbojpeg.so	24	%%LIBTURBOJPEG%%lib/libturbojpeg.so
25	%%LIBTURBOJPEG%%lib/libturbojpeg.so.0	25	%%LIBTURBOJPEG%%lib/libturbojpeg.so.0
26	%%LIBTURBOJPEG%%lib/libturbojpeg.so.0.0.0	26	%%LIBTURBOJPEG%%lib/libturbojpeg.so.0.1.0

Lines 1-7 Link Here

(-)graphics/libjpeg-turbo/Makefile (-1 lines)
1	# Created by: Denis Podolskiy <bytestore@yandex.ru>	1	# Created by: Denis Podolskiy <bytestore@yandex.ru>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTREVISION= 5
5	PKGNAMEPREFIX= lib	4	PKGNAMEPREFIX= lib
6		5
7	COMMENT= SIMD-accelerated JPEG codec library, provides libTurboJPEG	6	COMMENT= SIMD-accelerated JPEG codec library, provides libTurboJPEG

Return to bug 200095

Lines 2-9 Link Here

(-)graphics/jpeg-turbo/Makefile (-6 / +9 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= jpeg-turbo	4	PORTNAME= jpeg-turbo
5	PORTVERSION= 1.3.1	5	PORTVERSION= 1.4.0
6	PORTREVISION?= 2	6	PORTREVISION?= 0
7	CATEGORIES= graphics	7	CATEGORIES= graphics
8	MASTER_SITES= SF/lib${PORTNAME}/${PORTVERSION}	8	MASTER_SITES= SF/lib${PORTNAME}/${PORTVERSION}
9	DISTNAME= lib${PORTNAME}-${PORTVERSION}	9	DISTNAME= lib${PORTNAME}-${PORTVERSION}
Lines 11-19 Link Here
11	MAINTAINER= bytestore@yandex.ru	11	MAINTAINER= bytestore@yandex.ru
12	COMMENT?= SIMD-accelerated JPEG codec which replaces libjpeg	12	COMMENT?= SIMD-accelerated JPEG codec which replaces libjpeg
13		13
14	BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
15
16	ONLY_FOR_ARCHS= amd64 i386
17	USES= cpe libtool	14	USES= cpe libtool
18	GNU_CONFIGURE= yes	15	GNU_CONFIGURE= yes
19	CONFIGURE_ARGS= --with-jpeg8	16	CONFIGURE_ARGS= --with-jpeg8
Lines 34-40 Link Here
34	EXAMPLES_MAKE_ARGS= exampledir="${EXAMPLESDIR}"	31	EXAMPLES_MAKE_ARGS= exampledir="${EXAMPLESDIR}"
35	EXAMPLES_MAKE_ARGS_OFF= dist_example_DATA=""	32	EXAMPLES_MAKE_ARGS_OFF= dist_example_DATA=""
36		33
37	.if defined(SLAVE_PORT)	34	.include <bsd.port.options.mk>
		35
		36	.if ${ARCH} == i386 \|\| ${ARCH} == amd64
		37	BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm
		38	.endif
		39
		40	.if ${SLAVE_PORT} == yes
38	CONFIGURE_ARGS+=--with-pic	41	CONFIGURE_ARGS+=--with-pic
39	PLIST_SUB+= JPEG="@comment " LIBTURBOJPEG=""	42	PLIST_SUB+= JPEG="@comment " LIBTURBOJPEG=""
40	.else	43	.else

Lines 1-20 Link Here

(-)graphics/jpeg-turbo/files/patch-jchuff.c (-20 lines)
1	--- jchuff.c.orig 2013-09-28 03:23:49 UTC
2	+++ jchuff.c
3	@@ -391,7 +391,16 @@ dump_buffer (working_state * state)
4	#endif
5
6
7	-#define BUFSIZE (DCTSIZE2 * 2)
8	+/* Although it is exceedingly rare, it is possible for a Huffman-encoded
9	+ * coefficient block to be larger than the 128-byte unencoded block. For each
10	+ * of the 64 coefficients, PUT_BITS is invoked twice, and each invocation can
11	+ * theoretically store 16 bits (for a maximum of 2048 bits or 256 bytes per
12	+ * encoded block.) If, for instance, one artificially sets the AC
13	+ * coefficients to alternating values of 32767 and -32768 (using the JPEG
14	+ * scanning order-- 1, 8, 16, etc.), then this will produce an encoded block
15	+ * larger than 200 bytes.
16	+ */
17	+#define BUFSIZE (DCTSIZE2 * 4)
18
19	#define LOAD_BUFFER() { \
20	if (state->free_in_buffer < BUFSIZE) { \