summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordillo <dillo@pkgsrc.org>2002-11-13 14:24:21 +0000
committerdillo <dillo@pkgsrc.org>2002-11-13 14:24:21 +0000
commit45f192147937bf2390aa954af923b3a63f5b33d7 (patch)
tree49a3d4233b6fcfa4217b3ed13159f6a65f648770
parent374aeda76444acc214577a3dda171e23826e80e0 (diff)
downloadpkgsrc-45f192147937bf2390aa954af923b3a63f5b33d7.tar.gz
fix warning in installed include file (jas_image.h)
make debug output conditional on debug level > 0 bump PKGREVISION
-rw-r--r--graphics/jasper/Makefile3
-rw-r--r--graphics/jasper/distinfo7
-rw-r--r--graphics/jasper/patches/patch-ad34
-rw-r--r--graphics/jasper/patches/patch-ae26
-rw-r--r--graphics/jasper/patches/patch-af13
-rw-r--r--graphics/jasper/patches/patch-ag15
-rw-r--r--graphics/jasper/patches/patch-ah15
7 files changed, 111 insertions, 2 deletions
diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile
index 36af16ff313..8c497c34e92 100644
--- a/graphics/jasper/Makefile
+++ b/graphics/jasper/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2002/11/12 19:39:15 dillo Exp $
+# $NetBSD: Makefile,v 1.5 2002/11/13 14:24:21 dillo Exp $
#
DISTNAME= jasper-1.600.0
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.ece.uvic.ca/~mdadams/jasper/software/
EXTRACT_SUFX= .zip
diff --git a/graphics/jasper/distinfo b/graphics/jasper/distinfo
index 88d0c6d65c3..5a296ea3793 100644
--- a/graphics/jasper/distinfo
+++ b/graphics/jasper/distinfo
@@ -1,7 +1,12 @@
-$NetBSD: distinfo,v 1.3 2002/11/12 19:39:15 dillo Exp $
+$NetBSD: distinfo,v 1.4 2002/11/13 14:24:21 dillo 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 (patch-ac) = 757b754de10c1d4304d492ee4f875d7881f12129
+SHA1 (patch-ad) = 5a28f5817025ea42327806f1510d452166ac58e9
+SHA1 (patch-ae) = 00c0d4340b47bf7abc91a3b7c8bbada1c36626e1
+SHA1 (patch-af) = f9bc8efd47c2f3e700ef8c7b9d0af2708e07b2dc
+SHA1 (patch-ag) = 2ac6b439dc8d35281530630254421364f466cc42
+SHA1 (patch-ah) = 40214eebca04d6b0e6f4d47b83377fd0ed49f56d
diff --git a/graphics/jasper/patches/patch-ad b/graphics/jasper/patches/patch-ad
new file mode 100644
index 00000000000..18fe8442bbe
--- /dev/null
+++ b/graphics/jasper/patches/patch-ad
@@ -0,0 +1,34 @@
+$NetBSD: patch-ad,v 1.1 2002/11/13 14:24:21 dillo Exp $
+
+--- src/libjasper/jp2/jp2_cod.c.orig Thu Oct 17 23:24:48 2002
++++ 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);
++ 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);
++ }
+ for (i = 0; i < cmap->numchans; ++i) {
+ ent = &cmap->ents[i];
+- fprintf(stderr, "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);
++ }
+ }
+ }
+
diff --git a/graphics/jasper/patches/patch-ae b/graphics/jasper/patches/patch-ae
new file mode 100644
index 00000000000..84215820877
--- /dev/null
+++ b/graphics/jasper/patches/patch-ae
@@ -0,0 +1,26 @@
+$NetBSD: patch-ae,v 1.1 2002/11/13 14:24:22 dillo Exp $
+
+--- src/libjasper/jp2/jp2_dec.c.orig Fri Oct 18 23:53:57 2002
++++ 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);
++ if (jas_getdbglevel() >= 1) {
++ jas_eprintf("ICC Profile CS %08x\n", cs);
++ }
+ 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;
diff --git a/graphics/jasper/patches/patch-af b/graphics/jasper/patches/patch-af
new file mode 100644
index 00000000000..5b8fbbfdec8
--- /dev/null
+++ b/graphics/jasper/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2002/11/13 14:24:22 dillo Exp $
+
+--- src/libjasper/jpc/jpc_cs.c.orig Thu Oct 17 23:27:01 2002
++++ src/libjasper/jpc/jpc_cs.c
+@@ -671,7 +671,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) {
+- fprintf(stderr, "prcwidth[%d] = %d, prcheight[%d] = %d\n",
++ fprintf(out, "prcwidth[%d] = %d, prcheight[%d] = %d\n",
+ i, cod->compparms.rlvls[i].parwidthval,
+ i, cod->compparms.rlvls[i].parheightval);
+ }
diff --git a/graphics/jasper/patches/patch-ag b/graphics/jasper/patches/patch-ag
new file mode 100644
index 00000000000..2bafc093a33
--- /dev/null
+++ b/graphics/jasper/patches/patch-ag
@@ -0,0 +1,15 @@
+$NetBSD: patch-ag,v 1.1 2002/11/13 14:24:22 dillo Exp $
+
+--- src/libjasper/jpc/jpc_dec.c.orig Fri Oct 18 21:48:51 2002
++++ 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)
+ {
+ fprintf(stderr, "warning: ignoring unknown marker segment\n");
+- jpc_ms_dump(ms, stderr);
++ if (jas_getdbglevel() >= 1) {
++ jpc_ms_dump(ms, stderr);
++ }
+ return 0;
+ }
+
diff --git a/graphics/jasper/patches/patch-ah b/graphics/jasper/patches/patch-ah
new file mode 100644
index 00000000000..1cf79a4f0ae
--- /dev/null
+++ b/graphics/jasper/patches/patch-ah
@@ -0,0 +1,15 @@
+$NetBSD: patch-ah,v 1.1 2002/11/13 14:24:22 dillo Exp $
+
+--- src/libjasper/include/jasper/jas_image.h.orig Thu Oct 17 23:30:37 2002
++++ src/libjasper/include/jasper/jas_image.h
+@@ -149,7 +149,9 @@ extern "C" {
+ #define JAS_IMAGE_CS_GRAY 1 /* Standard Gray */
+ #define JAS_IMAGE_CS_RGB 2 /* Standard RGB */
+ #define JAS_IMAGE_CS_YCBCR 3 /* Standard YCC */
+-/*#define JAS_IMAGE_CM_ICC 4 /* ICC Profile */
++#if 0
++#define JAS_IMAGE_CM_ICC 4 /* ICC Profile */
++#endif
+
+ /*
+ * Component types