[35298] trunk/dports/graphics/jasper

[ricci at macports.org]

Revision: 35298
          http://trac.macosforge.org/projects/macports/changeset/35298
Author:   ricci at macports.org
Date:     2008-03-24 14:14:48 -0700 (Mon, 24 Mar 2008)

Log Message:
-----------
Uprev to 1.900.1
add a patch to change two assert() calls to errors
make port lint happy w/ whitespace, patchfile naming, and variant descriptions

Modified Paths:
--------------
    trunk/dports/graphics/jasper/Portfile

Added Paths:
-----------
    trunk/dports/graphics/jasper/files/patch-src_libjasper_base_jas_cm.c.diff
    trunk/dports/graphics/jasper/files/patch-src_libjasper_jpc_jpc_dec.c.diff

Removed Paths:
-------------
    trunk/dports/graphics/jasper/files/patch-src_libjasper_base_jas_cm.c

Modified: trunk/dports/graphics/jasper/Portfile
===================================================================
--- trunk/dports/graphics/jasper/Portfile	2008-03-24 21:01:28 UTC (rev 35297)
+++ trunk/dports/graphics/jasper/Portfile	2008-03-24 21:14:48 UTC (rev 35298)
@@ -1,8 +1,9 @@
 # $Id$
 
 PortSystem		1.0
+
 name			jasper
-version			1.701.0
+version			1.900.1
 categories		graphics
 maintainers		nomaintainer
 description		Library for manipulating JPEG-2000 images
@@ -17,13 +18,20 @@
 master_sites		${homepage}software/
 use_zip			yes
 
-checksums		md5 22a9f74fc880e38dd125c60aa4e4ce97
+checksums           md5     a342b2b4495b3e1394e161eb5d85d754 \
+                    sha1    9c5735f773922e580bf98c7c7dfda9bbed4c5191 \
 
+
 depends_lib		port:jpeg
 
-patchfiles		patch-src_libjasper_base_jas_cm.c
+patchfiles		patch-src_libjasper_base_jas_cm.c \
+				patch-src_libjasper_jpc_jpc_dec.c.diff
 
-configure.args		--enable-shared --disable-static --disable-opengl
+configure.args		--enable-shared						\
+					--disable-static					\
+					--disable-opengl					\
+					--mandir=\\\${prefix}/share/man		\
+					--infodir=\\\${prefix}/share/info
 
 test.run		yes
 test.target		check
@@ -33,7 +41,7 @@
 	file copy ${worksrcpath}/doc ${destroot}${prefix}/share/doc/${name}
 }
 
-variant jiv {
+variant jiv description {build a basic viewer as well} {
 	depends_lib		port:glut
 	configure.args-delete	--disable-opengl
 	configure.args-append	--enable-opengl

Deleted: trunk/dports/graphics/jasper/files/patch-src_libjasper_base_jas_cm.c
===================================================================
--- trunk/dports/graphics/jasper/files/patch-src_libjasper_base_jas_cm.c	2008-03-24 21:01:28 UTC (rev 35297)
+++ trunk/dports/graphics/jasper/files/patch-src_libjasper_base_jas_cm.c	2008-03-24 21:14:48 UTC (rev 35298)
@@ -1,11 +0,0 @@
---- src/libjasper/base/jas_cm.c.orig	Sun Feb  8 17:34:40 2004
-+++ src/libjasper/base/jas_cm.c	Mon Mar  1 22:15:08 2004
-@@ -453,7 +453,7 @@
- int jas_cmxform_apply(jas_cmxform_t *xform, jas_cmpixmap_t *in, jas_cmpixmap_t *out)
- {
- 	jas_cmcmptfmt_t *fmt;
--	jas_cmreal_t buf[2][APPLYBUFSIZ];
-+	static jas_cmreal_t buf[2][APPLYBUFSIZ];
- 	jas_cmpxformseq_t *pxformseq;
- 	int i;
- 	int j;

Copied: trunk/dports/graphics/jasper/files/patch-src_libjasper_base_jas_cm.c.diff (from rev 35295, trunk/dports/graphics/jasper/files/patch-src_libjasper_base_jas_cm.c)
===================================================================
--- trunk/dports/graphics/jasper/files/patch-src_libjasper_base_jas_cm.c.diff	                        (rev 0)
+++ trunk/dports/graphics/jasper/files/patch-src_libjasper_base_jas_cm.c.diff	2008-03-24 21:14:48 UTC (rev 35298)
@@ -0,0 +1,11 @@
+--- src/libjasper/base/jas_cm.c.orig	Sun Feb  8 17:34:40 2004
++++ src/libjasper/base/jas_cm.c	Mon Mar  1 22:15:08 2004
+@@ -453,7 +453,7 @@
+ int jas_cmxform_apply(jas_cmxform_t *xform, jas_cmpixmap_t *in, jas_cmpixmap_t *out)
+ {
+ 	jas_cmcmptfmt_t *fmt;
+-	jas_cmreal_t buf[2][APPLYBUFSIZ];
++	static jas_cmreal_t buf[2][APPLYBUFSIZ];
+ 	jas_cmpxformseq_t *pxformseq;
+ 	int i;
+ 	int j;

Added: trunk/dports/graphics/jasper/files/patch-src_libjasper_jpc_jpc_dec.c.diff
===================================================================
--- trunk/dports/graphics/jasper/files/patch-src_libjasper_jpc_jpc_dec.c.diff	                        (rev 0)
+++ trunk/dports/graphics/jasper/files/patch-src_libjasper_jpc_jpc_dec.c.diff	2008-03-24 21:14:48 UTC (rev 35298)
@@ -0,0 +1,23 @@
+--- src/libjasper/jpc/jpc_dec.c.orig	2007-01-19 13:43:07.000000000 -0800
++++ src/libjasper/jpc/jpc_dec.c	2008-03-24 12:17:14.000000000 -0700
+@@ -1069,12 +1069,18 @@
+ 	/* Apply an inverse intercomponent transform if necessary. */
+ 	switch (tile->cp->mctid) {
+ 	case JPC_MCT_RCT:
+-		assert(dec->numcomps == 3);
++		if (dec->numcomps != 3) {
++			jas_eprintf("dec->numcomps (%d) != 3\n", dec->numcomps);
++			return -2;
++		}
+ 		jpc_irct(tile->tcomps[0].data, tile->tcomps[1].data,
+ 		  tile->tcomps[2].data);
+ 		break;
+ 	case JPC_MCT_ICT:
+-		assert(dec->numcomps == 3);
++		if (dec->numcomps != 3) {
++			jas_eprintf("dec->numcomps (%d) != 3\n", dec->numcomps);
++			return -3;
++		}
+ 		jpc_iict(tile->tcomps[0].data, tile->tcomps[1].data,
+ 		  tile->tcomps[2].data);
+ 		break;

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080324/41914440/attachment.html