Attachment 156605 Details for Bug 200095 – jpeg-turbo.diff

[patch] jpeg-turbo.diff

jpeg-turbo.diff (text/plain), 4.35 KB, created by Antoine Brodin on 2015-05-10 11:43:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Antoine Brodin

Created: 2015-05-10 11:43:36 UTC

Size: 4.35 KB

patch

obsolete

>Index: graphics/jpeg-turbo/Makefile
>===================================================================
>--- graphics/jpeg-turbo/Makefile	(revision 385937)
>+++ graphics/jpeg-turbo/Makefile	(working copy)
>@@ -2,8 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	jpeg-turbo
>-PORTVERSION=	1.3.1
>-PORTREVISION?=	2
>+PORTVERSION=	1.4.0
>+PORTREVISION?=	0
> CATEGORIES=	graphics
> MASTER_SITES=	SF/lib${PORTNAME}/${PORTVERSION}
> DISTNAME=	lib${PORTNAME}-${PORTVERSION}
>@@ -11,9 +11,6 @@
> 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
>@@ -34,7 +31,13 @@
> EXAMPLES_MAKE_ARGS=	exampledir="${EXAMPLESDIR}"
> EXAMPLES_MAKE_ARGS_OFF=	dist_example_DATA=""
> 
>-.if defined(SLAVE_PORT)
>+.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
>Index: graphics/jpeg-turbo/distinfo
>===================================================================
>--- graphics/jpeg-turbo/distinfo	(revision 385937)
>+++ graphics/jpeg-turbo/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (libjpeg-turbo-1.3.1.tar.gz) = c132907417ddc40ed552fe53d6b91d5fecbb14a356a60ddc7ea50d6be9666fb9
>-SIZE (libjpeg-turbo-1.3.1.tar.gz) = 1390282
>+SHA256 (libjpeg-turbo-1.4.0.tar.gz) = d93ad8546b510244f863b39b4c0da0fa4c0d53a77b61a8a3880f258c232bbbee
>+SIZE (libjpeg-turbo-1.4.0.tar.gz) = 1524645
>Index: graphics/jpeg-turbo/files/patch-jchuff.c
>===================================================================
>--- graphics/jpeg-turbo/files/patch-jchuff.c	(revision 385934)
>+++ graphics/jpeg-turbo/files/patch-jchuff.c	(working copy)
>@@ -1,20 +0,0 @@
>---- 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) { \
>Index: graphics/jpeg-turbo/files/patch-md5_md5.c
>===================================================================
>--- graphics/jpeg-turbo/files/patch-md5_md5.c	(revision 0)
>+++ graphics/jpeg-turbo/files/patch-md5_md5.c	(working copy)
>@@ -0,0 +1,11 @@
>+--- md5/md5.c.orig	2014-08-30 13:52:09 UTC
>++++ md5/md5.c
>+@@ -45,6 +45,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
>___________________________________________________________________
>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: graphics/jpeg-turbo/pkg-plist
>===================================================================
>--- graphics/jpeg-turbo/pkg-plist	(revision 385937)
>+++ graphics/jpeg-turbo/pkg-plist	(working copy)
>@@ -23,4 +23,4 @@
> %%LIBTURBOJPEG%%lib/libturbojpeg.a
> %%LIBTURBOJPEG%%lib/libturbojpeg.so
> %%LIBTURBOJPEG%%lib/libturbojpeg.so.0
>-%%LIBTURBOJPEG%%lib/libturbojpeg.so.0.0.0
>+%%LIBTURBOJPEG%%lib/libturbojpeg.so.0.1.0
>Index: graphics/libjpeg-turbo/Makefile
>===================================================================
>--- graphics/libjpeg-turbo/Makefile	(revision 385934)
>+++ graphics/libjpeg-turbo/Makefile	(working copy)
>@@ -1,7 +1,6 @@
> # Created by: Denis Podolskiy <bytestore@yandex.ru>
> # $FreeBSD$
> 
>-PORTREVISION=	5
> PKGNAMEPREFIX=	lib
> 
> COMMENT=	SIMD-accelerated JPEG codec library, provides libTurboJPEG

Actions: View | Diff

Attachments on bug 200095: 156605