pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/jpeg Updating package graphics/jpeg from vers...
details: https://anonhg.NetBSD.org/pkgsrc/rev/f3c410db615e
branches: trunk
changeset: 398192:f3c410db615e
user: sno <sno%pkgsrc.org@localhost>
date: Wed Aug 26 16:50:46 2009 +0000
description:
Updating package graphics/jpeg from version 6bnb4 to 7
pkgsrc changes:
- update MASTER_SITES
- bump ApI_DEPENDS in buildlink3.mk
Upstream changes:
- The new features added with version 6bnb4 are now added upstream (except
exifautotran and jpegexiforient)
Version 7 27-Jun-2009
----------------------
New scaled DCTs implemented.
djpeg now supports scalings N/8 with all N from 1 to 16.
cjpeg now supports scalings 8/N with all N from 1 to 16.
Scaled DCTs with size larger than 8 are now also used for resolving the
common 2x2 chroma subsampling case without additional spatial resampling.
Separate spatial resampling for those kind of files is now only necessary
for N>8 scaling cases.
Furthermore, separate scaled DCT functions are provided for direct resolving
of the common asymmetric subsampling cases (2x1 and 1x2) without additional
spatial resampling.
cjpeg -quality option has been extended for support of separate quality
settings for luminance and chrominance (or in general, for every provided
quantization table slot).
New API function jpeg_default_qtables() and q_scale_factor array in library.
Added -nosmooth option to cjpeg, complementary to djpeg.
New variable "do_fancy_downsampling" in library, complement to fancy
upsampling. Fancy upsampling now uses direct DCT scaling with sizes
larger than 8. The old method is not reversible and has been removed.
Support arithmetic entropy encoding and decoding.
Added files jaricom.c, jcarith.c, jdarith.c.
Straighten the file structure:
Removed files jidctred.c, jcphuff.c, jchuff.h, jdphuff.c, jdhuff.h.
jpegtran has a new "lossless" cropping feature.
Implement -perfect option in jpegtran, new API function
jtransform_perfect_transform() in transupp. (DP 204_perfect.dpatch)
Better error messages for jpegtran fopen failure.
(DP 203_jpegtran_errmsg.dpatch)
Fix byte order issue with 16bit PPM/PGM files in rdppm.c/wrppm.c:
according to Netpbm, the de facto standard implementation of the PNM formats,
the most significant byte is first. (DP 203_rdppm.dpatch)
Add -raw option to rdjpgcom not to mangle the output.
(DP 205_rdjpgcom_raw.dpatch)
Make rdjpgcom locale aware. (DP 201_rdjpgcom_locale.dpatch)
Add extern "C" to jpeglib.h.
This avoids the need to put extern "C" { ... } around #include "jpeglib.h"
in your C++ application. Defining the symbol DONT_USE_EXTERN_C in the
configuration prevents this. (DP 202_jpeglib.h_c++.dpatch)
diffstat:
graphics/jpeg/Makefile | 18 +-
graphics/jpeg/PLIST | 18 +-
graphics/jpeg/buildlink3.mk | 6 +-
graphics/jpeg/distinfo | 15 +-
graphics/jpeg/patches/patch-aa | 61 -
graphics/jpeg/patches/patch-ab | 1501 ----------------------------------------
graphics/jpeg/patches/patch-ac | 12 -
graphics/jpeg/patches/patch-ad | 193 -----
graphics/jpeg/patches/patch-ae | 182 ----
graphics/jpeg/patches/patch-af | 20 +
graphics/jpeg/patches/patch-ag | 74 +
11 files changed, 117 insertions(+), 1983 deletions(-)
diffs (truncated from 2182 to 300 lines):
diff -r 0c86248f3d98 -r f3c410db615e graphics/jpeg/Makefile
--- a/graphics/jpeg/Makefile Wed Aug 26 16:03:45 2009 +0000
+++ b/graphics/jpeg/Makefile Wed Aug 26 16:50:46 2009 +0000
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.37 2007/08/01 11:47:15 obache Exp $
+# $NetBSD: Makefile,v 1.38 2009/08/26 16:50:46 sno Exp $
#
-DISTNAME= jpegsrc.v6b
-PKGNAME= jpeg-6b
-PKGREVISION= 4
+DISTNAME= jpegsrc.v7
+PKGNAME= jpeg-7
CATEGORIES= graphics
-MASTER_SITES= ftp://ftp.fu-berlin.de/unix/graphics/jpeg/ \
- ftp://ftp.uu.net/graphics/jpeg/
+MASTER_SITES= http://www.ijg.org/files/
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://www.ijg.org/
@@ -19,21 +17,15 @@
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --enable-shared
-CONFIGURE_ARGS+= --enable-static
-
-INSTALL_TARGET= install install-lib
INSTALLATION_DIRS= bin lib include ${PKGMANDIR}/man1
-INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX}
-
post-extract:
${CP} ${FILESDIR}/jpegexiforient.c ${WRKSRC}
post-install:
${INSTALL_SCRIPT} ${FILESDIR}/exifautotran ${DESTDIR}${PREFIX}/bin
${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/jpeg
- ${INSTALL_DATA} ${WRKSRC}/*.doc ${DESTDIR}${PREFIX}/share/doc/jpeg
+ ${INSTALL_DATA} ${WRKSRC}/*.txt ${DESTDIR}${PREFIX}/share/doc/jpeg
${INSTALL_DATA} ${WRKSRC}/jpegint.h ${DESTDIR}${PREFIX}/include
.include "../../mk/bsd.pkg.mk"
diff -r 0c86248f3d98 -r f3c410db615e graphics/jpeg/PLIST
--- a/graphics/jpeg/PLIST Wed Aug 26 16:03:45 2009 +0000
+++ b/graphics/jpeg/PLIST Wed Aug 26 16:50:46 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 17:59:19 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2009/08/26 16:50:46 sno Exp $
bin/cjpeg
bin/djpeg
bin/exifautotran
@@ -17,11 +17,11 @@
man/man1/jpegtran.1
man/man1/rdjpgcom.1
man/man1/wrjpgcom.1
-share/doc/jpeg/coderules.doc
-share/doc/jpeg/filelist.doc
-share/doc/jpeg/install.doc
-share/doc/jpeg/jconfig.doc
-share/doc/jpeg/libjpeg.doc
-share/doc/jpeg/structure.doc
-share/doc/jpeg/usage.doc
-share/doc/jpeg/wizard.doc
+share/doc/jpeg/coderules.txt
+share/doc/jpeg/filelist.txt
+share/doc/jpeg/install.txt
+share/doc/jpeg/jconfig.txt
+share/doc/jpeg/libjpeg.txt
+share/doc/jpeg/structure.txt
+share/doc/jpeg/usage.txt
+share/doc/jpeg/wizard.txt
diff -r 0c86248f3d98 -r f3c410db615e graphics/jpeg/buildlink3.mk
--- a/graphics/jpeg/buildlink3.mk Wed Aug 26 16:03:45 2009 +0000
+++ b/graphics/jpeg/buildlink3.mk Wed Aug 26 16:50:46 2009 +0000
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/08/26 16:50:46 sno Exp $
BUILDLINK_TREE+= jpeg
.if !defined(JPEG_BUILDLINK3_MK)
JPEG_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.jpeg+= jpeg>=6b
-BUILDLINK_ABI_DEPENDS.jpeg+= jpeg>=6bnb2
+BUILDLINK_API_DEPENDS.jpeg+= jpeg>=7
+#BUILDLINK_ABI_DEPENDS.jpeg+= jpeg>=7
BUILDLINK_PKGSRCDIR.jpeg?= ../../graphics/jpeg
.endif # JPEG_BUILDLINK3_MK
diff -r 0c86248f3d98 -r f3c410db615e graphics/jpeg/distinfo
--- a/graphics/jpeg/distinfo Wed Aug 26 16:03:45 2009 +0000
+++ b/graphics/jpeg/distinfo Wed Aug 26 16:50:46 2009 +0000
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.7 2008/03/28 09:01:30 obache Exp $
+$NetBSD: distinfo,v 1.8 2009/08/26 16:50:46 sno Exp $
-SHA1 (jpegsrc.v6b.tar.gz) = 7079f0d6c42fad0cfba382cf6ad322add1ace8f9
-RMD160 (jpegsrc.v6b.tar.gz) = 18892206014fbb8cae2a44e281f4ed53feaf7882
-Size (jpegsrc.v6b.tar.gz) = 613261 bytes
-SHA1 (patch-aa) = 6a02e633084aa91e2b6b1bbd5668d91e9ec2c321
-SHA1 (patch-ab) = e57da4f693e638cf58b414bfbc50e21d80270109
-SHA1 (patch-ac) = 6c34738effc7df671d4522b4ecca06dab640ed16
-SHA1 (patch-ad) = 73afda7c2c849c93d1c1dd2c632e1e67a1db97dc
-SHA1 (patch-ae) = 4d2b3316df3a6b3ae9c0ef5099620f5f24300cca
+SHA1 (jpegsrc.v7.tar.gz) = 88cced0fc3dbdbc82115e1d08abce4e9d23a4b47
+RMD160 (jpegsrc.v7.tar.gz) = 6049c5fee2682c0757d4b51740abd981d1b24487
+Size (jpegsrc.v7.tar.gz) = 960379 bytes
+SHA1 (patch-af) = 77d847be360338c0cde0eef34f670a289f56ea15
+SHA1 (patch-ag) = 9b72e28530eca39821ec5c7d1698435deba29b5b
diff -r 0c86248f3d98 -r f3c410db615e graphics/jpeg/patches/patch-aa
--- a/graphics/jpeg/patches/patch-aa Wed Aug 26 16:03:45 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-$NetBSD: patch-aa,v 1.10 2008/03/28 09:01:30 obache Exp $
-
---- makefile.cfg.orig 1998-03-21 19:08:57.000000000 +0000
-+++ makefile.cfg
-@@ -17,7 +17,7 @@ includedir = $(prefix)/include
- binprefix =
- manprefix =
- manext = 1
--mandir = $(prefix)/man/man$(manext)
-+mandir = $(DESTDIR)@mandir@/man$(manext)
-
- # The name of your C compiler:
- CC= @CC@
-@@ -86,7 +86,7 @@ SYSDEPSOURCES= jmemansi.c jmemname.c jme
- # source files: cjpeg/djpeg/jpegtran applications, also rdjpgcom/wrjpgcom
- APPSOURCES= cjpeg.c djpeg.c jpegtran.c rdjpgcom.c wrjpgcom.c cdjpeg.c \
- rdcolmap.c rdswitch.c transupp.c rdppm.c wrppm.c rdgif.c wrgif.c \
-- rdtarga.c wrtarga.c rdbmp.c wrbmp.c rdrle.c wrrle.c
-+ rdtarga.c wrtarga.c rdbmp.c wrbmp.c rdrle.c wrrle.c jpegexiforient.c
- SOURCES= $(LIBSOURCES) $(SYSDEPSOURCES) $(APPSOURCES)
- # files included by source files
- INCLUDES= jchuff.h jdhuff.h jdct.h jerror.h jinclude.h jmemsys.h jmorecfg.h \
-@@ -133,7 +133,7 @@ DOBJECTS= djpeg.$(O) wrppm.$(O) wrgif.$(
- TROBJECTS= jpegtran.$(O) rdswitch.$(O) cdjpeg.$(O) transupp.$(O)
-
-
--all: @A2K_DEPS@ libjpeg.$(A) cjpeg djpeg jpegtran rdjpgcom wrjpgcom
-+all: @A2K_DEPS@ libjpeg.$(A) cjpeg djpeg jpegtran rdjpgcom wrjpgcom jpegexiforient
-
- # Special compilation rules to support ansi2knr and libtool.
- .SUFFIXES: .lo .la
-@@ -179,6 +179,9 @@ cjpeg: $(COBJECTS) libjpeg.$(A)
- djpeg: $(DOBJECTS) libjpeg.$(A)
- $(LN) $(LDFLAGS) -o djpeg $(DOBJECTS) libjpeg.$(A) $(LDLIBS)
-
-+jpegexiforient: jpegexiforient.$(O)
-+ $(LN) $(LDFLAGS) -o jpegexiforient jpegexiforient.$(O) $(LDLIBS)
-+
- jpegtran: $(TROBJECTS) libjpeg.$(A)
- $(LN) $(LDFLAGS) -o jpegtran $(TROBJECTS) libjpeg.$(A) $(LDLIBS)
-
-@@ -190,9 +193,10 @@ wrjpgcom: wrjpgcom.$(O)
-
- # Installation rules:
-
--install: cjpeg djpeg jpegtran rdjpgcom wrjpgcom @FORCE_INSTALL_LIB@
-+install: cjpeg djpeg jpegtran rdjpgcom wrjpgcom jpegexiforient @FORCE_INSTALL_LIB@
- $(INSTALL_PROGRAM) cjpeg $(bindir)/$(binprefix)cjpeg
- $(INSTALL_PROGRAM) djpeg $(bindir)/$(binprefix)djpeg
-+ $(INSTALL_PROGRAM) jpegexiforient $(bindir)/$(binprefix)jpegexiforient
- $(INSTALL_PROGRAM) jpegtran $(bindir)/$(binprefix)jpegtran
- $(INSTALL_PROGRAM) rdjpgcom $(bindir)/$(binprefix)rdjpgcom
- $(INSTALL_PROGRAM) wrjpgcom $(bindir)/$(binprefix)wrjpgcom
-@@ -300,6 +304,7 @@ jmemdos.$(O): jmemdos.c jinclude.h jconf
- jmemmac.$(O): jmemmac.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h
- cjpeg.$(O): cjpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h jversion.h
- djpeg.$(O): djpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h jversion.h
-+jpegexiforient.$(O): jpegexiforient.c
- jpegtran.$(O): jpegtran.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h transupp.h jversion.h
- rdjpgcom.$(O): rdjpgcom.c jinclude.h jconfig.h
- wrjpgcom.$(O): wrjpgcom.c jinclude.h jconfig.h
diff -r 0c86248f3d98 -r f3c410db615e graphics/jpeg/patches/patch-ab
--- a/graphics/jpeg/patches/patch-ab Wed Aug 26 16:03:45 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1501 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2007/06/05 22:07:26 tnn Exp $
-
---- transupp.c.orig 2007-06-05 22:33:58.000000000 +0200
-+++ transupp.c
-@@ -1,7 +1,7 @@
- /*
- * transupp.c
- *
-- * Copyright (C) 1997, Thomas G. Lane.
-+ * Copyright (C) 1997-2001, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
-@@ -20,6 +20,7 @@
- #include "jinclude.h"
- #include "jpeglib.h"
- #include "transupp.h" /* My own external interface */
-+#include <ctype.h> /* to declare isdigit() */
-
-
- #if TRANSFORMS_SUPPORTED
-@@ -28,7 +29,8 @@
- * Lossless image transformation routines. These routines work on DCT
- * coefficient arrays and thus do not require any lossy decompression
- * or recompression of the image.
-- * Thanks to Guido Vollbeding for the initial design and code of this feature.
-+ * Thanks to Guido Vollbeding for the initial design and code of this feature,
-+ * and to Ben Jackson for introducing the cropping feature.
- *
- * Horizontal flipping is done in-place, using a single top-to-bottom
- * pass through the virtual source array. It will thus be much the
-@@ -42,6 +44,13 @@
- * arrays for most of the transforms. That could result in much thrashing
- * if the image is larger than main memory.
- *
-+ * If cropping or trimming is involved, the destination arrays may be smaller
-+ * than the source arrays. Note it is not possible to do horizontal flip
-+ * in-place when a nonzero Y crop offset is specified, since we'd have to move
-+ * data from one block row to another but the virtual array manager doesn't
-+ * guarantee we can touch more than one row at a time. So in that case,
-+ * we have to use a separate destination array.
-+ *
- * Some notes about the operating environment of the individual transform
- * routines:
- * 1. Both the source and destination virtual arrays are allocated from the
-@@ -54,20 +63,65 @@
- * and we may as well take that as the effective iMCU size.
- * 4. When "trim" is in effect, the destination's dimensions will be the
- * trimmed values but the source's will be untrimmed.
-- * 5. All the routines assume that the source and destination buffers are
-+ * 5. When "crop" is in effect, the destination's dimensions will be the
-+ * cropped values but the source's will be uncropped. Each transform
-+ * routine is responsible for picking up source data starting at the
-+ * correct X and Y offset for the crop region. (The X and Y offsets
-+ * passed to the transform routines are measured in iMCU blocks of the
-+ * destination.)
-+ * 6. All the routines assume that the source and destination buffers are
- * padded out to a full iMCU boundary. This is true, although for the
- * source buffer it is an undocumented property of jdcoefct.c.
-- * Notes 2,3,4 boil down to this: generally we should use the destination's
-- * dimensions and ignore the source's.
- */
-
-
- LOCAL(void)
--do_flip_h (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
-- jvirt_barray_ptr *src_coef_arrays)
--/* Horizontal flip; done in-place, so no separate dest array is required */
-+do_crop (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
-+ JDIMENSION x_crop_offset, JDIMENSION y_crop_offset,
-+ jvirt_barray_ptr *src_coef_arrays,
-+ jvirt_barray_ptr *dst_coef_arrays)
-+/* Crop. This is only used when no rotate/flip is requested with the crop. */
-+{
-+ JDIMENSION dst_blk_y, x_crop_blocks, y_crop_blocks;
-+ int ci, offset_y;
-+ JBLOCKARRAY src_buffer, dst_buffer;
-+ jpeg_component_info *compptr;
-+
-+ /* We simply have to copy the right amount of data (the destination's
-+ * image size) starting at the given X and Y offsets in the source.
-+ */
-+ for (ci = 0; ci < dstinfo->num_components; ci++) {
-+ compptr = dstinfo->comp_info + ci;
-+ x_crop_blocks = x_crop_offset * compptr->h_samp_factor;
-+ y_crop_blocks = y_crop_offset * compptr->v_samp_factor;
-+ for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;
-+ dst_blk_y += compptr->v_samp_factor) {
-+ dst_buffer = (*srcinfo->mem->access_virt_barray)
-+ ((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,
-+ (JDIMENSION) compptr->v_samp_factor, TRUE);
-+ src_buffer = (*srcinfo->mem->access_virt_barray)
-+ ((j_common_ptr) srcinfo, src_coef_arrays[ci],
-+ dst_blk_y + y_crop_blocks,
-+ (JDIMENSION) compptr->v_samp_factor, FALSE);
-+ for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
-+ jcopy_block_row(src_buffer[offset_y] + x_crop_blocks,
-+ dst_buffer[offset_y],
-+ compptr->width_in_blocks);
-+ }
-+ }
-+ }
-+}
-+
-+
-+LOCAL(void)
-+do_flip_h_no_crop (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
-+ JDIMENSION x_crop_offset,
-+ jvirt_barray_ptr *src_coef_arrays)
-+/* Horizontal flip; done in-place, so no separate dest array is required.
-+ * NB: this only works when y_crop_offset is zero.
-+ */
- {
-- JDIMENSION MCU_cols, comp_width, blk_x, blk_y;
-+ JDIMENSION MCU_cols, comp_width, blk_x, blk_y, x_crop_blocks;
- int ci, k, offset_y;
- JBLOCKARRAY buffer;
- JCOEFPTR ptr1, ptr2;
-@@ -79,17 +133,19 @@ do_flip_h (j_decompress_ptr srcinfo, j_c
- * mirroring by changing the signs of odd-numbered columns.
Home |
Main Index |
Thread Index |
Old Index