Fix build with USE=debug, bug 437864 by Ben Kohler.

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

4 files changed, 166 insertions, 8 deletions

diff --git a/net-misc/freerdp/ChangeLog b/net-misc/freerdp/ChangeLog
index 8ba6d5e8876f..1172746a88a7 100644
--- a/net-misc/freerdp/ChangeLog
+++ b/net-misc/freerdp/ChangeLog
@@ -1,6 +1,11 @@
 # 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.36 2012/10/11 15:59:24 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/ChangeLog,v 1.37 2012/10/11 19:00:46 floppym Exp $
+
+  11 Oct 2012; Mike Gilbert <floppym@gentoo.org>
+  +files/freerdp-1.1.0_pre20121004-debug.patch,
+  freerdp-1.1.0_pre20121004-r1.ebuild:
+  Fix build with USE=debug, bug 437864 by Ben Kohler.
 
 *freerdp-1.1.0_pre20121004-r1 (11 Oct 2012)
 
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 36f2917c7f79..b74e0a76b74d 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -2,20 +2,21 @@
 Hash: SHA256
 
 AUX freerdp-1.1.0_pre20121004-argb.patch 2137 SHA256 0ba7ceac3c12c8d34fdf0d14a8ed6e4ab24b85d8cc70060cc83d332b02bba879 SHA512 83b9c9f0c2cb55e041db53d9078d462c547175add27bb0a95db61678efdb910f636adc292d25e3428cfbb3c8674da415fb1c499ce9da65084922f7d5d03f410d WHIRLPOOL d2d4fe44aba7d3a52e1dac7d56a1768dd48a8d7b17e5f64ee9edf0f297deee026d2f2381ec938c6fa5778a408b5d554560ae340a8f54080e192b78b51fbde39f
+AUX freerdp-1.1.0_pre20121004-debug.patch 5555 SHA256 7be20e1ed8a438328708f71fa05cc400220cbfb679d98d9e69647fd66a2d0d26 SHA512 657f0f8c821f929da5ec663f75a8c1bad5fc903c57943ea01afe35e588ec0d6759799bd0418ef39c18a07cc4e3d2b9c3135e385b5356a68ea2654438a3b4fe15 WHIRLPOOL 5dca2ed08390773c481b15b2acb7e1fe330c5c860663bd93183cc7092b2d67bcc89311784f83a28fabd32d10e18f4046502bc866acef41559025c906d4f9a089
 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-r1.ebuild 2480 SHA256 2b93d42346719597a6e26cd33829fb0479b2a9f7230a4a806dfc1576b649931d SHA512 e7ee7d026feaeb3a8ecc79588fcfa0a7d84b09d99995eb44b1346cab7274cc858b9db580b5ad4d1e2c65393484c5de331eb318de23a0a3668a713560c88e91fc WHIRLPOOL 0c3792a3a4daa013f97b3e725a2aa9f0b9aa3afa5793bf03328fe06e453aa8bf79bf7237e5a075f217e2e7bd7698ac57dd71391344ebd577920738aa216d77fe
 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 5751 SHA256 af1337404ab0dea09dc47a9f245b226f09463ba8330826dc3a476d9713276bcc SHA512 77bd314b8ac5cd2766345382adcdb54e8b752d8b5f4a0befde4a5ffb1c9010e102a2c2b90156679ecc082949d4da9fe5ea89a543d2d64a7ae68cb070f9df052e WHIRLPOOL 42076b3040721856cd230142cf73559c753fe3c768b5d13799321f7d387315a4dde859f4eb4acfc64da51453a9911752dcf2f9cab569f5c48110984ad77923ba
+MISC ChangeLog 5942 SHA256 6f46ce3417b6697591fd4f7b2637706166f284b566db3eb9e34f652d656fcb9e SHA512 b61806ccbc93861229c44283e7cdadcb99db512bdb8f8db61e660eada87bba069112833ca2c0f18bee2cd5b9b490715d06529825e41a1297481995f6a3253ebd WHIRLPOOL 4ed43afa433a9ef39fb6bd089e16c5092ca8918b7cdf4fc71e35c0079108f9b41a965cc09b5160d7240d883226d2573b9e5f8b94f914fee901ae6647c0ce318c
 MISC metadata.xml 359 SHA256 b52c548a3451269daf80f116cea37f2321a2c1f75bceef4d65c2a513dcebd09a SHA512 a649419b037d0ddd89c8021c055997c3d704fd9f3b8a13b22f69309ca3b168ee1ef19a02333888c3901fa1d363bede3e301670cc8d7c5ac88a22f2d9756de08e WHIRLPOOL f8bb8fb15c7a65811b622f6669b85742f0d57b45bd4b91ce1b576e9edb6f1d0c7809dfb6423e40826ac29fd0c36fd3b546860334145a4ba9da0026e2bbca59ae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlB27N0ACgkQC77qH+pIQ6QGnQD/YR7DfHphanaCkdXpT8pL9+jj
-crOpnL5WLGTvW+Izh6wA/0lYX0WGo2o4vlCeBhY3lYVBjAiF8DN23c6S1i8FaFch
-=lR0b
+iF4EAREIAAYFAlB3F18ACgkQC77qH+pIQ6S1XQD+Pv7k4NGjE5pl90aLdR3Z4/0F
+S8D9u9DH5iOlkHXfjusA/3rvhdqLk/DpKrEvlSHVjgQVl5qNZSGR2c9FM35zvCH1
+=Ueut
 -----END PGP SIGNATURE-----
diff --git a/net-misc/freerdp/files/freerdp-1.1.0_pre20121004-debug.patch b/net-misc/freerdp/files/freerdp-1.1.0_pre20121004-debug.patch
new file mode 100644
index 000000000000..23f3771ea5be
--- /dev/null
+++ b/net-misc/freerdp/files/freerdp-1.1.0_pre20121004-debug.patch
@@ -0,0 +1,149 @@
+https://bugs.gentoo.org/show_bug.cgi?id=437864
+
+commit 11d99595b2cc74ed4fe596eeda9fa4d40a828e02
+Author: Marc-André Moreau <marcandre.moreau@gmail.com>
+Date:   Tue Oct 9 14:52:07 2012 -0400
+
+    debug: fix debug output build
+
+diff --git a/channels/tsmf/client/gstreamer/tsmf_gstreamer.c b/channels/tsmf/client/gstreamer/tsmf_gstreamer.c
+index 64c0f82..5d67cfd 100644
+--- a/channels/tsmf/client/gstreamer/tsmf_gstreamer.c
++++ b/channels/tsmf/client/gstreamer/tsmf_gstreamer.c
+@@ -46,8 +46,12 @@
+ #include "tsmf_constants.h"
+ #include "tsmf_decoder.h"
+ 
+-#define SHARED_MEM_KEY 7777
+-#define TRY_DECODEBIN 0
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++
++#define SHARED_MEM_KEY	7777
++#define TRY_DECODEBIN	0
+ 
+ typedef struct _TSMFGstreamerDecoder
+ {
+@@ -80,10 +84,10 @@ typedef struct _TSMFGstreamerDecoder
+ 	Window subwin;
+ 	int xOffset;
+ 	int yOffset;
+-	bool offsetObtained;
++	BOOL offsetObtained;
+ 	int linked;
+ 	double gstVolume;
+-	bool gstMuted;
++	BOOL gstMuted;
+ 
+ 	int pipeline_start_time_valid; /* We've set the start time and have not reset the pipeline */
+ 	int shutdown; /* The decoder stream is shutting down */
+@@ -685,7 +689,7 @@ static void tsmf_gstreamer_pipeline_send_end_of_stream(TSMFGstreamerDecoder * md
+ /* code from TI to check whether OMX is being lock or not */
+ static BOOL tsmf_gstreamer_pipeline_omx_available()
+ {
+-	bool ret = TRUE;
++	BOOL ret = TRUE;
+ 	int shm_fd = 0;
+ 	struct shm_info
+ 	{
+@@ -788,7 +792,7 @@ static BOOL tsmf_gstreamer_pipeline_build(TSMFGstreamerDecoder * mdecoder)
+ 		return FALSE;
+ 	}
+ 
+-	bool OMXavailable = FALSE;
++	BOOL OMXavailable = FALSE;
+ 
+ #ifdef __arm__
+ 	OMXavailable = tsmf_gstreamer_pipeline_omx_available();
+@@ -800,8 +804,8 @@ static BOOL tsmf_gstreamer_pipeline_build(TSMFGstreamerDecoder * mdecoder)
+ 	const char *blank = ""; 
+ 	printf("%s", blank);
+ 
+-	bool hwaccelflu = FALSE;
+-	bool hwaccelomx = FALSE;
++	BOOL hwaccelflu = FALSE;
++	BOOL hwaccelomx = FALSE;
+ 
+ 	switch (mdecoder->tsmf_media_type.SubType)
+ 	{
+@@ -1100,14 +1104,16 @@ static BOOL tsmf_gstreamer_pipeline_build(TSMFGstreamerDecoder * mdecoder)
+ static BOOL tsmf_gstreamer_decodeEx(ITSMFDecoder * decoder, const BYTE * data, UINT32 data_size, UINT32 extensions,
+         			UINT64 start_time, UINT64 end_time, UINT64 duration)
+ {
+-	TSMFGstreamerDecoder * mdecoder = (TSMFGstreamerDecoder *) decoder;
++	TSMFGstreamerDecoder * mdecoder = (TSMFGstreamerDecoder*) decoder;
++
+ 	if (!mdecoder)
+ 	{
+ 		return FALSE;
+ 	}
+ 
+ 	int mutexret = pthread_mutex_lock(&mdecoder->gst_mutex);
+-	if(mutexret != 0)
++
++	if (mutexret != 0)
+ 		return FALSE;
+ 
+ 	if (mdecoder->shutdown)
+@@ -1126,9 +1132,15 @@ static BOOL tsmf_gstreamer_decodeEx(ITSMFDecoder * decoder, const BYTE * data, U
+          */
+ 
+ 	if (mdecoder->media_type == TSMF_MAJOR_TYPE_VIDEO)
+-		DEBUG_DVC("tsmf_gstreamer_decodeEx_VIDEO. Start:(%llu) End:(%llu) Duration:(%llu) Last End:(%llu)", start_time, end_time, duration, mdecoder->last_sample_end_time);
++	{
++		DEBUG_DVC("tsmf_gstreamer_decodeEx_VIDEO. Start:(%llu) End:(%llu) Duration:(%llu) Last End:(%llu)",
++				start_time, end_time, duration, mdecoder->last_sample_end_time);
++	}
+ 	else
+-		DEBUG_DVC("tsmf_gstreamer_decodeEX_AUDIO. Start:(%llu) End:(%llu) Duration:(%llu) Last End:(%llu)", start_time, end_time, duration, mdecoder->last_sample_end_time);
++	{
++		DEBUG_DVC("tsmf_gstreamer_decodeEX_AUDIO. Start:(%llu) End:(%llu) Duration:(%llu) Last End:(%llu)",
++				start_time, end_time, duration, mdecoder->last_sample_end_time);
++	}
+ 
+ 	if (mdecoder->gst_caps == NULL) 
+ 	{
+@@ -1322,7 +1334,7 @@ static void tsmf_gstreamer_change_volume(ITSMFDecoder * decoder, UINT32 newVolum
+ 	if (!G_IS_OBJECT(mdecoder->aVolume))
+ 		return;
+ 
+-	mdecoder->gstMuted = (bool) muted;
++	mdecoder->gstMuted = (BOOL) muted;
+ 	DEBUG_DVC("tsmf_gstreamer_change_volume: mute=[%d]", mdecoder->gstMuted);
+ 	g_object_set(mdecoder->aVolume, "mute", mdecoder->gstMuted, NULL);
+ 	mdecoder->gstVolume = (double) newVolume / (double) 10000;
+diff --git a/libfreerdp/core/certificate.c b/libfreerdp/core/certificate.c
+index 5f65790..d13ce7d 100644
+--- a/libfreerdp/core/certificate.c
++++ b/libfreerdp/core/certificate.c
+@@ -437,14 +437,14 @@ BOOL certificate_read_server_x509_certificate_chain(rdpCertificate* certificate,
+ 			rdpCertInfo cert_info;
+ 			DEBUG_CERTIFICATE("License Server Certificate");
+ 			certificate_read_x509_certificate(&certificate->x509_cert_chain->array[i], &cert_info);
+-			DEBUG_LICENSE("modulus length:%d", cert_info.ModulusLength);
++			DEBUG_LICENSE("modulus length:%d", (int) cert_info.ModulusLength);
+ 			free(cert_info.Modulus);
+ 		}
+ 		else if (numCertBlobs - i == 1)
+ 		{
+ 			DEBUG_CERTIFICATE("Terminal Server Certificate");
+ 			certificate_read_x509_certificate(&certificate->x509_cert_chain->array[i], &certificate->cert_info);
+-			DEBUG_CERTIFICATE("modulus length:%d", certificate->cert_info.modulus.length);
++			DEBUG_CERTIFICATE("modulus length:%d", (int) certificate->cert_info.ModulusLength);
+ 		}
+ 	}
+ 
+diff --git a/libfreerdp/core/redirection.c b/libfreerdp/core/redirection.c
+index 46f982a..dcf2d52 100644
+--- a/libfreerdp/core/redirection.c
++++ b/libfreerdp/core/redirection.c
+@@ -89,7 +89,7 @@ BOOL rdp_recv_server_redirection_pdu(rdpRdp* rdp, STREAM* s)
+ 		stream_read(s, redirection->LoadBalanceInfo, redirection->LoadBalanceInfoLength);
+ #ifdef WITH_DEBUG_REDIR
+ 		DEBUG_REDIR("loadBalanceInfo:");
+-		freerdp_hexdump(redirection->loadBalanceInfo.data, redirection->loadBalanceInfo.length);
++		freerdp_hexdump(redirection->LoadBalanceInfo, redirection->LoadBalanceInfoLength);
+ #endif
+ 	}
+ 
diff --git a/net-misc/freerdp/freerdp-1.1.0_pre20121004-r1.ebuild b/net-misc/freerdp/freerdp-1.1.0_pre20121004-r1.ebuild
index 0724c446a427..2010d7f3517a 100644
--- a/net-misc/freerdp/freerdp-1.1.0_pre20121004-r1.ebuild
+++ b/net-misc/freerdp/freerdp-1.1.0_pre20121004-r1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-1.1.0_pre20121004-r1.ebuild,v 1.2 2012/10/11 19:00:46 floppym Exp $
 
 EAPI="4"
 
@@ -66,7 +66,10 @@ DEPEND="${RDEPEND}
 "
 
 DOCS=( README )
-PATCHES=( "${FILESDIR}/${P}-argb.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-argb.patch"
+	"${FILESDIR}/${P}-debug.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(