aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--graphics/jpeg/Makefile12
-rw-r--r--graphics/jpeg/distinfo12
-rw-r--r--graphics/jpeg/files/patch-configure26
-rw-r--r--graphics/jpeg/files/patch-transupp.c48
4 files changed, 42 insertions, 56 deletions
diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile
index 1db369649f7f..6e7c031b4acf 100644
--- a/graphics/jpeg/Makefile
+++ b/graphics/jpeg/Makefile
@@ -1,20 +1,16 @@
-# New ports collection makefile for: jpeg
-# Date created: 6 November 1994
-# Whom: smace
-#
+# Created by: smace
# $FreeBSD$
-#
PORTNAME= jpeg
PORTVERSION= 8
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= http://www.ijg.org/files/ \
http://sylvana.net/jpegcrop/:exif
DISTNAME= jpegsrc.v${DISTVERSION2}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
jpegexiforient.c:exif exifautotran.txt:exif
-DIST_SUBDIR= ${PORTNAME}${DISTVERSION2}2
+DIST_SUBDIR= ${PORTNAME}${DISTVERSION2}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= dinoex@FreeBSD.org
@@ -23,7 +19,7 @@ COMMENT= IJG's jpeg compression utilities
CONFLICTS= libjpeg-turbo-[0-9]*
WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION2}
-DISTVERSION2= 8b
+DISTVERSION2= 8d
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-shared --enable-static
diff --git a/graphics/jpeg/distinfo b/graphics/jpeg/distinfo
index fbd5460aac79..3426c16c2ab7 100644
--- a/graphics/jpeg/distinfo
+++ b/graphics/jpeg/distinfo
@@ -1,6 +1,6 @@
-SHA256 (jpeg8b2/jpegsrc.v8b.tar.gz) = 36e6208edec591bae8f2fc370ea4f991447badb6377a125c211ffa7b503174a7
-SIZE (jpeg8b2/jpegsrc.v8b.tar.gz) = 965125
-SHA256 (jpeg8b2/jpegexiforient.c) = bac06fcdbc6a5b6adfb5e65d5b90b88bf7d72849e21ab2d33b6900bd99200eec
-SIZE (jpeg8b2/jpegexiforient.c) = 8531
-SHA256 (jpeg8b2/exifautotran.txt) = d1d8302e4a76f83c725d65027ff5dfd788447cc245d387a91f01737e9f245c4c
-SIZE (jpeg8b2/exifautotran.txt) = 684
+SHA256 (jpeg8d/jpegsrc.v8d.tar.gz) = 00029b1473f0f0ea72fbca3230e8cb25797fbb27e58ae2e46bb8bf5a806fe0b3
+SIZE (jpeg8d/jpegsrc.v8d.tar.gz) = 991456
+SHA256 (jpeg8d/jpegexiforient.c) = bac06fcdbc6a5b6adfb5e65d5b90b88bf7d72849e21ab2d33b6900bd99200eec
+SIZE (jpeg8d/jpegexiforient.c) = 8531
+SHA256 (jpeg8d/exifautotran.txt) = d1d8302e4a76f83c725d65027ff5dfd788447cc245d387a91f01737e9f245c4c
+SIZE (jpeg8d/exifautotran.txt) = 684
diff --git a/graphics/jpeg/files/patch-configure b/graphics/jpeg/files/patch-configure
index bca699a18f30..b2855aa9f506 100644
--- a/graphics/jpeg/files/patch-configure
+++ b/graphics/jpeg/files/patch-configure
@@ -1,28 +1,10 @@
---- configure.orig 2010-05-02 18:49:36.000000000 +0200
-+++ configure 2011-10-17 21:10:05.000000000 +0200
-@@ -10559,7 +10559,7 @@
- hardcode_shlibpath_var=no
- ;;
+--- configure.orig 2011-12-22 14:48:42.000000000 +0100
++++ configure 2012-11-15 20:56:39.000000000 +0100
+@@ -13539,6 +13539,7 @@
-- freebsd1*)
-+ freebsd1.*)
- ld_shlibs=no
- ;;
-
-@@ -11434,7 +11434,7 @@
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
--freebsd1*)
-+freebsd1.*)
- dynamic_linker=no
- ;;
-
-@@ -12678,6 +12678,7 @@
- JPEG_LIB_VERSION="`expr $JPEG_LIB_VERSION / 10`:2"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $JPEG_LIB_VERSION" >&5
$as_echo "$JPEG_LIB_VERSION" >&6; }
+JPEG_LIB_VERSION="11"
-
ac_config_files="$ac_config_files Makefile"
+
diff --git a/graphics/jpeg/files/patch-transupp.c b/graphics/jpeg/files/patch-transupp.c
index feb9f8ac8f97..4be896defcad 100644
--- a/graphics/jpeg/files/patch-transupp.c
+++ b/graphics/jpeg/files/patch-transupp.c
@@ -1,5 +1,5 @@
---- transupp.c.orig 2009-09-03 16:45:06.000000000 +0200
-+++ transupp.c 2010-01-13 09:38:15.000000000 +0100
+--- transupp.c.orig 2011-10-26 13:20:05.000000000 +0200
++++ transupp.c 2012-11-15 21:46:57.000000000 +0100
@@ -51,6 +51,13 @@
* guarantee we can touch more than one row at a time. So in that case,
* we have to use a separate destination array.
@@ -272,7 +272,7 @@
+ }
+ } else {
+ for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
-+ jzero_far(dst_buffer[offset_y] + x_drop_blocks,
++ FMEMZERO(dst_buffer[offset_y] + x_drop_blocks,
+ comp_width * SIZEOF(JBLOCK));
+ }
+ }
@@ -314,7 +314,7 @@
+ if (dst_blk_y < y_crop_blocks ||
+ dst_blk_y >= comp_height + y_crop_blocks) {
+ for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
-+ jzero_far(dst_buffer[offset_y],
++ FMEMZERO(dst_buffer[offset_y],
+ compptr->width_in_blocks * SIZEOF(JBLOCK));
+ }
+ continue;
@@ -332,14 +332,14 @@
for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
+ if (dstinfo->image_width > srcinfo->image_width) {
+ if (x_crop_blocks > 0) {
-+ jzero_far(dst_buffer[offset_y],
++ FMEMZERO(dst_buffer[offset_y],
+ x_crop_blocks * SIZEOF(JBLOCK));
+ }
+ jcopy_block_row(src_buffer[offset_y],
+ dst_buffer[offset_y] + x_crop_blocks,
+ comp_width);
+ if (compptr->width_in_blocks > comp_width + x_crop_blocks) {
-+ jzero_far(dst_buffer[offset_y] +
++ FMEMZERO(dst_buffer[offset_y] +
+ comp_width + x_crop_blocks,
+ (compptr->width_in_blocks -
+ comp_width - x_crop_blocks) * SIZEOF(JBLOCK));
@@ -356,7 +356,7 @@
}
-@@ -876,7 +1183,9 @@
+@@ -884,7 +1191,9 @@
JDIMENSION xoffset, yoffset;
JDIMENSION width_in_iMCUs, height_in_iMCUs;
JDIMENSION width_in_blocks, height_in_blocks;
@@ -366,7 +366,7 @@
/* Determine number of components in output image */
if (info->force_grayscale &&
-@@ -957,33 +1266,112 @@
+@@ -965,39 +1274,120 @@
info->crop_xoffset = 0; /* default to +0 */
if (info->crop_yoffset_set == JCROP_UNSET)
info->crop_yoffset = 0; /* default to +0 */
@@ -479,19 +479,27 @@
+ /* Ensure the effective crop region will cover the requested */
+ if (info->crop_width > info->output_width)
+ info->output_width = info->crop_width;
-+ else
- info->output_width =
- info->crop_width + (xoffset % info->iMCU_sample_width);
++ else {
+ if (info->crop_width_set == JCROP_FORCE)
+ info->output_width = info->crop_width;
+ else
+ info->output_width =
+ info->crop_width + (xoffset % info->iMCU_sample_width);
++ }
+ if (info->crop_height > info->output_height)
-+ info->output_height = info->crop_height;
-+ else
- info->output_height =
- info->crop_height + (yoffset % info->iMCU_sample_height);
++ info->output_height = info->crop_height;
++ else {
+ if (info->crop_height_set == JCROP_FORCE)
+ info->output_height = info->crop_height;
+ else
+ info->output_height =
+ info->crop_height + (yoffset % info->iMCU_sample_height);
++ }
+ }
/* Save x/y offsets measured in iMCUs */
info->x_crop_offset = xoffset / info->iMCU_sample_width;
info->y_crop_offset = yoffset / info->iMCU_sample_height;
-@@ -999,7 +1387,9 @@
+@@ -1013,7 +1403,9 @@
transpose_it = FALSE;
switch (info->transform) {
case JXFORM_NONE:
@@ -502,7 +510,7 @@
need_workspace = TRUE;
/* No workspace needed if neither cropping nor transforming */
break;
-@@ -1053,6 +1443,11 @@
+@@ -1067,6 +1459,11 @@
need_workspace = TRUE;
transpose_it = TRUE;
break;
@@ -514,7 +522,7 @@
}
/* Allocate workspace if needed.
-@@ -1359,6 +1754,11 @@
+@@ -1373,6 +1770,11 @@
case JXFORM_ROT_270:
transpose_critical_parameters(dstinfo);
break;
@@ -526,7 +534,7 @@
default:
break;
}
-@@ -1413,7 +1813,9 @@
+@@ -1427,7 +1829,9 @@
*/
switch (info->transform) {
case JXFORM_NONE:
@@ -537,7 +545,7 @@
do_crop(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset,
src_coef_arrays, dst_coef_arrays);
break;
-@@ -1449,6 +1851,12 @@
+@@ -1463,6 +1867,12 @@
do_rot_270(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset,
src_coef_arrays, dst_coef_arrays);
break;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-13 01:58:14 +0000