pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/jasper Changes 1.701.0:



details:   https://anonhg.NetBSD.org/pkgsrc/rev/a79ed53e5f62
branches:  trunk
changeset: 469883:a79ed53e5f62
user:      adam <adam%pkgsrc.org@localhost>
date:      Tue Mar 02 10:28:18 2004 +0000

description:
Changes 1.701.0:
* A preliminary attempt at a color management subsystem has been added to JasPer
* Previously, the configure process did not generate a configuration header file
* Temporary files created with the jas_stream_tmpfile function were not
  correctly removed upon file close under Microsoft Windows
* An option has been added to the JPEG encoder to allow a quality factor to be
  specified
* A new make target has been added for RPM building
* The code now compiles with many fewer warnings on most platforms
* The JasPer software license has been made slightly less restrictive
* The configure-based build process has been updated to use newer versions of
  the GNU configure tools

diffstat:

 graphics/jasper/Makefile         |  21 ++++++++++-----------
 graphics/jasper/PLIST            |  16 +++++++++-------
 graphics/jasper/distinfo         |  17 +++++++----------
 graphics/jasper/patches/patch-ad |  33 +++++++++++----------------------
 graphics/jasper/patches/patch-ae |  33 +++++++++++----------------------
 graphics/jasper/patches/patch-af |   6 +++---
 graphics/jasper/patches/patch-ag |  10 +++++-----
 7 files changed, 56 insertions(+), 80 deletions(-)

diffs (222 lines):

diff -r 496146b228a6 -r a79ed53e5f62 graphics/jasper/Makefile
--- a/graphics/jasper/Makefile  Tue Mar 02 09:04:51 2004 +0000
+++ b/graphics/jasper/Makefile  Tue Mar 02 10:28:18 2004 +0000
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.14 2004/02/14 17:21:42 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2004/03/02 10:28:18 adam Exp $
 #
 
-DISTNAME=              jasper-1.600.0
-PKGREVISION=           1
-CATEGORIES=            graphics
-MASTER_SITES=          http://www.ece.uvic.ca/~mdadams/jasper/software/
-EXTRACT_SUFX=          .zip
+DISTNAME=      jasper-1.701.0
+CATEGORIES=    graphics
+MASTER_SITES=  http://www.ece.uvic.ca/~mdadams/jasper/software/
+EXTRACT_SUFX=  .zip
 
-MAINTAINER=            tech-pkg%NetBSD.org@localhost
-HOMEPAGE=              http://www.ece.uvic.ca/~mdadams/jasper/
-COMMENT=               Software-based reference implementation of the JPEG-2000 codec
+MAINTAINER=    adam%NetBSD.org@localhost
+HOMEPAGE=      http://www.ece.uvic.ca/~mdadams/jasper/
+COMMENT=       Software-based reference implementation of the JPEG-2000 codec
 
 GNU_CONFIGURE=         YES
 USE_BUILDLINK3=                YES
@@ -18,8 +17,8 @@
 
 post-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/jasper
-.for doc in ChangeLog LICENSE NEWS README
-       ${INSTALL_DATA} ${WRKSRC}/${doc} ${PREFIX}/share/doc/jasper
+.for doc in jasper jpeg2000
+       ${INSTALL_DATA} ${WRKSRC}/doc/${doc}.pdf ${PREFIX}/share/doc/jasper
 .endfor
 
 .include "../../mk/bsd.prefs.mk"
diff -r 496146b228a6 -r a79ed53e5f62 graphics/jasper/PLIST
--- a/graphics/jasper/PLIST     Tue Mar 02 09:04:51 2004 +0000
+++ b/graphics/jasper/PLIST     Tue Mar 02 10:28:18 2004 +0000
@@ -1,10 +1,14 @@
-@comment $NetBSD: PLIST,v 1.5 2004/02/05 20:14:05 skrll Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/03/02 10:28:18 adam Exp $
 bin/imgcmp
 bin/imginfo
 bin/jasper
+include/jasper/jas_cm.h
+include/jasper/jas_config.h
+include/jasper/jas_config2.h
 include/jasper/jas_debug.h
 include/jasper/jas_fix.h
 include/jasper/jas_getopt.h
+include/jasper/jas_icc.h
 include/jasper/jas_image.h
 include/jasper/jas_init.h
 include/jasper/jas_malloc.h
@@ -16,14 +20,12 @@
 include/jasper/jas_types.h
 include/jasper/jas_version.h
 include/jasper/jasper.h
-lib/libjasper-1.600.so.0
-lib/libjasper-1.600.so.0.0
+lib/libjasper-1.701.so.1
+lib/libjasper-1.701.so.1.0
 lib/libjasper.a
 lib/libjasper.la
 lib/libjasper.so
-share/doc/jasper/ChangeLog
-share/doc/jasper/LICENSE
-share/doc/jasper/NEWS
-share/doc/jasper/README
+share/doc/jasper/jasper.pdf
+share/doc/jasper/jpeg2000.pdf
 @dirrm share/doc/jasper
 @dirrm include/jasper
diff -r 496146b228a6 -r a79ed53e5f62 graphics/jasper/distinfo
--- a/graphics/jasper/distinfo  Tue Mar 02 09:04:51 2004 +0000
+++ b/graphics/jasper/distinfo  Tue Mar 02 10:28:18 2004 +0000
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.4 2002/11/13 14:24:21 dillo Exp $
+$NetBSD: distinfo,v 1.5 2004/03/02 10:28:18 adam Exp $
 
-SHA1 (jasper-1.600.0.zip) = a4a3b44dbf82b1f0b1bc0454262ae22188b293a9
-Size (jasper-1.600.0.zip) = 1294537 bytes
-SHA1 (patch-aa) = aa46766e7bfa028707b11f6711b5086cbfa125ac
-SHA1 (patch-ab) = 58f6df6b4c3097921cc10798546d4a68ef470d0a
+SHA1 (jasper-1.701.0.zip) = e304457a3973c3a926792c3e25e16f05818634e4
+Size (jasper-1.701.0.zip) = 1361754 bytes
 SHA1 (patch-ac) = 757b754de10c1d4304d492ee4f875d7881f12129
-SHA1 (patch-ad) = 5a28f5817025ea42327806f1510d452166ac58e9
-SHA1 (patch-ae) = 00c0d4340b47bf7abc91a3b7c8bbada1c36626e1
-SHA1 (patch-af) = f9bc8efd47c2f3e700ef8c7b9d0af2708e07b2dc
-SHA1 (patch-ag) = 2ac6b439dc8d35281530630254421364f466cc42
-SHA1 (patch-ah) = 40214eebca04d6b0e6f4d47b83377fd0ed49f56d
+SHA1 (patch-ad) = 011ca779dccbe9de49c80fdd3180d849f1df63ce
+SHA1 (patch-ae) = bfe00f76582a44ad748706c3fc81c4d6b8aede35
+SHA1 (patch-af) = d289796549a0657c49147fa4d997fecc6e9e43cc
+SHA1 (patch-ag) = 838059345253861992fc0c415b56557a00e468ea
diff -r 496146b228a6 -r a79ed53e5f62 graphics/jasper/patches/patch-ad
--- a/graphics/jasper/patches/patch-ad  Tue Mar 02 09:04:51 2004 +0000
+++ b/graphics/jasper/patches/patch-ad  Tue Mar 02 10:28:18 2004 +0000
@@ -1,33 +1,22 @@
-$NetBSD: patch-ad,v 1.1 2002/11/13 14:24:21 dillo Exp $
+$NetBSD: patch-ad,v 1.2 2004/03/02 10:28:18 adam Exp $
 
---- src/libjasper/jp2/jp2_cod.c.orig   Thu Oct 17 23:24:48 2002
+--- src/libjasper/jp2/jp2_cod.c.orig   2004-02-09 01:34:40.000000000 +0000
 +++ src/libjasper/jp2/jp2_cod.c
-@@ -335,7 +335,9 @@ jp2_box_t *jp2_box_get(jas_stream_t *in)
-               jas_stream_close(tmpstream);
-       }
- 
--      jp2_box_dump(box, stderr);
+@@ -774,11 +774,15 @@ static void jp2_cmap_dumpdata(jp2_box_t 
+       jp2_cmap_t *cmap = &box->data.cmap;
+       unsigned int i;
+       jp2_cmapent_t *ent;
+-      fprintf(out, "numchans = %d\n", (int) cmap->numchans);
 +      if (jas_getdbglevel() >= 1) {
-+              jp2_box_dump(box, stderr);
-+      }
- 
-       return box;
-       abort();
-@@ -813,11 +815,15 @@ static void jp2_cmap_dumpdata(jp2_box_t 
-       jp2_cmap_t *cmap = &box->data.cmap;
-       int i;
-       jp2_cmapent_t *ent;
--      fprintf(stderr, "numchans = %d\n", (int) cmap->numchans);
-+      if (jas_getdbglevel() >= 1) {
-+              fprintf(stderr, "numchans = %d\n", (int) cmap->numchans);
++              fprintf(out, "numchans = %d\n", (int) cmap->numchans);
 +      }
        for (i = 0; i < cmap->numchans; ++i) {
                ent = &cmap->ents[i];
--              fprintf(stderr, "cmptno=%d; map=%d; pcol=%d\n",
+-              fprintf(out, "cmptno=%d; map=%d; pcol=%d\n",
 -                (int) ent->cmptno, (int) ent->map, (int) ent->pcol);
 +              if (jas_getdbglevel() >= 1) {
-+                      fprintf(stderr, "cmptno=%d; map=%d; pcol=%d\n",
-+                        (int) ent->cmptno, (int) ent->map, (int) ent->pcol);
++                      fprintf(out, "cmptno=%d; map=%d; pcol=%d\n",
++                        (int) ent->cmptno, (int) ent->map, (int) ent->pcol);
 +              }
        }
  }
diff -r 496146b228a6 -r a79ed53e5f62 graphics/jasper/patches/patch-ae
--- a/graphics/jasper/patches/patch-ae  Tue Mar 02 09:04:51 2004 +0000
+++ b/graphics/jasper/patches/patch-ae  Tue Mar 02 10:28:18 2004 +0000
@@ -1,26 +1,15 @@
-$NetBSD: patch-ae,v 1.1 2002/11/13 14:24:22 dillo Exp $
+$NetBSD: patch-ae,v 1.2 2004/03/02 10:28:18 adam Exp $
 
---- src/libjasper/jp2/jp2_dec.c.orig   Fri Oct 18 23:53:57 2002
+--- src/libjasper/jp2/jp2_dec.c.orig   2004-02-09 01:34:40.000000000 +0000
 +++ src/libjasper/jp2/jp2_dec.c
-@@ -339,7 +339,9 @@ jas_image_t *jp2_decode(jas_stream_t *in
-               iccp = dec->colr->data.colr.iccp;
-               cs = (iccp[16] << 24) | (iccp[17] << 16) | (iccp[18] << 8) |
-                 iccp[19];
--              jas_eprintf("ICC Profile CS %08x\n", cs);
+@@ -293,7 +293,9 @@ jas_image_t *jp2_decode(jas_stream_t *in
+                 dec->colr->data.colr.iccplen);
+               assert(iccprof);
+               jas_iccprof_gethdr(iccprof, &icchdr);
+-              jas_eprintf("ICC Profile CS %08x\n", icchdr.colorspc);
 +              if (jas_getdbglevel() >= 1) {
-+                      jas_eprintf("ICC Profile CS %08x\n", cs);
++                      jas_eprintf("ICC Profile CS %08x\n", icchdr.colorspc);
 +              }
-               jas_image_setcolorspace(dec->image, fromiccpcs(cs));
-               break;
-       }
-@@ -453,7 +455,9 @@ jas_image_t *jp2_decode(jas_stream_t *in
-               jas_eprintf("error: no components\n");
-               goto error;
-       }
--fprintf(stderr, "no of components is %d\n", jas_image_numcmpts(dec->image));
-+      if (jas_getdbglevel() >= 1) {
-+              fprintf(stderr, "no of components is %d\n", jas_image_numcmpts(dec->image));
-+      }
- 
-       /* Prevent the image from being destroyed later. */
-       image = dec->image;
+               jas_image_setclrspc(dec->image, fromiccpcs(icchdr.colorspc));
+               dec->image->cmprof_ = jas_cmprof_createfromiccprof(iccprof);
+               assert(dec->image->cmprof_);
diff -r 496146b228a6 -r a79ed53e5f62 graphics/jasper/patches/patch-af
--- a/graphics/jasper/patches/patch-af  Tue Mar 02 09:04:51 2004 +0000
+++ b/graphics/jasper/patches/patch-af  Tue Mar 02 10:28:18 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1 2002/11/13 14:24:22 dillo Exp $
+$NetBSD: patch-af,v 1.2 2004/03/02 10:28:18 adam Exp $
 
---- src/libjasper/jpc/jpc_cs.c.orig    Thu Oct 17 23:27:01 2002
+--- src/libjasper/jpc/jpc_cs.c.orig    2004-02-09 01:34:40.000000000 +0000
 +++ src/libjasper/jpc/jpc_cs.c
-@@ -671,7 +671,7 @@ static int jpc_cod_dumpparms(jpc_ms_t *m
+@@ -639,7 +639,7 @@ static int jpc_cod_dumpparms(jpc_ms_t *m
          cod->compparms.cblksty);
        if (cod->csty & JPC_COX_PRT) {
                for (i = 0; i < cod->compparms.numrlvls; ++i) {
diff -r 496146b228a6 -r a79ed53e5f62 graphics/jasper/patches/patch-ag
--- a/graphics/jasper/patches/patch-ag  Tue Mar 02 09:04:51 2004 +0000
+++ b/graphics/jasper/patches/patch-ag  Tue Mar 02 10:28:18 2004 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-ag,v 1.1 2002/11/13 14:24:22 dillo Exp $
+$NetBSD: patch-ag,v 1.2 2004/03/02 10:28:18 adam Exp $
 
---- src/libjasper/jpc/jpc_dec.c.orig   Fri Oct 18 21:48:51 2002
+--- src/libjasper/jpc/jpc_dec.c.orig   2004-02-09 01:34:40.000000000 +0000
 +++ src/libjasper/jpc/jpc_dec.c
-@@ -1502,7 +1502,9 @@ static int jpc_dec_process_com(jpc_dec_t
- static int jpc_dec_process_unk(jpc_dec_t *dec, jpc_ms_t *ms)
- {
+@@ -1472,7 +1472,9 @@ static int jpc_dec_process_unk(jpc_dec_t
+       dec = 0;
+ 
        fprintf(stderr, "warning: ignoring unknown marker segment\n");
 -      jpc_ms_dump(ms, stderr);
 +      if (jas_getdbglevel() >= 1) {



Home | Main Index | Thread Index | Old Index