Fix white artifacts in remmina, bug 437918 by Ben Kohler.

Package-Manager: portage-2.2.0_alpha136/cvs/Linux x86_64

4 files changed, 170 insertions, 5 deletions

diff --git a/net-misc/freerdp/ChangeLog b/net-misc/freerdp/ChangeLog
index 43ef19f4879a..8ba6d5e8876f 100644
--- a/net-misc/freerdp/ChangeLog
+++ b/net-misc/freerdp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/freerdp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/ChangeLog,v 1.35 2012/10/07 00:31:10 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/ChangeLog,v 1.36 2012/10/11 15:59:24 floppym Exp $
+
+*freerdp-1.1.0_pre20121004-r1 (11 Oct 2012)
+
+  11 Oct 2012; Mike Gilbert <floppym@gentoo.org>
+  +files/freerdp-1.1.0_pre20121004-argb.patch,
+  +freerdp-1.1.0_pre20121004-r1.ebuild:
+  Fix white artifacts in remmina, bug 437918 by Ben Kohler.
 
 *freerdp-1.1.0_pre20121004 (07 Oct 2012)
 
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index cd4ab0deaee5..36f2917c7f79 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,19 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX freerdp-1.1.0_pre20121004-argb.patch 2137 SHA256 0ba7ceac3c12c8d34fdf0d14a8ed6e4ab24b85d8cc70060cc83d332b02bba879 SHA512 83b9c9f0c2cb55e041db53d9078d462c547175add27bb0a95db61678efdb910f636adc292d25e3428cfbb3c8674da415fb1c499ce9da65084922f7d5d03f410d WHIRLPOOL d2d4fe44aba7d3a52e1dac7d56a1768dd48a8d7b17e5f64ee9edf0f297deee026d2f2381ec938c6fa5778a408b5d554560ae340a8f54080e192b78b51fbde39f
 DIST freerdp-1.0.1_p20120318.tar.gz 3666002 SHA256 f03d8f7138d66e0fac192e6ac52e7507343d55953cf62f796e3a70a2fb989dc8 SHA512 5c6ef5997d2d378d3c8b0427587ac6484755d74e5c3c632846211a4b7f425f2ab7cf497c87956c7d492246bca2d41ee0d25f094ac57cd94153facfe81948af19 WHIRLPOOL 018c7ec55bad4bbd35e801e4d4368c80ffb92fb3b88d06522d5b39ca6b0ba8c7d0ab919ed138a18e1ab27900db88f6407e2b229ece1f8dbe9177d0bcfb07981c
 DIST freerdp-1.0.1_p20120726.tar.gz 3781458 SHA256 68eab735e00ac9cc53c65c243a366e8304d1234efa70d101266e93e550a90b55 SHA512 1edb20aec9ffcbebddf2504e2ab6cd3c7e8f6b3f9c2af24da682bb4f8d9699686aeaf1a425e4f899a4cb431ae9757e70f3e20cda342d275828a5b96fcbdb5f7b WHIRLPOOL 0ace4797a094b226a42593e427d92205a166b5ef75ad6a69f3f6c0fc00094f8709d84b47d7498da9de8ff8049ec48bd7a8734d79079a3c1db575a9f78d9bec8b
 DIST freerdp-1.1.0_pre20121004.tar.gz 3963300 SHA256 5c52d622dd87ac7573e43e6174eabb8d5bb1a640f4bdffbe142952316ebacfe8 SHA512 3229f7480e195af425c95aa79429e248f667b33154a9bc8cf35174a107a104b2d21c1eb4cd46e0401bf3286232bafcaa9a9e58cdb6d31b7b84818ceb9e322e4d WHIRLPOOL 201d6a84be0e2b6098ccd660ce02d0afab4d8b143a8af9637a17fea14228bd566d3902b8cf7a5f6fc5911c120cd4d1473f558438631273122c8c9b42d81d7958
 EBUILD freerdp-1.0.1_p20120318.ebuild 2001 SHA256 1a416be3cedcbe52f5af32366d1a402d1742404c7297b4964a1df36943a1a1e7 SHA512 dd7178924ae1ec083a8179a3ce9e84d73d3530b3f26d0c65840df4efea4e4ccdac148c3cdbba916d9e5342ff2358e87c751b6d60b15a065c8f6e1748c84b2550 WHIRLPOOL 4cdb8f3d82573138e8d60b2f533266d1d9caf5d5518d15428b9c4c484a9772a1f326fda9d474a37327c39522fa3c295395ef9ed729685945d085fc39024447da
 EBUILD freerdp-1.0.1_p20120726.ebuild 2001 SHA256 c36da95597e62e4fc34982ee962bc7a02cdbea8faef55c9cf2a6429a32020def SHA512 021862f1ad73eb6d0a793268f70e096c1cc75a892003dd76da34dfe209ae4d8febea8a7a706ad5716e2bb74fc21646e086575e4e6291dc68dab547f17c69066b WHIRLPOOL e7bb8c53848c35425c37468575a05fd549ab8880b5c92df6e00079fea1ccb92c15f36968601aba1580eff47018d12d60f4752f4c146e4e141e59f1c242039842
+EBUILD freerdp-1.1.0_pre20121004-r1.ebuild 2447 SHA256 32fd3aa8ac982b36ba7b7a3db5992ea8d9adb8dc6152bcf96b1c0a05ddb3b478 SHA512 b4580ee528b58525d9d666759d767f16cf08f94fc342faf68919ac9a4e249f6f31c147ed8f75abb16e39ecf1a4d690814b591b333760e53813d3d23251f7df99 WHIRLPOOL 9bb01e0300139d5b4ecbdbc8b62388d291e1f49ba58dc2dc71e8fef9bc8a8ccdf9ea97015084cab1ad81bb9a919108075d1d1fe3c2d36c06a221ad8483c07249
 EBUILD freerdp-1.1.0_pre20121004.ebuild 2402 SHA256 6be3c4f90f82f6fc84c5912484930230d6caea39c28eaac1257c12de3a5ffecb SHA512 6b957c30b581ba29d5006f46b40003841751b7514d80902d6a6f26df8517f23c4a059231c1e179867c5a2ddf0040409a0d64203ec787e4609e9e670c2382f08b WHIRLPOOL 694260b133227168a663319f56c4315598772ed2b27bc1d1d03d8b95fa44f32c28a7c62c9efba75a310a966ec04cd7e99074e933b862d6ec0fe7e7b0835b662f
 EBUILD freerdp-9999.1.ebuild 2392 SHA256 cd3a0320eceaa35a5f30438246cf120aefffec8b7ebebfb5aa478e5104a9b7b8 SHA512 4bd409b9f04990ea69bf09e829d18a01f14795cd0218bb265dfd5120fe17562eb72d89c7e6a302659ce5095fe9fc3e054d1a33e77a59fb30904f987b11558ea4 WHIRLPOOL d3808270df0c041b56c9fedcab53f2bf2f2114cf1d0015b31d834848c88f6c25fcf10ee88e7d8210b4b33dfc30884a7cb491691db30b36d444b68bfd18802525
-MISC ChangeLog 5509 SHA256 3f4cfdfcd5fc0408ad921b02fa1d4f10eb1d35fbe08318c1f9d9bb3570cd345e SHA512 0a1b88106d0ea28daa036652d68d59d7748af2e6989f50cccb47f8daa5da8c7f48071476cb38b5eff9654873cc45cd9b0409e4efcc7c76054751b2ea92d6f324 WHIRLPOOL cfac0d55a63ec46f76b70379e9516dceb026a85e49750633dc846502d124b6d2f7ce9b39c393b0289aa09b16737759dcc237c51927435b9ddea83f937741461a
+MISC ChangeLog 5751 SHA256 af1337404ab0dea09dc47a9f245b226f09463ba8330826dc3a476d9713276bcc SHA512 77bd314b8ac5cd2766345382adcdb54e8b752d8b5f4a0befde4a5ffb1c9010e102a2c2b90156679ecc082949d4da9fe5ea89a543d2d64a7ae68cb070f9df052e WHIRLPOOL 42076b3040721856cd230142cf73559c753fe3c768b5d13799321f7d387315a4dde859f4eb4acfc64da51453a9911752dcf2f9cab569f5c48110984ad77923ba
 MISC metadata.xml 359 SHA256 b52c548a3451269daf80f116cea37f2321a2c1f75bceef4d65c2a513dcebd09a SHA512 a649419b037d0ddd89c8021c055997c3d704fd9f3b8a13b22f69309ca3b168ee1ef19a02333888c3901fa1d363bede3e301670cc8d7c5ac88a22f2d9756de08e WHIRLPOOL f8bb8fb15c7a65811b622f6669b85742f0d57b45bd4b91ce1b576e9edb6f1d0c7809dfb6423e40826ac29fd0c36fd3b546860334145a4ba9da0026e2bbca59ae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlBwzU8ACgkQC77qH+pIQ6RhzgEAvQI1fgiZfoFbBQrxfUL6c8aq
-3I89xGncZOwJBAydGzwBAJeJxMhlBowdsA9iffWmjjAW0YDSLh5IiLQP8h5qLMqf
-=mdu7
+iF4EAREIAAYFAlB27N0ACgkQC77qH+pIQ6QGnQD/YR7DfHphanaCkdXpT8pL9+jj
+crOpnL5WLGTvW+Izh6wA/0lYX0WGo2o4vlCeBhY3lYVBjAiF8DN23c6S1i8FaFch
+=lR0b
 -----END PGP SIGNATURE-----
diff --git a/net-misc/freerdp/files/freerdp-1.1.0_pre20121004-argb.patch b/net-misc/freerdp/files/freerdp-1.1.0_pre20121004-argb.patch
new file mode 100644
index 000000000000..81449d3c3952
--- /dev/null
+++ b/net-misc/freerdp/files/freerdp-1.1.0_pre20121004-argb.patch
@@ -0,0 +1,61 @@
+https://bugs.gentoo.org/show_bug.cgi?id=437918
+https://github.com/FreeRDP/Remmina/issues/111
+
+commit 8b70615b30f4a3b5c20df20dbadf7a8199e2e54a
+Author: Jean-Louis Dupond <jean-louis@dupond.be>
+Date:   Thu Oct 11 00:07:56 2012 +0200
+
+    libfreerdp-codec: return ARGB32/ABGR32 for dstBpp 32 with alpha
+
+diff --git a/libfreerdp/codec/color.c b/libfreerdp/codec/color.c
+index 42aa4e5..cf65680 100644
+--- a/libfreerdp/codec/color.c
++++ b/libfreerdp/codec/color.c
+@@ -426,7 +426,14 @@ BYTE* freerdp_image_convert_8bpp(BYTE* srcData, BYTE* dstData, int width, int he
+ 			red = clrconv->palette->entries[pixel].red;
+ 			green = clrconv->palette->entries[pixel].green;
+ 			blue = clrconv->palette->entries[pixel].blue;
+-			pixel = (clrconv->invert) ? RGB32(red, green, blue) : BGR32(red, green, blue);
++			if (clrconv->alpha)
++			{
++				pixel = (clrconv->invert) ? ARGB32(0xFF, red, green, blue) : ABGR32(0xFF, red, green, blue);
++			}
++			else
++			{
++				pixel = (clrconv->invert) ? RGB32(red, green, blue) : BGR32(red, green, blue);
++			}
+ 			*dst32 = pixel;
+ 			dst32++;
+ 		}
+@@ -468,7 +475,14 @@ BYTE* freerdp_image_convert_15bpp(BYTE* srcData, BYTE* dstData, int width, int h
+ 			pixel = *src16;
+ 			src16++;
+ 			GetBGR15(red, green, blue, pixel);
+-			pixel = (clrconv->invert) ? RGB32(red, green, blue) : BGR32(red, green, blue);
++			if (clrconv->alpha)
++			{
++				pixel = (clrconv->invert) ? ARGB32(0xFF, red, green, blue) : ABGR32(0xFF, red, green, blue);
++			}
++			else
++			{
++				pixel = (clrconv->invert) ? RGB32(red, green, blue) : BGR32(red, green, blue);
++			}
+ 			*dst32 = pixel;
+ 			dst32++;
+ 		}
+@@ -582,7 +596,14 @@ BYTE* freerdp_image_convert_16bpp(BYTE* srcData, BYTE* dstData, int width, int h
+ 			pixel = *src16;
+ 			src16++;
+ 			GetBGR16(red, green, blue, pixel);
+-			pixel = (clrconv->invert) ? RGB32(red, green, blue) : BGR32(red, green, blue);
++			if (clrconv->alpha)
++			{
++				pixel = (clrconv->invert) ? ARGB32(0xFF, red, green, blue) : ABGR32(0xFF, red, green, blue);
++			}
++			else
++			{
++				pixel = (clrconv->invert) ? RGB32(red, green, blue) : BGR32(red, green, blue);
++			}
+ 			*dst32 = pixel;
+ 			dst32++;
+ 		}
diff --git a/net-misc/freerdp/freerdp-1.1.0_pre20121004-r1.ebuild b/net-misc/freerdp/freerdp-1.1.0_pre20121004-r1.ebuild
new file mode 100644
index 000000000000..0724c446a427
--- /dev/null
+++ b/net-misc/freerdp/freerdp-1.1.0_pre20121004-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-1.1.0_pre20121004-r1.ebuild,v 1.1 2012/10/11 15:59:24 floppym Exp $
+
+EAPI="4"
+
+inherit cmake-utils
+
+if [[ ${PV} != 9999* ]]; then
+	SRC_URI="mirror://github/FreeRDP/FreeRDP/${P}.tar.gz
+		mirror://gentoo/${P}.tar.gz
+		http://dev.gentoo.org/~floppym/distfiles/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+else
+	inherit git-2
+	SRC_URI=""
+	EGIT_REPO_URI="git://github.com/FreeRDP/FreeRDP.git
+		https://github.com/FreeRDP/FreeRDP.git"
+	KEYWORDS=""
+fi
+
+DESCRIPTION="Free implementation of the Remote Desktop Protocol"
+HOMEPAGE="http://www.freerdp.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="alsa +channels +client cups debug directfb doc ffmpeg gstreamer jpeg
+	pulseaudio smartcard sse2 test X xinerama xv"
+
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/openssl
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	client? (
+		directfb? ( dev-libs/DirectFB )
+		X? (
+			x11-libs/libXcursor
+			x11-libs/libXext
+			xinerama? ( x11-libs/libXinerama )
+			xv? ( x11-libs/libXv )
+		)
+	)
+	ffmpeg? ( virtual/ffmpeg )
+	gstreamer? (
+		media-libs/gstreamer
+		media-libs/gst-plugins-base
+		x11-libs/libXrandr
+	)
+	jpeg? ( virtual/jpeg )
+	pulseaudio? ( media-sound/pulseaudio )
+	smartcard? ( sys-apps/pcsc-lite )
+	X? (
+		x11-libs/libX11
+		x11-libs/libxkbfile
+	)
+"
+DEPEND="${RDEPEND}
+	client? ( X? ( doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/xmlto
+	) ) )
+	test? ( dev-util/cunit )
+"
+
+DOCS=( README )
+PATCHES=( "${FILESDIR}/${P}-argb.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with alsa ALSA)
+		$(cmake-utils_use_with channels CHANNELS)
+		$(cmake-utils_use_with client CLIENT)
+		$(cmake-utils_use_with cups CUPS)
+		$(cmake-utils_use_with debug DEBUG_ALL)
+		$(cmake-utils_use_with doc MANPAGES)
+		$(cmake-utils_use_with directfb DIRECTFB)
+		$(cmake-utils_use_with ffmpeg FFMPEG)
+		$(cmake-utils_use_with gstreamer GSTREAMER)
+		$(cmake-utils_use_with jpeg JPEG)
+		$(cmake-utils_use_with pulseaudio PULSEAUDIO)
+		$(cmake-utils_use_with smartcard PCSC)
+		$(cmake-utils_use_with sse2 SSE2)
+		$(cmake-utils_use_with test CUNIT)
+		$(cmake-utils_use_with X X11)
+		$(cmake-utils_use_with X XCURSOR)
+		$(cmake-utils_use_with X XEXT)
+		$(cmake-utils_use_with X XKBFILE)
+		$(cmake-utils_use_with xinerama XINERAMA)
+		$(cmake-utils_use_with xv XV)
+	)
+	cmake-utils_src_configure
+}