[113028] trunk/dports/devel

ryandesign at macports.org ryandesign at macports.org
Wed Nov 6 18:14:50 PST 2013


Revision: 113028
          https://trac.macports.org/changeset/113028
Author:   ryandesign at macports.org
Date:     2013-11-06 18:14:49 -0800 (Wed, 06 Nov 2013)
Log Message:
-----------
ResIL: new port, version 1.7.9, based on libdevil 1.7.8

Modified Paths:
--------------
    trunk/dports/devel/ResIL/Portfile

Added Paths:
-----------
    trunk/dports/devel/ResIL/
    trunk/dports/devel/ResIL/files/patch-lib-Makefile.am.diff
    trunk/dports/devel/ResIL/files/patch-src-IL-include-il_endian.h.diff
    trunk/dports/devel/ResIL/files/patch-strnicmp.diff

Removed Paths:
-------------
    trunk/dports/devel/ResIL/files/patch-CXXFLAGS.diff
    trunk/dports/devel/ResIL/files/patch-src_IL-src-il_icon.c.diff
    trunk/dports/devel/ResIL/files/patch-src_IL-src-il_png.c.diff

Modified: trunk/dports/devel/ResIL/Portfile
===================================================================
--- trunk/dports/devel/libdevil/Portfile	2013-11-01 23:06:43 UTC (rev 112818)
+++ trunk/dports/devel/ResIL/Portfile	2013-11-07 02:14:49 UTC (rev 113028)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
 PortSystem          1.0
@@ -3,32 +4,31 @@
 PortGroup muniversal 1.0
 
-name                libdevil
-version             1.7.8
-revision            5
+name                ResIL
+conflicts           libdevil
+version             1.7.9
 categories          devel multimedia
 platforms           darwin
 license             LGPL-2.1
-maintainers         nomaintainer
+maintainers         ryandesign openmaintainer
+
 description         Library to develop applications with powerful image \
                     loading capabilities
-long_description    Developer's Image Library (DevIL) is a programmer's \
+
+long_description    Resilient Image Library (ResIL, a fork of DevIL) is a programmer's \
                     library to develop applications with very powerful image \
                     loading capabilities, yet is easy for a developer to \
                     learn and use. Ultimate control of images is left to the \
                     developer, so unnecessary conversions, etc. are not \
-                    performed. DevIL utilizes a simple, yet powerful, \
-                    syntax. DevIL can load, save, convert, manipulate, \
-                    filter and display a wide variety of image formats. \
-                    Formerly known as OpenIL, but the name was changed due \
-                    to SGI's request.
+                    performed. ResIL utilizes a simple, yet powerful, \
+                    syntax. ResIL can load, save, convert, manipulate, \
+                    filter and display a wide variety of image formats.
 
-homepage            http://openil.sourceforge.net/
-master_sites        sourceforge:project/openil/DevIL/${version}
-distname            DevIL-${version}
-checksums           md5     7918f215524589435e5ec2e8736d5e1d \
-                    sha1    bc27e3e830ba666a3af03548789700d10561fcb1 \
-                    rmd160  a3cdb14fcca5e75ada240a53cbdc3e749a759da5
-worksrcdir          devil-${version}
+homepage            http://resil.sourceforge.net/
+master_sites        sourceforge:project/resil
+use_zip             yes
 
+checksums           rmd160  7a0e5a15df4af3db735234db8789909f2097deac \
+                    sha256  83f522170a3838f108e6d9e95989948f898df764c0838f614c8c18e6e8e8e918
+
 depends_lib         port:lcms \
                     port:libmng \
@@ -40,13 +40,35 @@
                     port:xrender \
                     port:mesa
 
+extract {
+    # The 1.7.9 distfile has numerous packaging errors.
+    # https://sourceforge.net/p/resil/tickets/1/
+    
+    # Some files fail to extract. The names have non-ASCII characters; possibly a character encoding problem.
+    # Fortunately the files in question are unnecessary Visual Studio user settings so we can ignore the failure.
+    system -W ${distpath} "unzip ${extract.pre_args} ${distfiles} ${extract.post_args} || true"
+
+    # These directories are missing write permission for the user, causing permission errors when cleaning the port.
+    foreach d {include lib test} {
+        file attributes "${worksrcpath}/Input Libs/zlib128-dll/${d}" -permissions u+w
+    }
+
+    # Missing execute bit on configure script.
+    file attributes ${worksrcpath}/configure -permissions a+x
+}
+
 patchfiles          patch-ilur.c \
                     patch-devil_internal_exports.h.diff \
-                    patch-src_IL-src-il_png.c.diff \
-                    patch-src_IL-src-il_icon.c.diff \
-                    patch-CXXFLAGS.diff \
-                    patch-include_IL_il.h
+                    patch-lib-Makefile.am.diff \
+                    patch-include_IL_il.h \
+                    patch-strnicmp.diff
 
+#                    patch-src-IL-include-il_endian.h.diff \
+
+# include/IL/config.h.in is missing.
+# https://sourceforge.net/p/resil/tickets/2/
+use_autoreconf      yes
+
 configure.args      --enable-ILU \
                     --enable-ILUT \
                     --enable-x11 \
@@ -57,9 +79,9 @@
                     --disable-sdl \
                     --disable-xpm
 if {![variant_isset universal]} {
-    if {${configure.build_arch} == "i386"} {
+    if {${configure.build_arch} eq "i386"} {
         configure.args-append   --enable-x86
-    } elseif {${configure.build_arch} == "x86_64"} {
+    } elseif {${configure.build_arch} eq "x86_64"} {
         configure.args-append   --enable-x86_64
     } else {
         configure.args-append   --enable-ppc
@@ -70,6 +92,9 @@
 set merger_configure_args(ppc) --enable-ppc
 set merger_configure_args(ppc64) --enable-ppc
 
+# https://sourceforge.net/p/resil/tickets/6/
+configure.cflags-append -std=gnu89
+
 post-destroot {
     xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
     xinstall -m 644 -W ${worksrcpath} AUTHORS COPYING CREDITS ChangeLog \
@@ -82,4 +107,4 @@
     configure.args-delete --disable-sdl
 }
 
-livecheck.regex     /DevIL-(\[0-9.\]+)${extract.suffix}
+livecheck.regex     /${name}-(\[0-9.\]+)${extract.suffix}

Deleted: trunk/dports/devel/ResIL/files/patch-CXXFLAGS.diff
===================================================================
--- trunk/dports/devel/libdevil/files/patch-CXXFLAGS.diff	2013-11-01 23:06:43 UTC (rev 112818)
+++ trunk/dports/devel/ResIL/files/patch-CXXFLAGS.diff	2013-11-07 02:14:49 UTC (rev 113028)
@@ -1,11 +0,0 @@
---- lib/Makefile.in.orig	2009-03-09 07:46:18.000000000 +1100
-+++ lib/Makefile.in	2012-06-13 23:25:16.000000000 +1000
-@@ -352,7 +352,7 @@
- AM_CFLAGS = $(GENERAL_CFLAGS)
- libIL_la_CPPFLAGS = -I $(il_include) -I $(all_include)
- libIL_la_CFLAGS = $(AM_CFLAGS) @IL_CFLAGS@
--libIL_la_CXXFLAGS = $(AM_CFLAGS) @IL_CFLAGS@
-+libIL_la_CXXFLAGS = `echo $(AM_CFLAGS) | sed 's|-std=gnu99||'` @IL_CFLAGS@
- libIL_la_SOURCES = $(il_src)/il_alloc.c $(il_src)/il_doom.c \
- 	$(il_src)/il_stack.c $(il_src)/il_pcx.c $(il_src)/il_rle.c \
- 	$(il_src)/il_bits.c $(il_src)/il_endian.c $(il_src)/il_exr.cpp \

Copied: trunk/dports/devel/ResIL/files/patch-lib-Makefile.am.diff (from rev 112818, trunk/dports/devel/libdevil/files/patch-CXXFLAGS.diff)
===================================================================
--- trunk/dports/devel/ResIL/files/patch-lib-Makefile.am.diff	                        (rev 0)
+++ trunk/dports/devel/ResIL/files/patch-lib-Makefile.am.diff	2013-11-07 02:14:49 UTC (rev 113028)
@@ -0,0 +1,15 @@
+https://sourceforge.net/p/resil/tickets/3/
+--- lib/Makefile.am.orig	2009-03-25 13:30:42.000000000 -0500
++++ lib/Makefile.am	2013-11-02 23:31:11.000000000 -0500
+@@ -41,9 +41,9 @@
+ 
+ libIL_la_CPPFLAGS = -I $(il_include) -I $(all_include)
+ libIL_la_CFLAGS = $(AM_CFLAGS) @IL_CFLAGS@
+-libIL_la_CXXFLAGS = $(AM_CFLAGS) @IL_CFLAGS@
++libIL_la_CXXFLAGS = `echo $(AM_CFLAGS) | sed 's|-std=gnu99||'` @IL_CFLAGS@
+ 
+-libIL_la_SOURCES = $(il_src)/il_alloc.c $(il_src)/il_doom.c $(il_src)/il_stack.c $(il_src)/il_pcx.c $(il_src)/il_rle.c $(il_src)/il_bits.c $(il_src)/il_endian.c $(il_src)/il_exr.cpp $(il_src)/il_jpeg.c $(il_src)/il_pic.c $(il_src)/il_sgi.c $(il_src)/il_bmp.c $(il_src)/il_error.c $(il_src)/il_lif.c $(il_src)/il_png.c $(il_src)/il_states.c $(il_src)/il_convbuff.c $(il_src)/il_files.c $(il_src)/il_main.c $(il_src)/il_pnm.c $(il_src)/il_targa.c $(il_src)/il_wdp.c $(il_src)/il_convert.c $(il_src)/il_gif.c $(il_src)/il_manip.c $(il_src)/il_profiles.c $(il_src)/il_tiff.c $(il_src)/il_cut.c $(il_src)/il_header.c $(il_src)/il_mdl.c $(il_src)/il_quantizer.c $(il_src)/il_utility.c $(il_src)/il_dcx.c $(il_src)/il_icon.c $(il_src)/il_mng.c $(il_src)/il_raw.c $(il_src)/il_wal.c $(il_src)/il_dds.c $(il_src)/il_internal.c $(il_src)/il_pal.c $(il_src)/il_rawdata.c $(il_src)/il_devil.c $(il_src)/il_io.c $(il_src)/il_pcd.c $(il_src)/il_register.c $(il_src)/il_psd.c $(il_src)/il_fastconv.c $(il_src)/il_neuquant.c $(il_src)/il_dds-save.c $(il_src)/il_psp.c $(il_src)/il_pix.c $(il_src)/il_pxr.c $(il_src)/il_vtf.c $(il_src)/il_xpm.c $(il_src)/il_hdr.c $(il_src)/il_icns.c $(il_src)/il_jp2.c $(il_src)/altivec_common.c $(il_src)/altivec_typeconversion.c $(il_src)/il_sun.c $(il_src)/il_nvidia.cpp $(il_src)/il_wbmp.c $(il_src)/il_squish.cpp $(il_src)/il_iff.c $(il_src)/il_ilbm.c $(il_src)/il_size.c $(il_src)/il_tpl.c $(il_src)/il_fits.c $(il_src)/il_iwi.c $(il_src)/il_blp.c $(il_src)/il_ftx.c $(il_src)/il_dicom.c $(il_src)/il_rot.c $(il_src)/il_texture.c $(il_src)/il_dpx.c $(il_src)/il_utx.cpp $(il_src)/il_mp3.c
++libIL_la_SOURCES = $(il_src)/il_alloc.c $(il_src)/il_doom.c $(il_src)/il_stack.c $(il_src)/il_pcx.c $(il_src)/il_rle.c $(il_src)/il_bits.c $(il_src)/il_endian.c $(il_src)/il_exr.cpp $(il_src)/il_jpeg.c $(il_src)/il_pic.c $(il_src)/il_sgi.c $(il_src)/il_bmp.c $(il_src)/il_error.c $(il_src)/il_lif.c $(il_src)/il_png.c $(il_src)/il_states.c $(il_src)/il_convbuff.c $(il_src)/il_files.c $(il_src)/il_main.c $(il_src)/il_pnm.c $(il_src)/il_targa.c $(il_src)/il_wdp.c $(il_src)/il_convert.c $(il_src)/il_gif.cpp $(il_src)/il_manip.c $(il_src)/il_profiles.c $(il_src)/il_tiff.c $(il_src)/il_cut.c $(il_src)/il_header.c $(il_src)/il_mdl.c $(il_src)/il_quantizer.c $(il_src)/il_utility.c $(il_src)/il_dcx.c $(il_src)/il_icon.c $(il_src)/il_mng.c $(il_src)/il_raw.c $(il_src)/il_wal.c $(il_src)/il_dds.c $(il_src)/il_internal.c $(il_src)/il_pal.c $(il_src)/il_rawdata.c $(il_src)/il_devil.c $(il_src)/il_io.c $(il_src)/il_pcd.c $(il_src)/il_register.c $(il_src)/il_psd.c $(il_src)/il_fastconv.c $(il_src)/il_neuquant.c $(il_src)/il_dds-save.c $(il_src)/il_psp.c $(il_src)/il_pix.c $(il_src)/il_pxr.c $(il_src)/il_vtf.c $(il_src)/il_xpm.c $(il_src)/il_hdr.c $(il_src)/il_icns.c $(il_src)/il_jp2.c $(il_src)/altivec_common.c $(il_src)/altivec_typeconversion.c $(il_src)/il_sun.c $(il_src)/il_nvidia.cpp $(il_src)/il_wbmp.c $(il_src)/il_squish.cpp $(il_src)/il_iff.c $(il_src)/il_ilbm.c $(il_src)/il_size.c $(il_src)/il_tpl.c $(il_src)/il_fits.c $(il_src)/il_iwi.c $(il_src)/il_blp.c $(il_src)/il_ftx.c $(il_src)/il_dicom.c $(il_src)/il_rot.c $(il_src)/il_texture.c $(il_src)/il_dpx.c $(il_src)/il_utx.cpp $(il_src)/il_mp3.c
+ 
+ libIL_la_SOURCES += $(il_include)/altivec_common.h $(il_include)/altivec_typeconversion.h $(il_include)/il_alloc.h $(il_include)/il_bits.h $(il_include)/il_bmp.h $(il_include)/il_dcx.h $(il_include)/il_dds.h $(il_include)/il_doompal.h $(il_include)/il_dpx.h $(il_include)/il_endian.h $(il_include)/il_exr.h $(il_include)/il_files.h $(il_include)/il_gif.h $(il_include)/il_hdr.h $(il_include)/il_icns.h $(il_include)/il_icon.h $(il_include)/il_internal.h $(il_include)/il_jp2.h $(il_include)/il_jpeg.h $(il_include)/il_lif.h $(il_include)/il_manip.h $(il_include)/il_mdl.h $(il_include)/il_pal.h $(il_include)/il_pcx.h $(il_include)/il_pic.h $(il_include)/il_pnm.h $(il_include)/il_psd.h $(il_include)/il_psp.h $(il_include)/il_q2pal.h $(il_include)/il_register.h $(il_include)/il_rle.h $(il_include)/il_sgi.h $(il_include)/il_stack.h $(il_include)/il_states.h $(il_include)/il_targa.h $(il_include)/il_utx.h $(il_include)/il_vtf.h $(il_include)/il_wdp.h $(all_include)/IL/devil_internal_exports.h
+ libIL_la_LDFLAGS = @IL_LIBS@ $(AM_LDFLAGS)

Added: trunk/dports/devel/ResIL/files/patch-src-IL-include-il_endian.h.diff
===================================================================
--- trunk/dports/devel/ResIL/files/patch-src-IL-include-il_endian.h.diff	                        (rev 0)
+++ trunk/dports/devel/ResIL/files/patch-src-IL-include-il_endian.h.diff	2013-11-07 02:14:49 UTC (rev 113028)
@@ -0,0 +1,26 @@
+--- src-IL/include/il_endian.h.orig	2009-03-08 01:10:08.000000000 -0600
++++ src-IL/include/il_endian.h	2013-11-03 01:52:37.000000000 -0600
+@@ -19,9 +19,13 @@
+ 	#ifndef __BIG_ENDIAN__
+ 	#define __BIG_ENDIAN__ 1
+ 	#endif
++#else
++	#ifndef __LITTLE_ENDIAN__
++	#define __LITTLE_ENDIAN__ 1
++	#endif
+ #endif
+ 
+-#if (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __BIG_ENDIAN__) \
++#if (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) \
+   || (defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__))
+  	#undef __LITTLE_ENDIAN__
+ 	#define Short(s) iSwapShort(s)
+@@ -39,8 +43,6 @@
+ 	#define BigDouble(d)  
+ #else
+ 	#undef __BIG_ENDIAN__
+-	#undef __LITTLE_ENDIAN__  // Not sure if it's defined by any compiler...
+-	#define __LITTLE_ENDIAN__
+ 	#define Short(s)  
+ 	#define UShort(s)  
+ 	#define Int(i)  

Deleted: trunk/dports/devel/ResIL/files/patch-src_IL-src-il_icon.c.diff
===================================================================
--- trunk/dports/devel/libdevil/files/patch-src_IL-src-il_icon.c.diff	2013-11-01 23:06:43 UTC (rev 112818)
+++ trunk/dports/devel/ResIL/files/patch-src_IL-src-il_icon.c.diff	2013-11-07 02:14:49 UTC (rev 113028)
@@ -1,11 +0,0 @@
---- src-IL/src/il_icon.c.orig	2011-07-07 10:36:20.000000000 +0200
-+++ src-IL/src/il_icon.c	2011-07-07 10:37:27.000000000 +0200
-@@ -525,7 +525,7 @@
- 
- 	// Expand low-bit-depth grayscale images to 8 bits
- 	if (ico_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
--		png_set_gray_1_2_4_to_8(ico_png_ptr);
-+		png_set_expand_gray_1_2_4_to_8(ico_png_ptr);
- 	}
- 
- 	// Expand RGB images with transparency to full alpha channels

Deleted: trunk/dports/devel/ResIL/files/patch-src_IL-src-il_png.c.diff
===================================================================
--- trunk/dports/devel/libdevil/files/patch-src_IL-src-il_png.c.diff	2013-11-01 23:06:43 UTC (rev 112818)
+++ trunk/dports/devel/ResIL/files/patch-src_IL-src-il_png.c.diff	2013-11-07 02:14:49 UTC (rev 113028)
@@ -1,11 +0,0 @@
---- src-IL/src/il_png.c.orig	2011-07-06 23:44:57.000000000 +0200
-+++ src-IL/src//il_png.c	2011-07-06 23:46:53.000000000 +0200
-@@ -278,7 +278,7 @@
- 
- 	// Expand low-bit-depth grayscale images to 8 bits
- 	if (png_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
--		png_set_gray_1_2_4_to_8(png_ptr);
-+		png_set_expand_gray_1_2_4_to_8(png_ptr);
- 	}
- 
- 	// Expand RGB images with transparency to full alpha channels

Added: trunk/dports/devel/ResIL/files/patch-strnicmp.diff
===================================================================
--- trunk/dports/devel/ResIL/files/patch-strnicmp.diff	                        (rev 0)
+++ trunk/dports/devel/ResIL/files/patch-strnicmp.diff	2013-11-07 02:14:49 UTC (rev 113028)
@@ -0,0 +1,60 @@
+--- src-IL/src/il_gif.cpp.orig	2013-08-14 10:22:24.000000000 -0500
++++ src-IL/src/il_gif.cpp	2013-11-03 00:17:33.000000000 -0500
+@@ -112,9 +112,9 @@
+ 		return IL_FALSE;
+ 	iseek(-6, IL_SEEK_CUR);
+ 
+-	if (!_strnicmp(Header, "GIF87A", 6))
++	if (!strnicmp(Header, "GIF87A", 6))
+ 		return IL_TRUE;
+-	if (!_strnicmp(Header, "GIF89A", 6))
++	if (!strnicmp(Header, "GIF89A", 6))
+ 		return IL_TRUE;
+ 
+ 	return IL_FALSE;
+@@ -549,8 +549,8 @@
+    iSwapUShort(Header.Height);
+    #endif
+ 
+-	if (_strnicmp(Header.Sig, "GIF87A", 6) != 0 
+-   &&  _strnicmp(Header.Sig, "GIF89A", 6) != 0) 
++	if (strnicmp(Header.Sig, "GIF87A", 6) != 0 
++   &&  strnicmp(Header.Sig, "GIF89A", 6) != 0) 
+    {
+ 		ilSetError(IL_INVALID_FILE_HEADER);
+ 		return IL_FALSE;
+--- src-IL/src/il_hdr.c.orig	2011-12-09 13:57:20.000000000 -0600
++++ src-IL/src/il_hdr.c	2013-11-03 00:17:53.000000000 -0500
+@@ -137,8 +137,8 @@
+ 		return IL_FALSE;
+ 
+ 	return
+-		_strnicmp(Head, "#?RADIANCE", 10) == 0
+-		|| _strnicmp(Head, "#?RGBE", 6) == 0;
++		strnicmp(Head, "#?RADIANCE", 10) == 0
++		|| strnicmp(Head, "#?RGBE", 6) == 0;
+ }
+ 
+ 
+@@ -146,8 +146,8 @@
+ ILboolean iCheckHdr(HDRHEADER *Header)
+ {
+ 	return
+-		_strnicmp(Header->Signature, "#?RADIANCE", 10) == 0
+-		|| _strnicmp(Header->Signature, "#?RGBE", 6) == 0;
++		strnicmp(Header->Signature, "#?RADIANCE", 10) == 0
++		|| strnicmp(Header->Signature, "#?RGBE", 6) == 0;
+ }
+ 
+ 
+--- src-IL/src/il_icon.c.orig	2011-12-09 13:58:18.000000000 -0600
++++ src-IL/src/il_icon.c	2013-11-03 00:18:08.000000000 -0500
+@@ -116,7 +116,7 @@
+ 		// 08-22-2008: Adding test for compressed PNG data
+ 		igetc(); // Skip the first character...seems to vary.
+ 		iread(PNGTest, 3, 1);
+-		if (!_strnicmp((char*)PNGTest, "PNG", 3))  // Characters 'P', 'N', 'G' for PNG header
++		if (!strnicmp((char*)PNGTest, "PNG", 3))  // Characters 'P', 'N', 'G' for PNG header
+ 		{
+ #ifdef IL_NO_PNG
+ 			ilSetError(IL_FORMAT_NOT_SUPPORTED);  // Cannot handle these without libpng.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131106/545ca941/attachment.html>


More information about the macports-changes mailing list