ffmpeg-2.0 compatibility fix, thanks to eroen on bug 481226.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 144 insertions, 7 deletions

diff --git a/net-misc/freerdp/ChangeLog b/net-misc/freerdp/ChangeLog
index 92aedc1ed9bb..5bb184704566 100644
--- a/net-misc/freerdp/ChangeLog
+++ b/net-misc/freerdp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/freerdp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/ChangeLog,v 1.53 2013/11/11 16:32:17 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/ChangeLog,v 1.54 2013/11/26 01:58:46 floppym Exp $
+
+  26 Nov 2013; Mike Gilbert <floppym@gentoo.org>
+  +files/freerdp-1.1.0_beta1_p20130710-ffmpeg.patch,
+  freerdp-1.1.0_beta1_p20130710.ebuild:
+  ffmpeg-2.0 compatibility fix, thanks to eroen on bug 481226.
 
   11 Nov 2013; Mike Gilbert <floppym@gentoo.org>
   freerdp-1.1.0_beta1_p20130710.ebuild, freerdp-9999.1.ebuild:
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 63acd41f06c0..252afe79ba8b 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX freerdp-1.1.0_beta1-avx.patch 1424 SHA256 6de8e333ae1b7defbfcd6af1189e33e6478ca52b80c06bb013555413470d31ef SHA512 dd3d0c07d23c112f4405e3cf249137cc14fff8d2ba63e7c45740ca4c1dcd17fe258e434f3c62dad772de55aa3b59d58ac1447cef81c19c4edf843e467d7ab147 WHIRLPOOL 1877a69a89f1c69b59c4bccb5d82dc0300941cfcc8f1816bd2f88fcf0dac5d3307292c46c22e5bfac031dc4a9bcc35cea6b198dd546353480730967ca5c4fb4a
+AUX freerdp-1.1.0_beta1_p20130710-ffmpeg.patch 4241 SHA256 8dbd70eb3c7fffb617cfd27b1dc58e71d70014b2720016d3f4f022638ad65ebd SHA512 f55c1ad33d947ba26b9222fa8ce600bbb13d91b136a04526d4118e2018be016ef4ce2fac35a5563c9b4100870ec784568e9f7509e2667d1c01d5a4ce72169819 WHIRLPOOL 2fe3ffa36c9491b55b7e0113f37bb1f6a2ba91e1b08ef2083b75d3e59dbf6ffc122b485408252945996bdf0353a656929a439aafbbb3b2509fd6bf629bc4ad5d
 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.1.0-beta1.tar.gz 6502061 SHA256 c7c7dd6efdc8bbb8e6c545216391badf92776ea7d724c79aaed8f78dbc3ab94e SHA512 7a4d7bd979ba040cf379662fb314980500b51e307984318f177ac77da192f9128c2ab4c3feac4b7af34db51f6777510f8a2c76e3d84ddec5b7f3d751cb06ec81 WHIRLPOOL c461f8bd703bbaca166cc3812dd1aca0095db4bcdfd9088f71833af55dfb01173a73207d2f7c5ba97bbd6bf84567bb7aad18d819a99f3f2b0c846b9923e9bc4b
@@ -13,14 +14,14 @@ EBUILD freerdp-1.0.1_p20120318.ebuild 1932 SHA256 0877dc2fdfb0fbaf6c3b0ffa9cc9dc
 EBUILD freerdp-1.1.0_alpha20121004-r1.ebuild 2479 SHA256 7cb4d60c145973f8e281eac1cdecf1da6d34beaa7c7a62fe7617279867af6f62 SHA512 a2677f56c09fe7bdfec002ec3ae47227a790f3e52d501345667b033095bb3b77c419e85307fc7d69cae537d8d043d7b4383ef25daade22cab25b7bf1bdceb02c WHIRLPOOL 7c75d24845c758788dfb092b8baa923ba4e69cc4c98374cffff2ec63b9cbb7e31d15db0843ed43c0f3a213518d5185053245980fbbd6b0a163ffe2eafbc1aca5
 EBUILD freerdp-1.1.0_beta1.ebuild 2415 SHA256 37259e4fd331baa8cf9b4d50163f6ccb0ec7e0c05839f42ae2e226ecd58579cc SHA512 4e4a17cb2a6f3e09f8d30f2ab22ff9c08eac5bf8f655f62d185e0ac1b4cc76af76ef84553ae05ebc1fd51a8edfd0ca255671d6c9cdf00102ebe1681f57512cfc WHIRLPOOL 8890a2552d35b9cfc93b43afd2635a5c91de8fb8cc7b23860861317d18638429071db40103bbd4196f10f132bd661f9c0c1cea4c35d2a7c81c4aeb59122dd59d
 EBUILD freerdp-1.1.0_beta1_p20130605.ebuild 2520 SHA256 3985ee3d922ff50705fe0bfdbb7a18a403b630d6f749b4ce96946a944cf16694 SHA512 0ef26c90c34e895fc047f9c9b633cec75952ba7223346215c1aed1f3bd290707765eec8a85e973fdc68b0b252822a43535977bfc7220250e9ae40a8574bd12e4 WHIRLPOOL 7c672f4700c064f7e9df7374ba7876ed1c3f1a118e4b4cc5f9c407e5af418c009dd288fd0137497595fde85c074280f487903dd7f1ed4c2b6bded14c495a1df7
-EBUILD freerdp-1.1.0_beta1_p20130710.ebuild 2531 SHA256 1699642570d3bea0172336efc2f1ad14118de3706119098dcc374e8d36e56dfd SHA512 9fef8fa8c8f92289b89d9982dead8544c5f79a4c5472e0ea80c4ad69c49a04220d1f093b32664b1869b4a13fb93c1488683524d604896d659be25849749b86a8 WHIRLPOOL 35d735c0cd96ea59252d9ec3933d9f76f2b5f98f002647a1c34f895638e1f678912e8c29eea56de4f6a15a514ea7d121d93b4011b5879816ecc0ebb621317259
+EBUILD freerdp-1.1.0_beta1_p20130710.ebuild 2577 SHA256 51e13ff091a5e6994cc3b7f4dc660e041229b7ba3e80a517e6d24e47f0bb372f SHA512 129a266d60f68cb697aebd81cd3484a3ea95576ba40421a38710ba289dd21bcc54e7da3f5321abc5790590afe7e5774453c7963d7e17bba735bc8cca06b6beec WHIRLPOOL 03640663bf5ecef05e5bb5b3d9d089c51938dbc97c633a8cf534be643cbd1710f76f0014f94edd6a9e6ddcd4c193980ee192e71e7dd0d702ce5426eb1ba905ef
 EBUILD freerdp-9999.1.ebuild 2517 SHA256 7c55e63a08349a1c1bec6a50a1f185ab6e882949aee1615c79373f79755e6675 SHA512 62b5cf018cd2dd4d225edb856ae493e2fbc5d9a943f99e20e58ed0edc04437e351a89840058cfd8769e67ba6435d727be1e0fd1c6777ebd43e677ff6ea3063c0 WHIRLPOOL 506eab81ffa65ec3fcc057d3b173ab5823e22b9aa706a9c2895758f2a56a7510ecc0d1b0d16e55a3d1a481e3f1e82f32965e14d59d1fdc367f732a72d78c67d2
-MISC ChangeLog 8621 SHA256 8d9a66af837faa52a2c1464cd2944a9dce3b3a4557e4db679895b8875313f53d SHA512 c0e54033cb3aebaae52147441865f82bb61d3b100a9b74b40d04dd0bc2f926e916ecb0b2f582d51c4ff12d1ab8bf8368c1a67a76016c757465593f7d0d00b92b WHIRLPOOL 6610a2a58f0f06e6806a88c274e479c74549be966ec30dcafa3a0e3a12c270af9511b2c19d7108d037e91d6dba403bba2a43938c0e224a779d16282695fef4f7
+MISC ChangeLog 8827 SHA256 e811c2dbab9a06dfd6a36ab0a6772a81858d7c6ce9eed823ba96fe6ba5685bb0 SHA512 3cbfe11c52f5427e6ddb071928b149422dc96dd80f26df9751c553f7606ee6497bc3948cd9bc5dbc59e5859fd64727b7fd437abd0d710d2862e35a67e5098f18 WHIRLPOOL beea814d8be4c5886bbb2b2df48108cc389ab901e1d319c820355fce2a549317ad0d6f4ac3b21740cf72a95f967b04afa9e13eff07e1f585f9ce468400021497
 MISC metadata.xml 410 SHA256 a72feebca542632c8bf273df04b6e734c369d69e76bcdc4b2b7ad2896e0da3fd SHA512 1f47833a84fa53b694ae3ddc20c7bcd4fe9fca22cd51f1e670a744060ffa629cf03250b9bfde02539ed82a4bda409171b4f19bb9a10ae4ef9ebe05723dc33978 WHIRLPOOL f3a15d853f73840ef736aebc0f40a4318527260912912667869788596384fd8a840d063b817621af01b209646dc4b5b5cef37ce8bb4a9c5d8b716a1977c59056
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlKBBpIACgkQC77qH+pIQ6TFfwEAsbhWBFMddRxht6MI4AxZCAyZ
-1my64Agw/b3l+uekGKsA/1Jl4ncUZEZO28HAH2grUS92unjTdpe5bEBCrrsYht+b
-=/lmw
+iF4EAREIAAYFAlKUAFsACgkQC77qH+pIQ6QRjQEApCRNsf328n5TJiIYpjYv/CZl
+u2EHQEf9Lg3wG5TPnfQA/Alye+k70YwSlNDvnIY9FyXBTLNZjd2tjtCU4XQB7R3b
+=pplV
 -----END PGP SIGNATURE-----
diff --git a/net-misc/freerdp/files/freerdp-1.1.0_beta1_p20130710-ffmpeg.patch b/net-misc/freerdp/files/freerdp-1.1.0_beta1_p20130710-ffmpeg.patch
new file mode 100644
index 000000000000..0e08c6043080
--- /dev/null
+++ b/net-misc/freerdp/files/freerdp-1.1.0_beta1_p20130710-ffmpeg.patch
@@ -0,0 +1,127 @@
+From bf065f3e892e0a94e442de9a7155a7ac170f2add Mon Sep 17 00:00:00 2001
+From: eroen <eroen@falcon.eroen.eu>
+Date: Thu, 21 Nov 2013 11:35:53 +0100
+Subject: [PATCH 1/3] ffmpeg-2 -- AVCODEC_MAX_AUDIO_FRAME_SIZE
+
+deprecated:
+http://git.videolan.org/?p=ffmpeg.git;a=commit;h=0eea212943544d40f99b05571aa7159d78667154
+
+broken with libavcodec 54
+---
+ channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
+index adf8e04..0d5b956 100644
+--- a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
++++ b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
+@@ -43,6 +43,12 @@
+ #define AVMEDIA_TYPE_AUDIO 1
+ #endif
+ 
++#if LIBAVCODEC_VERSION_MAJOR < 54
++#define MAX_AUDIO_FRAME_SIZE AVCODEC_MAX_AUDIO_FRAME_SIZE
++#else
++#define MAX_AUDIO_FRAME_SIZE 192000
++#endif
++
+ typedef struct _TSMFFFmpegDecoder
+ {
+ 	ITSMFDecoder iface;
+@@ -351,7 +357,7 @@ static BOOL tsmf_ffmpeg_decode_audio(ITSMFDecoder* decoder, const BYTE* data, UI
+ #endif
+ 
+ 	if (mdecoder->decoded_size_max == 0)
+-		mdecoder->decoded_size_max = AVCODEC_MAX_AUDIO_FRAME_SIZE + 16;
++		mdecoder->decoded_size_max = MAX_AUDIO_FRAME_SIZE + 16;
+ 	mdecoder->decoded_data = malloc(mdecoder->decoded_size_max);
+ 	ZeroMemory(mdecoder->decoded_data, mdecoder->decoded_size_max);
+ 	/* align the memory for SSE2 needs */
+@@ -363,7 +369,7 @@ static BOOL tsmf_ffmpeg_decode_audio(ITSMFDecoder* decoder, const BYTE* data, UI
+ 	while (src_size > 0)
+ 	{
+ 		/* Ensure enough space for decoding */
+-		if (mdecoder->decoded_size_max - mdecoder->decoded_size < AVCODEC_MAX_AUDIO_FRAME_SIZE)
++		if (mdecoder->decoded_size_max - mdecoder->decoded_size < MAX_AUDIO_FRAME_SIZE)
+ 		{
+ 			mdecoder->decoded_size_max = mdecoder->decoded_size_max * 2 + 16;
+ 			mdecoder->decoded_data = realloc(mdecoder->decoded_data, mdecoder->decoded_size_max);
+-- 
+1.8.4
+
+
+From cbcf0de3fac985afaeeef7daf104c94ad8cdca26 Mon Sep 17 00:00:00 2001
+From: eroen <eroen@falcon.eroen.eu>
+Date: Thu, 21 Nov 2013 13:14:04 +0100
+Subject: [PATCH 2/3] ffmpeg-2 -- dsp_mask
+
+deprecated:
+http://git.videolan.org/?p=ffmpeg.git;a=commit;h=95510be8c35753da8f48062b28b65e7acdab965f
+
+broken with libavcodec 55
+---
+ channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
+index 0d5b956..1f99ec3 100644
+--- a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
++++ b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
+@@ -104,6 +104,7 @@ static BOOL tsmf_ffmpeg_init_audio_stream(ITSMFDecoder* decoder, const TS_AM_MED
+ 	mdecoder->codec_context->channels = media_type->Channels;
+ 	mdecoder->codec_context->block_align = media_type->BlockAlign;
+ 
++#if LIBAVCODEC_VERSION_MAJOR < 55
+ #ifdef AV_CPU_FLAG_SSE2
+ 	mdecoder->codec_context->dsp_mask = AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2;
+ #else
+@@ -113,6 +114,13 @@ static BOOL tsmf_ffmpeg_init_audio_stream(ITSMFDecoder* decoder, const TS_AM_MED
+ 	mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMX2;
+ #endif
+ #endif
++#else  /* LIBAVCODEC_VERSION_MAJOR < 55 */
++#ifdef AV_CPU_FLAG_SSE2
++	av_set_cpu_flags_mask(AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2);
++#else
++	av_set_cpu_flags_mask(FF_MM_SSE2 | FF_MM_MMX2);
++#endif
++#endif /* LIBAVCODEC_VERSION_MAJOR < 55 */
+ 
+ 	return TRUE;
+ }
+-- 
+1.8.4
+
+
+From 6fe23e1a3860528a8ecdfc8e9ccfdbd0e3945869 Mon Sep 17 00:00:00 2001
+From: eroen <eroen@falcon.eroen.eu>
+Date: Thu, 21 Nov 2013 13:26:03 +0100
+Subject: [PATCH 3/3] ffmpeg-2 -- CodecID
+
+deprecated:
+http://git.videolan.org/?p=ffmpeg.git;a=commit;h=104e10fb426f903ba9157fdbfe30292d0e4c3d72
+
+broken with libavcodec 55
+---
+ channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
+index 1f99ec3..09b4f68 100644
+--- a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
++++ b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
+@@ -54,7 +54,11 @@
+ 	ITSMFDecoder iface;
+ 
+ 	int media_type;
++#if LIBAVCODEC_VERSION_MAJOR < 55
+ 	enum CodecID codec_id;
++#else
++	enum AVCodecID codec_id;
++#endif
+ 	AVCodecContext* codec_context;
+ 	AVCodec* codec;
+ 	AVFrame* frame;
+-- 
+1.8.4
+
diff --git a/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710.ebuild b/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710.ebuild
index cca011576667..c8316c716372 100644
--- a/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710.ebuild
+++ b/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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_beta1_p20130710.ebuild,v 1.3 2013/11/11 16:32:17 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710.ebuild,v 1.4 2013/11/26 01:58:46 floppym Exp $
 
 EAPI="5"
 
@@ -74,6 +74,10 @@ DEPEND="${RDEPEND}
 
 DOCS=( README )
 
+PATCHES=(
+	"${FILESDIR}/${P}-ffmpeg.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_with alsa ALSA)