Index: head/graphics/jpeg-turbo/Makefile =================================================================== --- head/graphics/jpeg-turbo/Makefile (revision 396854) +++ head/graphics/jpeg-turbo/Makefile (revision 396855) @@ -1,52 +1,52 @@ # Created by: Denis Podolskiy # $FreeBSD$ PORTNAME= jpeg-turbo PORTVERSION= 1.4.0 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= graphics MASTER_SITES= SF/lib${PORTNAME}/${PORTVERSION} DISTNAME= lib${PORTNAME}-${PORTVERSION} MAINTAINER= bytestore@yandex.ru COMMENT?= SIMD-accelerated JPEG codec which replaces libjpeg USES= cpe libtool GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-jpeg8 USE_LDCONFIG= yes ALL_TARGET= test INSTALL_TARGET= install-strip CPE_VENDOR= d.r.commander CPE_PRODUCT= libjpeg-turbo PORTDOCS= * PORTEXAMPLES= * OPTIONS_DEFINE= DOCS EXAMPLES 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:${PORTSDIR}/devel/nasm .endif .if ${SLAVE_PORT} == yes CONFIGURE_ARGS+=--with-pic PLIST_SUB+= JPEG="@comment " LIBTURBOJPEG="" .else CONFIGURE_ARGS+=--program-suffix=-turbo --without-turbojpeg PLIST_SUB+= JPEG="" LIBTURBOJPEG="@comment " post-install: @${ECHO_CMD} "libjpeg.so.8 libjpeg.so.8.0.2" \ > ${STAGEDIR}${PREFIX}/etc/libmap.d/${PORTNAME}.conf .endif .include Index: head/graphics/jpeg-turbo/files/patch-jcdctmgr.c =================================================================== --- head/graphics/jpeg-turbo/files/patch-jcdctmgr.c (nonexistent) +++ head/graphics/jpeg-turbo/files/patch-jcdctmgr.c (revision 396855) @@ -0,0 +1,41 @@ +--- jcdctmgr.c.orig 2014-11-06 09:32:38 UTC ++++ jcdctmgr.c +@@ -6,7 +6,7 @@ + * libjpeg-turbo Modifications: + * Copyright (C) 1999-2006, MIYASAKA Masaru. + * Copyright 2009 Pierre Ossman for Cendio AB +- * Copyright (C) 2011, 2014 D. R. Commander ++ * Copyright (C) 2011, 2014-2015 D. R. Commander + * For conditions of distribution and use, see the accompanying README file. + * + * This file contains the forward-DCT management logic. +@@ -175,6 +175,19 @@ compute_reciprocal (UINT16 divisor, DCTE + UDCTELEM c; + int b, r; + ++ if (divisor == 1) { ++ /* divisor == 1 means unquantized, so these reciprocal/correction/shift ++ * values will cause the C quantization algorithm to act like the ++ * identity function. Since only the C quantization algorithm is used in ++ * these cases, the scale value is irrelevant. ++ */ ++ dtbl[DCTSIZE2 * 0] = (DCTELEM) 1; /* reciprocal */ ++ dtbl[DCTSIZE2 * 1] = (DCTELEM) 0; /* correction */ ++ dtbl[DCTSIZE2 * 2] = (DCTELEM) 1; /* scale */ ++ dtbl[DCTSIZE2 * 3] = (DCTELEM) (-sizeof(DCTELEM) * 8); /* shift */ ++ return 0; ++ } ++ + b = flss(divisor) - 1; + r = sizeof(DCTELEM) * 8 + b; + +@@ -395,7 +408,8 @@ quantize (JCOEFPTR coef_block, DCTELEM * + + #if BITS_IN_JSAMPLE == 8 + +- UDCTELEM recip, corr, shift; ++ UDCTELEM recip, corr; ++ int shift; + UDCTELEM2 product; + + for (i = 0; i < DCTSIZE2; i++) { Property changes on: head/graphics/jpeg-turbo/files/patch-jcdctmgr.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