dev-dotnet/libgdiplus-1.2.5-r1: Fix linking against image libraries (bug #192068)

Package-Manager: portage-2.1.3.9

5 files changed, 306 insertions, 8 deletions

diff --git a/dev-dotnet/libgdiplus/ChangeLog b/dev-dotnet/libgdiplus/ChangeLog
index 2068c90635f6..1628794791c7 100644
--- a/dev-dotnet/libgdiplus/ChangeLog
+++ b/dev-dotnet/libgdiplus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-dotnet/libgdiplus
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/ChangeLog,v 1.77 2007/09/10 19:03:52 jurek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/ChangeLog,v 1.78 2007/09/24 17:26:38 jurek Exp $
+
+*libgdiplus-1.2.5-r1 (24 Sep 2007)
+
+  24 Sep 2007; Jurek Bartuszek <jurek@gentoo.org>
+  +files/libgdiplus-1.2.5-imglibs.patch, +libgdiplus-1.2.5-r1.ebuild:
+  Fix linking against image libraries (bug #192068)
 
 *libgdiplus-1.2.5 (10 Sep 2007)
 
diff --git a/dev-dotnet/libgdiplus/Manifest b/dev-dotnet/libgdiplus/Manifest
index fcfc271b1485..836e1f6901c8 100644
--- a/dev-dotnet/libgdiplus/Manifest
+++ b/dev-dotnet/libgdiplus/Manifest
@@ -9,6 +9,10 @@ AUX libgdiplus-1.2.4-cairo.patch 395 RMD160 145c58e3bbbd719011d62ea5df12b42b57fe
 MD5 b395e4580a037ff822c60ba400bc5432 files/libgdiplus-1.2.4-cairo.patch 395
 RMD160 145c58e3bbbd719011d62ea5df12b42b57fe52b4 files/libgdiplus-1.2.4-cairo.patch 395
 SHA256 2436ae7e5e6309f1a9de0c82edb3e782a8661b5a46453564231fa230f2bbb242 files/libgdiplus-1.2.4-cairo.patch 395
+AUX libgdiplus-1.2.5-imglibs.patch 5743 RMD160 0c42aaf53d7e46489cd203f3633a487bb8e1146f SHA1 29bebd9434a818abcefc64caa2cba69a5dff3b38 SHA256 3c54fdead42729e8c8b6f9103b413c51df4a29273aa5a7def505b4abc1613fed
+MD5 bfbb53da3ec7ec44f15464a52b7d2db3 files/libgdiplus-1.2.5-imglibs.patch 5743
+RMD160 0c42aaf53d7e46489cd203f3633a487bb8e1146f files/libgdiplus-1.2.5-imglibs.patch 5743
+SHA256 3c54fdead42729e8c8b6f9103b413c51df4a29273aa5a7def505b4abc1613fed files/libgdiplus-1.2.5-imglibs.patch 5743
 DIST libgdiplus-1.2.2.tar.gz 2968362 RMD160 403c73cda029fac34a16093ae3449697d26c0f77 SHA1 aa82bbe49a7251bb055a9a60e4583cd7720cefc0 SHA256 1f54922c9bc9386cb116ef872a346bfb26b9dc530060dada7bf39e00f72dc0ec
 DIST libgdiplus-1.2.3.tar.gz 2991934 RMD160 9569f98bc1b987ec8f45ec92ede2f88bf7a36ad7 SHA1 313a1031ecb19c017453f4fa9c44651b8c4ddeb5 SHA256 6278edb273ff79a4fb896adf818792537a2977095e73ac74f5b31d50dead9dfa
 DIST libgdiplus-1.2.4.tar.bz2 2848526 RMD160 90d17f78ba50256d71478c105bbba0a30b68ab3e SHA1 53498e13ba0756ff1cb8a0b6227044dbc6bb3603 SHA256 373af7c1cf80d765e25a843ee69fe50809defab25a3e3a6df8ef974a47cb1326
@@ -25,14 +29,18 @@ EBUILD libgdiplus-1.2.4.ebuild 1758 RMD160 680854e7824a2b34ed037810197b73a319124
 MD5 f2d2f2761ecdd009c7819f5d629882e5 libgdiplus-1.2.4.ebuild 1758
 RMD160 680854e7824a2b34ed037810197b73a319124a6c libgdiplus-1.2.4.ebuild 1758
 SHA256 30d2a5596f6e0665dccd6ac0c094eb2443fda6f6e01cd8af2a3fbe0eee093b88 libgdiplus-1.2.4.ebuild 1758
+EBUILD libgdiplus-1.2.5-r1.ebuild 1764 RMD160 f610ed64478dd57e8d79650996ed37ea688e3085 SHA1 f687ff4425a458acd79c27dd5a0b00ec06cf04fd SHA256 edbecf19c9a5c12ff78d5ee7429013debcd2e91041b14cdbd1e835b16de43828
+MD5 4e239dc098c7872e3333c95449040478 libgdiplus-1.2.5-r1.ebuild 1764
+RMD160 f610ed64478dd57e8d79650996ed37ea688e3085 libgdiplus-1.2.5-r1.ebuild 1764
+SHA256 edbecf19c9a5c12ff78d5ee7429013debcd2e91041b14cdbd1e835b16de43828 libgdiplus-1.2.5-r1.ebuild 1764
 EBUILD libgdiplus-1.2.5.ebuild 1722 RMD160 0cf630dbeb94ffd1be8f8fb29c597df1b0d6dbb1 SHA1 86efedc11bee4d4e2de8e18dfb59dd7059c69d76 SHA256 1b6d78753549d017105df7091ea6c269b594da491d3b2fe1dcf1b9633c90f785
 MD5 d18e4b5e1d8fb39267d6a9ebde691e2b libgdiplus-1.2.5.ebuild 1722
 RMD160 0cf630dbeb94ffd1be8f8fb29c597df1b0d6dbb1 libgdiplus-1.2.5.ebuild 1722
 SHA256 1b6d78753549d017105df7091ea6c269b594da491d3b2fe1dcf1b9633c90f785 libgdiplus-1.2.5.ebuild 1722
-MISC ChangeLog 12878 RMD160 4d5bf90fa9a7048fc640eb93aad0b85b35a074c2 SHA1 1ae0e9a33a35a5799c2b94493416cb2b667af724 SHA256 f58184434d6e14d440a2dc8e92efc9b6b41f2d981d51db21a0daa4ef281ac7bf
-MD5 4db361d808f2f3dd37099bbda4f4d6ba ChangeLog 12878
-RMD160 4d5bf90fa9a7048fc640eb93aad0b85b35a074c2 ChangeLog 12878
-SHA256 f58184434d6e14d440a2dc8e92efc9b6b41f2d981d51db21a0daa4ef281ac7bf ChangeLog 12878
+MISC ChangeLog 13087 RMD160 4ef35136cd5c1f23a3b3477be298ec46f6923748 SHA1 fde179908b7c4043dc8aa0d34b76734e22d1617f SHA256 d0e3d9900be3ee9dde2403f74c003e5a66a2af8ba5b53a606d7cd1f3e9d55abc
+MD5 4491ef3e0f910fa328622fec9ac65d64 ChangeLog 13087
+RMD160 4ef35136cd5c1f23a3b3477be298ec46f6923748 ChangeLog 13087
+SHA256 d0e3d9900be3ee9dde2403f74c003e5a66a2af8ba5b53a606d7cd1f3e9d55abc ChangeLog 13087
 MISC metadata.xml 225 RMD160 8fbef39f99ef7ad1f5d9776277933c55fa09b124 SHA1 0ae7f29b923c633f4ec5ad76da1cf254eea33c76 SHA256 c36969f52019fabc4b88dac092c555cc8b89b9f01a7b5d2b1dbea0678315db7c
 MD5 ff72aa2bca4b06e18e400ad5f721b20d metadata.xml 225
 RMD160 8fbef39f99ef7ad1f5d9776277933c55fa09b124 metadata.xml 225
@@ -49,10 +57,13 @@ SHA256 bf35b1e434abfec0d1b21052aa5189543f097b38c5f464c3e4d9da0117f357d2 files/di
 MD5 b0bf095bbb0fb10169e37f47c03162b4 files/digest-libgdiplus-1.2.5 256
 RMD160 90e7281c6520537d3afb0b9108151fb0514b2a8a files/digest-libgdiplus-1.2.5 256
 SHA256 a29329eb9f6aae3f5e531f987075375fc7e6e4f3ebbe591ee9fff88b161008df files/digest-libgdiplus-1.2.5 256
+MD5 b0bf095bbb0fb10169e37f47c03162b4 files/digest-libgdiplus-1.2.5-r1 256
+RMD160 90e7281c6520537d3afb0b9108151fb0514b2a8a files/digest-libgdiplus-1.2.5-r1 256
+SHA256 a29329eb9f6aae3f5e531f987075375fc7e6e4f3ebbe591ee9fff88b161008df files/digest-libgdiplus-1.2.5-r1 256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFG5ZUeyvXkcyXx2ogRAgytAJ9ATey8lae1CMLsw0oc68ORMtS5hACfZB/M
-NwkZncxcQYKYEXKcPeSrKxs=
-=IuX4
+iD8DBQFG9/NUyvXkcyXx2ogRAiS7AJ0eyZVPIH0sAMTUjb7y94q2nadJTgCcC6Tk
+u6XI9w6gmEKmv/1MUdP5UUE=
+=d8Ch
 -----END PGP SIGNATURE-----
diff --git a/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.2.5-r1 b/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.2.5-r1
new file mode 100644
index 000000000000..c690dc24f4f3
--- /dev/null
+++ b/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.2.5-r1
@@ -0,0 +1,3 @@
+MD5 82bbf6ca86b85e5148a15d8d88c6e548 libgdiplus-1.2.5.tar.bz2 2942165
+RMD160 84ecbb58edea5deb91b140e11461fb6fcf8b0f28 libgdiplus-1.2.5.tar.bz2 2942165
+SHA256 28edc21bc49f3791438ea70b5de944c4118a6daa557425f3209102379042e926 libgdiplus-1.2.5.tar.bz2 2942165
diff --git a/dev-dotnet/libgdiplus/files/libgdiplus-1.2.5-imglibs.patch b/dev-dotnet/libgdiplus/files/libgdiplus-1.2.5-imglibs.patch
new file mode 100644
index 000000000000..109d8c5e1342
--- /dev/null
+++ b/dev-dotnet/libgdiplus/files/libgdiplus-1.2.5-imglibs.patch
@@ -0,0 +1,212 @@
+--- src/image.c	2007-07-24 21:12:28.000000000 +0000
++++ src/image.c	2007-09-23 17:34:34.000000000 +0000
+@@ -915,18 +915,26 @@
+ 	case BMP:
+ 		status = gdip_load_bmp_image_from_file (fp, &result);
+ 		break;
++#ifdef HAVE_LIBTIFF
+ 	case TIF:
+ 		status = gdip_load_tiff_image_from_file (fp, &result);
+ 		break;
++#endif
++#ifdef HAVE_LIBGIF
+ 	case GIF:
+ 		status = gdip_load_gif_image_from_file (fp, &result);
+ 		break;
++#endif
++#ifdef HAVE_LIBPNG
+ 	case PNG:
+ 		status = gdip_load_png_image_from_file (fp, &result);
+ 		break;
++#endif
++#ifdef HAVE_LIBJPEG
+ 	case JPEG:
+ 		status = gdip_load_jpeg_image_from_file (fp, file_name, &result);
+ 		break;
++#endif
+ 	case ICON:
+ 		status = gdip_load_ico_image_from_file (fp, &result);
+ 		break;
+@@ -1012,18 +1020,22 @@
+ 	file_name = (char *) ucs2_to_utf8 ((const gunichar2 *)file, -1);
+ 	if (file_name == NULL)
+ 		return InvalidParameter;
+-	
++
++#ifdef HAVE_LIBGIF
+ 	if (format == GIF) { /* gif library has to open the file itself*/
+ 		status = gdip_save_gif_image_to_file ((BYTE*)file_name, image);
+ 		GdipFree (file_name);
+ 		return status;
+-	} else if (format == TIF) { 
++	} else 
++#endif
++#ifdef HAVE_LIBTIFF
++	if (format == TIF) { 
+ 		/* tif library has to open the file itself or seeking will fail when saving multi-page images*/
+ 		status = gdip_save_tiff_image_to_file ((BYTE*)file_name, image, params);
+ 		GdipFree (file_name);
+ 		return status;
+ 	}
+-	
++#endif	
+ 	if ((fp = fopen(file_name, "wb")) == NULL) {
+ 		GdipFree (file_name);
+ 		return GenericError;
+@@ -1036,12 +1048,16 @@
+ 		case ICON:
+ 			status = gdip_save_bmp_image_to_file (fp, image);
+ 			break;
++#ifdef HAVE_LIBPNG
+ 		case PNG:
+ 			status = gdip_save_png_image_to_file (fp, image, params);
+ 			break;
++#endif
++#ifdef HAVE_LIBJPEG
+ 		case JPEG:
+ 			status = gdip_save_jpeg_image_to_file (fp, image, params);
+ 			break;
++#endif
+ 		default:
+ 			status = NotImplemented;
+ 			break;
+@@ -1945,7 +1961,7 @@
+ 	/* GDI+ doesn't support this for metafiles */
+ 	if (image->type != ImageTypeBitmap)
+ 		return NotImplemented;
+-
++        /* is it correct if we don't have lib(jpeg,tiff,png) ? */
+ 	switch(image->image_format) {
+ 		case TIF:
+ 		case JPEG:
+@@ -2109,24 +2125,32 @@
+ 	format = get_image_format ((char *)format_peek, format_peek_sz, &public_format);
+ 	
+ 	switch (format) {
++#ifdef HAVE_LIBJPEG
+ 	case JPEG:
+ 		loader = dstream_input_new (getBytesFunc, seekFunc);
+ 		status = gdip_load_jpeg_image_from_stream_delegate (loader, &result);
+ 		break;
++#endif
++#ifdef HAVE_LIBPNG
+ 	case PNG:
+ 		status = gdip_load_png_image_from_stream_delegate (getBytesFunc, seekFunc, &result);
+ 		break;
++#endif
+ 	case BMP:
+ 		loader = dstream_input_new (getBytesFunc, seekFunc);
+ 		status = gdip_load_bmp_image_from_stream_delegate (loader, &result);
+ 		break;
++#ifdef HAVE_LIBTIFF
+ 	case TIF:
+ 		status = gdip_load_tiff_image_from_stream_delegate (getBytesFunc, putBytesFunc,
+ 			seekFunc, closeFunc, sizeFunc, &result);
+ 		break;
++#endif
++#ifdef HAVE_LIBGIF
+ 	case GIF:
+ 		status = gdip_load_gif_image_from_stream_delegate (getBytesFunc, seekFunc, &result);
+ 		break;
++#endif
+ 	case ICON:
+ 		loader = dstream_input_new (getBytesFunc, seekFunc);
+ 		status = gdip_load_ico_image_from_stream_delegate (loader, &result);
+@@ -2172,15 +2196,23 @@
+ 	case ICON:
+ 	case BMP:
+ 		return gdip_save_bmp_image_to_stream_delegate (putBytesFunc, image);
++#ifdef HAVE_LIBPNG
+        	case PNG:
+ 		return gdip_save_png_image_to_stream_delegate (putBytesFunc, image, params);
++#endif
++#ifdef HAVE_LIBJPEG
+ 	case JPEG:
+ 		return gdip_save_jpeg_image_to_stream_delegate (putBytesFunc, image, params);
++#endif
++#ifdef HAVE_LIBGIF
+ 	case GIF:
+ 		return gdip_save_gif_image_to_stream_delegate (putBytesFunc, image, params);
++#endif
++#ifdef HAVE_LIBTIFF
+ 	case TIF:
+ 		return gdip_save_tiff_image_to_stream_delegate (getBytesFunc, putBytesFunc,
+ 			seekFunc, closeFunc, sizeFunc, image, params);
++#endif
+ 	case INVALID:
+ 		return UnknownImageFormat;
+ 	default:
+@@ -2217,6 +2249,7 @@
+ 	dpos += sizeof (ImageCodecInfo);
+ 	g_decoders++;
+ 	
++#ifdef HAVE_LIBJPEG
+ 	/* JPEG codec (encoder+decoder) */
+ 	if (gdip_getcodecinfo_jpeg ()) {
+ 		memcpy (dpos, gdip_getcodecinfo_jpeg(), sizeof (ImageCodecInfo));
+@@ -2226,7 +2259,8 @@
+ 		epos += sizeof (ImageCodecInfo);
+ 		g_encoders++;
+ 	}
+-	
++#endif
++#ifdef HAVE_LIBGIF
+ 	/* GIF codec (encoder+decoder) */
+ 	if (gdip_getcodecinfo_gif ()) {
+ 		memcpy (dpos, gdip_getcodecinfo_gif (), sizeof (ImageCodecInfo));
+@@ -2236,7 +2270,8 @@
+ 		epos += sizeof (ImageCodecInfo);
+ 		g_encoders++;
+ 	}
+-	
++#endif
++#ifdef HAVE_LIBTIFF
+ 	/* TIFF codec (encoder+decoder) */
+ 	if (gdip_getcodecinfo_tiff ()) {
+ 		memcpy (dpos, gdip_getcodecinfo_tiff (), sizeof (ImageCodecInfo));
+@@ -2246,7 +2281,8 @@
+ 		epos += sizeof (ImageCodecInfo);
+ 		g_encoders++;
+ 	}
+-	
++#endif	
++#ifdef HAVE_LIBPNG
+ 	/* PNG codec (encoder+decoder) */
+ 	if (gdip_getcodecinfo_png ()) {
+ 		memcpy (dpos, gdip_getcodecinfo_png (), sizeof (ImageCodecInfo));
+@@ -2256,7 +2292,7 @@
+ 		epos += sizeof (ImageCodecInfo);
+ 		g_encoders++;
+ 	}
+-
++#endif
+ 	/* WMF codec (decoder-only) */
+ 	if (gdip_getcodecinfo_wmf ()) {
+ 		memcpy (dpos, gdip_getcodecinfo_wmf (), sizeof (ImageCodecInfo));
+@@ -2386,9 +2422,11 @@
+ 	fmt = gdip_get_imageformat_from_codec_clsid ((CLSID *) clsidEncoder);
+ 
+ 	switch (fmt) {
++#ifdef HAVE_LIBJPEG
+ 		case JPEG:
+ 			*size = gdip_get_encoder_parameter_list_size_jpeg ();
+ 			return Ok;
++#endif
+ 		case TIF:
+ 			*size = 0;
+ 			return NotImplemented;
+@@ -2410,10 +2448,14 @@
+ 	fmt = gdip_get_imageformat_from_codec_clsid ((CLSID *) clsidEncoder);
+ 
+ 	switch (fmt) {
++#ifdef HAVE_LIBJPEG
+ 		case JPEG:
+ 			return gdip_fill_encoder_parameter_list_jpeg (buffer, size);
++#endif
++#ifdef HAVE_LIBTIFF
+ 		case TIF:
+ 			return NotImplemented;
++#endif
+ 		default:
+ 			break;
+ 	}
diff --git a/dev-dotnet/libgdiplus/libgdiplus-1.2.5-r1.ebuild b/dev-dotnet/libgdiplus/libgdiplus-1.2.5-r1.ebuild
new file mode 100644
index 000000000000..e4cd055c4e7e
--- /dev/null
+++ b/dev-dotnet/libgdiplus/libgdiplus-1.2.5-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-1.2.5-r1.ebuild,v 1.1 2007/09/24 17:26:38 jurek Exp $
+
+inherit eutils flag-o-matic toolchain-funcs autotools
+
+DESCRIPTION="Library for using System.Drawing with mono"
+HOMEPAGE="http://www.go-mono.com/"
+SRC_URI="http://www.go-mono.com/sources/${PN}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="exif gif jpeg tiff"
+
+RDEPEND=">=dev-libs/glib-2.6
+		 >=media-libs/freetype-2
+		 >=media-libs/fontconfig-2
+		   media-libs/libpng
+		x11-libs/libXrender
+		x11-libs/libX11
+		x11-libs/libXt
+		 exif? ( media-libs/libexif )
+		 gif? ( >=media-libs/giflib-4.1.3 )
+		 jpeg? ( media-libs/jpeg )
+		 tiff? ( media-libs/tiff )"
+DEPEND="${RDEPEND}
+		>=dev-util/pkgconfig-0.19"
+
+RESTRICT="test"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PN}-1.1.13-libungif-configure-fix.diff
+	epatch ${FILESDIR}/${P}-imglibs.patch
+	eautoreconf
+}
+
+src_compile() {
+	if [[ "$(gcc-major-version)" -gt "3" ]] || \
+	   ( [[ "$(gcc-major-version)" -eq "3" ]] && [[ "$(gcc-minor-version)" -gt "3" ]] )
+	then
+		append-flags -fno-inline-functions
+	fi
+
+	# Disable glitz support as libgdiplus does not use it, and it causes errors
+	econf --disable-glitz          \
+		  $(use_with exif libexif) \
+		  $(use_with gif libgif)   \
+		  $(use_with jpeg libjpeg) \
+		  $(use_with tiff libtiff) || die "configure failed"
+
+	# attribute ((__stdcall__)) generates warnings on ppc
+	if use ppc ; then
+		sed -i -e 's:-Werror::g' src/Makefile
+	fi
+
+	emake || die "compile failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	dodoc AUTHORS ChangeLog NEWS README
+}