net/freerdp: Update to 2.0.0 pre-release (GitHub as of 2016.11.24)

- This update brings in the latest 2 years of FreeRDP project work,
  which has had a long time between tagging releases.
- Remove DIRECTFB option, as it no longer compiles, and gets little
  upstream maintenance
- Use NEON on aarch64, and optionally on armv6
- Mark as broken on armv6 on FreeBSD 11.0-RELEASE and early versions
  of 12.0-CURRENT
- Fix issue with X11_USE=xorg= being truncated due to whitespace as it
  wrapped over multiple lines
- Move installed *.cmake files to correct location for modules

net/freerdp1:
- create new port based on previous net/freerdp 1.2.0, as it is required
  by net/guacamole-server

net/vinagre:
- patch to work with the new version of net/freerdp 2.0.0

net/guacamole-server:
- patch to work with net/freerdp1

PR:		212004
PR:		214956
Submitted by:	Kyle Evans (maintainer)
Reported by:	John Hein <z7dr6ut7gs@snkmail.com>
Reviewed by:	Mikael Urankar <mikael.urankar@gmail.com>
Reviewed by:	Ting-Wei Lan <lantw44@gmail.com>
Reviewed by:	Antenore Gatta <antenore@simbiosi.org>
Reviewed by:	amdmi3
Approved by:	adamw (mentor)
Differential Revision:	https://reviews.freebsd.org/D8712

1 files changed, 20 insertions, 59 deletions

diff --git a/net/freerdp/files/patch-ffmpeg29 b/net/freerdp/files/patch-ffmpeg29
index 0d7e6de57ebd..653fdefcbf08 100644
--- a/net/freerdp/files/patch-ffmpeg29
+++ b/net/freerdp/files/patch-ffmpeg29
@@ -1,45 +1,15 @@
-Description: Replace deprecated FFmpeg API
-Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
-Last-Update: <2015-11-02>
-
---- channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c.orig	2016-06-11 21:12:27.134896000 +0200
-+++ channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c	2016-06-11 21:14:05.282247000 +0200
-@@ -103,7 +103,7 @@
- 	mdecoder->codec_context->bit_rate = media_type->BitRate;
- 	mdecoder->codec_context->time_base.den = media_type->SamplesPerSecond.Numerator;
- 	mdecoder->codec_context->time_base.num = media_type->SamplesPerSecond.Denominator;
--	mdecoder->frame = avcodec_alloc_frame();
-+	mdecoder->frame = av_frame_alloc();
- 	return TRUE;
- }
+--- channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c.orig	2016-10-21 07:29:51 UTC
++++ channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
+@@ -346,7 +346,7 @@ static BOOL tsmf_ffmpeg_decode_video(ITS
+ 		av_picture_copy((AVPicture*) frame, (AVPicture*) mdecoder->frame,
+ 						mdecoder->codec_context->pix_fmt,
+ 						mdecoder->codec_context->width, mdecoder->codec_context->height);
+-		av_free(frame);
++		av_frame_free(&frame);
+ 	}
  
-@@ -322,14 +322,14 @@
- 									 mdecoder->codec_context->width, mdecoder->codec_context->height);
- 			mdecoder->decoded_data = malloc(mdecoder->decoded_size);
- 			ZeroMemory(mdecoder->decoded_data, mdecoder->decoded_size);
--			frame = avcodec_alloc_frame();
-+			frame = av_frame_alloc();
- 			avpicture_fill((AVPicture *) frame, mdecoder->decoded_data,
- 						   mdecoder->codec_context->pix_fmt,
- 						   mdecoder->codec_context->width, mdecoder->codec_context->height);
- 			av_picture_copy((AVPicture *) frame, (AVPicture *) mdecoder->frame,
- 							mdecoder->codec_context->pix_fmt,
- 							mdecoder->codec_context->width, mdecoder->codec_context->height);
--			av_free(frame);
-+			av_frame_free(&frame);
- 		}
  	return ret;
- }
-@@ -385,7 +385,7 @@
- 									(int16_t *) dst, &frame_size, src, src_size);
- #else
- 		{
--			AVFrame *decoded_frame = avcodec_alloc_frame();
-+			AVFrame *decoded_frame = av_frame_alloc();
- 			int got_frame = 0;
- 			AVPacket pkt;
- 			av_init_packet(&pkt);
-@@ -398,7 +398,7 @@
+@@ -428,7 +428,7 @@ static BOOL tsmf_ffmpeg_decode_audio(ITS
  														decoded_frame->nb_samples, mdecoder->codec_context->sample_fmt, 1);
  				memcpy(dst, decoded_frame->data[0], frame_size);
  			}
@@ -47,29 +17,20 @@ Last-Update: <2015-11-02>
 +			av_frame_free(&decoded_frame);
  		}
  #endif
- 		if(len <= 0 || frame_size <= 0)
-@@ -464,7 +464,7 @@
- 	TSMFFFmpegDecoder *mdecoder = (TSMFFFmpegDecoder *) decoder;
- 	switch(mdecoder->codec_context->pix_fmt)
- 	{
--		case PIX_FMT_YUV420P:
-+		case AV_PIX_FMT_YUV420P:
- 			return RDP_PIXFMT_I420;
- 		default:
- 			CLOG_ERR("unsupported pixel format %u",
-@@ -492,7 +492,7 @@
+ 		if (len <= 0 || frame_size <= 0)
+@@ -524,7 +524,7 @@ static void tsmf_ffmpeg_free(ITSMFDecode
  {
- 	TSMFFFmpegDecoder *mdecoder = (TSMFFFmpegDecoder *) decoder;
- 	if(mdecoder->frame)
+ 	TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder;
+ 	if (mdecoder->frame)
 -		av_free(mdecoder->frame);
 +		av_frame_free(&mdecoder->frame);
- 	if(mdecoder->decoded_data)
- 		free(mdecoder->decoded_data);
- 	if(mdecoder->codec_context)
-@@ -501,7 +501,7 @@
+ 
+ 	free(mdecoder->decoded_data);
+ 
+@@ -534,7 +534,7 @@ static void tsmf_ffmpeg_free(ITSMFDecode
  			avcodec_close(mdecoder->codec_context);
- 		if(mdecoder->codec_context->extradata)
- 			free(mdecoder->codec_context->extradata);
+ 
+ 		free(mdecoder->codec_context->extradata);
 -		av_free(mdecoder->codec_context);
 +		av_frame_free(&mdecoder->codec_context);
  	}