<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a555a381ec1cbce7ef8236e7fe5cf38162434a4e">https://github.com/macports/macports-ports/commit/a555a381ec1cbce7ef8236e7fe5cf38162434a4e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a555a381ec1cbce7ef8236e7fe5cf38162434a4e
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Tue Jun 18 06:27:06 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> camlimages: update version 4.0.1->4.2.6
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/39934
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/56187
</span>---
ocaml/camlimages/Portfile | 28 ++++++------
ocaml/camlimages/files/patch-png.diff | 58 ------------------------
ocaml/camlimages/files/patch-src-jpegread.c.diff | 11 -----
3 files changed, 15 insertions(+), 82 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/ocaml/camlimages/Portfile b/ocaml/camlimages/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 457281b..2f76f3d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ocaml/camlimages/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ocaml/camlimages/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,8 @@
</span> PortSystem 1.0
name camlimages
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.0.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.2.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories ocaml devel graphics
license {LGPL-2 Permissive}
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,16 +15,14 @@ long_description Camlimages provides basic functions for image processing \
</span> to render TrueType fonts.
homepage http://gallium.inria.fr/camlimages/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-src-jpegread.c.diff patch-png.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> platforms darwin
master_sites https://bitbucket.org/camlspotter/camlimages/get/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distname v${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 dd3a1aeb43bc7459781958a93db23ce32d0ca6e6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b40237c1505487049799a7af296eb3996b3fa08eab94415546f46d61355747c4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2190274
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f33df37a3803cd33cffec0845d5e266225e1b1a3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e64a5ab0ee7612b7cad5335cedd6d37b46469cc4169d8cc2ebb0dcb069c03042 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 846615
</span>
depends_build port:ocaml-findlib \
port:omake
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,23 +32,27 @@ depends_lib port:ocaml \
</span> port:giflib \
port:libpng \
port:ghostscript \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libexif \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:freetype \
</span> port:xpm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir camlspotter-${name}-c803efa9d5d3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir camlspotter-${name}-8d714f02305a
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span> if {${build_arch} eq "i386" || ${build_arch} eq "ppc"} {
configure.ld_archflags -m32
} else {
configure.ld_archflags -m64
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.cmd omake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args --verbose INCLUDES="${prefix}/include" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cmd omake --configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.pre_args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --verbose INCLUDES="${prefix}/include" \
</span> LDFLAGS='${configure.ldflags} ${configure.ld_archflags}' \
CFLAGS='${configure.cflags} ${configure.cc_archflags}' \
CC=${configure.cc} CXX=${configure.cxx} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- SUPPORT_LABLGTK2=false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SUPPORT_LABLGTK2=fals
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.cmd omake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args --verbose
</span> destroot.args ${build.args}
pre-destroot {
set ocaml_destdir "${destroot}[exec ocamlfind printconf destdir]"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/ocaml/camlimages/files/patch-png.diff b/ocaml/camlimages/files/patch-png.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 189731e..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ocaml/camlimages/files/patch-png.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,58 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/pngwrite.c.orig 2011-06-23 04:04:32.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/pngwrite.c 2012-10-17 16:39:41.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -62,7 +62,7 @@ value write_png_file_rgb( name, buffer,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* error handling */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (setjmp(png_ptr->jmpbuf)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (setjmp(png_jmpbuf(png_ptr))) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Free all of the memory associated with the png_ptr and info_ptr */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_destroy_write_struct(&png_ptr, &info_ptr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fclose(fp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -171,7 +171,7 @@ value write_png_file_index( name, buffer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* error handling */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (setjmp(png_ptr->jmpbuf)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (setjmp(png_jmpbuf(png_ptr))) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Free all of the memory associated with the png_ptr and info_ptr */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_destroy_write_struct(&png_ptr, &info_ptr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fclose(fp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/pngread.c.orig 2011-06-23 04:04:32.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/pngread.c 2012-10-17 16:57:52.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -69,7 +69,7 @@ value read_png_file_as_rgb24( name )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* error handling */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (setjmp(png_ptr->jmpbuf)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (setjmp(png_jmpbuf(png_ptr))) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Free all of the memory associated with the png_ptr and info_ptr */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fclose(fp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -134,7 +134,7 @@ value read_png_file_as_rgb24( name )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_set_rows(png_ptr, info_ptr, row_pointers);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Later, we can return something */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (setjmp(png_ptr->jmpbuf)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (setjmp(png_jmpbuf(png_ptr))) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Free all of the memory associated with the png_ptr and info_ptr */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fclose(fp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -243,7 +243,7 @@ value read_png_file( name )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* error handling */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (setjmp(png_ptr->jmpbuf)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (setjmp(png_jmpbuf(png_ptr))) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Free all of the memory associated with the png_ptr and info_ptr */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fclose(fp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -302,7 +302,7 @@ value read_png_file( name )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_set_rows(png_ptr, info_ptr, row_pointers);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Later, we can return something */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (setjmp(png_ptr->jmpbuf)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (setjmp(png_jmpbuf(png_ptr))) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Free all of the memory associated with the png_ptr and info_ptr */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fclose(fp);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/ocaml/camlimages/files/patch-src-jpegread.c.diff b/ocaml/camlimages/files/patch-src-jpegread.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1792e82..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ocaml/camlimages/files/patch-src-jpegread.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/jpegread.c 2011-06-22 20:04:32.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ jpegread.c 2012-07-27 09:59:15.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -402,7 +402,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* no boundary checks */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--value read_jpeg_scanlines( value jpegh, value buf, value offset, value lines )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void read_jpeg_scanlines( value jpegh, value buf, value offset, value lines )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CAMLparam4(jpegh,offset,buf,lines);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct jpeg_decompress_struct *cinfop;
</span></pre><pre style='margin:0'>
</pre>