[133314] trunk/dports/math/octave-image

25 Feb 2015

Revision: 133314
          https://trac.macports.org/changeset/133314
Author:   michaelld@macports.org
Date:     2015-02-25 07:05:50 -0800 (Wed, 25 Feb 2015)
Log Message:
-----------
octave-image: update to 2.2.2; remove unused patch & add others.

Modified Paths:
--------------
    trunk/dports/math/octave-image/Portfile

Added Paths:
-----------
    trunk/dports/math/octave-image/files/patch-src_Makefile.diff
    trunk/dports/math/octave-image/files/patch-src_bwdist.cc.diff

Removed Paths:
-------------
    trunk/dports/math/octave-image/files/png14.patch

Modified: trunk/dports/math/octave-image/Portfile
===================================================================

--- trunk/dports/math/octave-image/Portfile	2015-02-25 14:57:42 UTC (rev 133313)
+++ trunk/dports/math/octave-image/Portfile	2015-02-25 15:05:50 UTC (rev 133314)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 PortGroup           octave 1.0
 
-octave.setup        image 2.0.0
+octave.setup        image 2.2.2
 platforms           darwin
 license             GPL-3+ MIT FreeBSD
 maintainers         nomaintainer
@@ -16,7 +16,12 @@
                     much more.
 long_description    ${description}
 
-checksums           rmd160 82205cc0e884020958ba5b8644eb9f34818a175c \
-                    sha256 fecacf1cf78e2517f9e3eda243925c71f3b247aaac5dc7b5ea3af7d2208af1d9
+checksums           rmd160 c46732f60bc670d456568bfe6829dc286f62b1b3 \
+                    sha256 c0938eeb1ab98d3795464f079c1b435a00d2d660d007b85c0503cd5286db34b4
 
 depends_lib-append  port:octave-signal
+
+patchfiles-append   patch-src_Makefile.diff \
+                    patch-src_bwdist.cc.diff
+
+configure.env-append "PREFIX_BIN=${prefix}/bin"

Added: trunk/dports/math/octave-image/files/patch-src_Makefile.diff
===================================================================
--- trunk/dports/math/octave-image/files/patch-src_Makefile.diff	                        (rev 0)
+++ trunk/dports/math/octave-image/files/patch-src_Makefile.diff	2015-02-25 15:05:50 UTC (rev 133314)
@@ -0,0 +1,8 @@
+--- src/Makefile.orig	2015-01-29 09:36:06.000000000 -0500
++++ src/Makefile	2015-01-29 09:36:34.000000000 -0500
+@@ -1,4 +1,4 @@
+-MKOCTFILE ?= mkoctfile -Wall
++MKOCTFILE ?= $(PREFIX_BIN)/mkoctfile -v -Wall
+ 
+ all: __spatial_filtering__.oct __bilateral__.oct __custom_gaussian_smoothing__.oct \
+ 	__boundary__.oct bwfill.oct rotate_scale.oct hough_line.oct \

Added: trunk/dports/math/octave-image/files/patch-src_bwdist.cc.diff
===================================================================
--- trunk/dports/math/octave-image/files/patch-src_bwdist.cc.diff	                        (rev 0)
+++ trunk/dports/math/octave-image/files/patch-src_bwdist.cc.diff	2015-02-25 15:05:50 UTC (rev 133314)
@@ -0,0 +1,11 @@
+--- src/bwdist.cc.orig	2015-01-29 09:47:59.000000000 -0500
++++ src/bwdist.cc	2015-01-29 09:49:09.000000000 -0500
+@@ -538,7 +538,7 @@
+   // Compute optional 'index to closest object pixel', only if requested
+   if (nargout > 1)
+     {
+-      if (numel >= pow (2, 32))
++      if (numel >= (int) pow ((double)2, (int)32))
+         retval(1) = calc_index<uint64NDArray> (bw, xdist, ydist);
+       else
+         retval(1) = calc_index<uint32NDArray> (bw, xdist, ydist);

Deleted: trunk/dports/math/octave-image/files/png14.patch
===================================================================
--- trunk/dports/math/octave-image/files/png14.patch	2015-02-25 14:57:42 UTC (rev 133313)
+++ trunk/dports/math/octave-image/files/png14.patch	2015-02-25 15:05:50 UTC (rev 133314)
@@ -1,31 +0,0 @@
---- src/pngread.cc.orig	2009-06-07 20:45:04.000000000 +1000
-+++ src/pngread.cc	2012-03-29 03:02:05.000000000 +1100
-@@ -207,7 +207,7 @@ canvas *load_canvas(char *filename)
-   /* Set error handling */
-   if (setjmp(png_jmpbuf(png_ptr))) {
-       error("pngread: libpng exited abnormally");
--      png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
-+      png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
-       fclose(infile);
-       return NULL;
-   }
-@@ -229,7 +229,7 @@ canvas *load_canvas(char *filename)
-       png_set_palette_to_rgb(png_ptr);
-   }
-   if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
--      png_set_gray_1_2_4_to_8(png_ptr); // this function deprecated need to be redone
-+      png_set_expand_gray_1_2_4_to_8(png_ptr);
-       bit_depth=8;
-       info_ptr->bit_depth=bit_depth;
-   }
---- src/pngwrite.cc.orig	2009-06-07 20:45:04.000000000 +1000
-+++ src/pngwrite.cc	2012-03-29 02:55:33.000000000 +1100
-@@ -126,7 +126,7 @@ void save_canvas(canvas *can,char *filen
-   if (!info_ptr) {
-       fclose(fp);
-       error("pngwrite: cannot not create image structure");
--      png_destroy_write_struct(&png_ptr, png_infopp_NULL);
-+      png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
-       return;
-   }
-

    

michaelld＠macports.org

tags

participants (1)