Revision: 148198 https://trac.macports.org/changeset/148198 Author: jmr@macports.org Date: 2016-04-29 07:18:37 -0700 (Fri, 29 Apr 2016) Log Message: ----------- libsdl_image: apply upstream patch to remove incorrect use of CGColorSpace APIs (#37453). Also disable ImageIO support on 10.5 since it is unable to load some images (#38012). Modified Paths: -------------- trunk/dports/devel/libsdl_image/Portfile Added Paths: ----------- trunk/dports/devel/libsdl_image/files/ trunk/dports/devel/libsdl_image/files/IMG_ImageIO.m.patch Modified: trunk/dports/devel/libsdl_image/Portfile =================================================================== --- trunk/dports/devel/libsdl_image/Portfile 2016-04-29 13:33:14 UTC (rev 148197) +++ trunk/dports/devel/libsdl_image/Portfile 2016-04-29 14:18:37 UTC (rev 148198) @@ -6,7 +6,7 @@ name libsdl_image set my_name SDL_image version 1.2.12 -revision 4 +revision 5 categories devel graphics platforms darwin license zlib @@ -31,6 +31,9 @@ port:tiff \ port:zlib +# https://trac.macports.org/ticket/37453 +patchfiles IMG_ImageIO.m.patch + configure.args --disable-sdltest \ --enable-jpg-shared=false \ --enable-png-shared=false \ @@ -43,9 +46,9 @@ ${destroot}${docdir} } -platform darwin 8 { - # This can probably be made to work if someone cares enough - # http://trac.macports.org/ticket/33015 +if {${os.platform} eq "darwin" && ${os.major} <= 9} { + # https://trac.macports.org/ticket/33015 + # https://trac.macports.org/ticket/38012 configure.args-append --disable-imageio } Added: trunk/dports/devel/libsdl_image/files/IMG_ImageIO.m.patch =================================================================== --- trunk/dports/devel/libsdl_image/files/IMG_ImageIO.m.patch (rev 0) +++ trunk/dports/devel/libsdl_image/files/IMG_ImageIO.m.patch 2016-04-29 14:18:37 UTC (rev 148198) @@ -0,0 +1,27 @@ +--- IMG_ImageIO.m.orig 2012-01-21 12:51:33.000000000 +1100 ++++ IMG_ImageIO.m 2016-04-29 22:48:02.000000000 +1000 +@@ -212,23 +212,7 @@ static SDL_Surface* Create_SDL_Surface_F + CGContextRef bitmap_context; + CGBitmapInfo bitmap_info; + +- /* This sets up a color space that results in identical values +- * as the image data itself, which is the same as the standalone +- * libpng loader. +- * Thanks to Allegro. :) +- */ +- CGFloat whitePoint[3] = { 1, 1, 1 }; +- CGFloat blackPoint[3] = { 0, 0, 0 }; +- CGFloat gamma[3] = { 2.2, 2.2, 2.2 }; +- CGFloat matrix[9] = { +- 1, 1, 1, +- 1, 1, 1, +- 1, 1, 1 +- }; +- CGColorSpaceRef color_space = +- CGColorSpaceCreateCalibratedRGB( +- whitePoint, blackPoint, gamma, matrix +- ); ++ CGColorSpaceRef color_space = CGColorSpaceCreateDeviceRGB(); + + if (alpha == kCGImageAlphaNone || + alpha == kCGImageAlphaNoneSkipFirst ||