svn commit: r468743 - in head/net: freerdp freerdp/files freerdp1 freerdp1/files

[Jan Beich]

Author: jbeich
Date: Mon Apr 30 19:28:30 2018
New Revision: 468743
URL: https://svnweb.freebsd.org/changeset/ports/468743

Log:
  net/freerdp: drop bogus ffmpeg fix
  
  av_frame_free() replaced avcodec_free_frame() according to
  ffmpeg-3.0/doc/APIchanges.
  
  Obtained from:	upstream

Deleted:
  head/net/freerdp/files/patch-ffmpeg29
Modified:
  head/net/freerdp/Makefile   (contents, props changed)
  head/net/freerdp1/Makefile   (contents, props changed)
  head/net/freerdp1/files/patch-ffmpeg29   (contents, props changed)

Modified: head/net/freerdp/Makefile
==============================================================================
--- head/net/freerdp/Makefile	Mon Apr 30 19:21:56 2018	(r468742)
+++ head/net/freerdp/Makefile	Mon Apr 30 19:28:30 2018	(r468743)
@@ -3,7 +3,7 @@
 
 PORTNAME=	freerdp
 DISTVERSION=	2.0.0-rc1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net comms ipv6
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/

Modified: head/net/freerdp1/Makefile
==============================================================================
--- head/net/freerdp1/Makefile	Mon Apr 30 19:21:56 2018	(r468742)
+++ head/net/freerdp1/Makefile	Mon Apr 30 19:28:30 2018	(r468743)
@@ -3,7 +3,7 @@
 
 PORTNAME=	freerdp
 PORTVERSION=	1.2.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	net comms ipv6
 PKGNAMESUFFIX=	1
 

Modified: head/net/freerdp1/files/patch-ffmpeg29
==============================================================================
--- head/net/freerdp1/files/patch-ffmpeg29	Mon Apr 30 19:21:56 2018	(r468742)
+++ head/net/freerdp1/files/patch-ffmpeg29	Mon Apr 30 19:28:30 2018	(r468743)
@@ -1,54 +1,54 @@
-Description: Replace deprecated FFmpeg API
-Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
-Last-Update: <2015-11-02>
+https://github.com/FreeRDP/FreeRDP/commit/b7b66968f93f
 
 --- channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c.orig	2014-09-11 22:46:32 UTC
 +++ channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
-@@ -103,7 +103,7 @@ static BOOL tsmf_ffmpeg_init_video_strea
+@@ -62,6 +62,9 @@
+ #define AV_CODEC_ID_AC3 CODEC_ID_AC3
+ #endif
+ 
++#if LIBAVUTIL_VERSION_MAJOR < 52
++#define AV_PIX_FMT_YUV420P PIX_FMT_YUV420P
++#endif
+ 
+ typedef struct _TSMFFFmpegDecoder
+ {
+@@ -103,7 +106,11 @@ static BOOL tsmf_ffmpeg_init_video_stream(ITSMFDecoder
  	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();
++#if LIBAVCODEC_VERSION_MAJOR < 55
+ 	mdecoder->frame = avcodec_alloc_frame();
++#else
 +	mdecoder->frame = av_frame_alloc();
++#endif
  	return TRUE;
  }
  
-@@ -322,14 +322,14 @@ static BOOL tsmf_ffmpeg_decode_video(ITS
+@@ -322,7 +329,11 @@ static BOOL tsmf_ffmpeg_decode_video(ITSMFDecoder *dec
  									 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();
++#if LIBAVCODEC_VERSION_MAJOR < 55
+ 			frame = avcodec_alloc_frame();
++#else
 +			frame = av_frame_alloc();
++#endif
  			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 @@ static BOOL tsmf_ffmpeg_decode_audio(ITS
+@@ -385,7 +396,11 @@ static BOOL tsmf_ffmpeg_decode_audio(ITSMFDecoder *dec
  									(int16_t *) dst, &frame_size, src, src_size);
  #else
  		{
--			AVFrame *decoded_frame = avcodec_alloc_frame();
++#if LIBAVCODEC_VERSION_MAJOR < 55
+ 			AVFrame *decoded_frame = avcodec_alloc_frame();
++#else
 +			AVFrame *decoded_frame = av_frame_alloc();
++#endif
  			int got_frame = 0;
  			AVPacket pkt;
  			av_init_packet(&pkt);
-@@ -398,7 +398,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);
- 			}
--			av_free(decoded_frame);
-+			av_frame_free(&decoded_frame);
- 		}
- #endif
- 		if(len <= 0 || frame_size <= 0)
-@@ -464,7 +464,7 @@ static UINT32 tsmf_ffmpeg_get_decoded_fo
+@@ -464,7 +479,7 @@ static UINT32 tsmf_ffmpeg_get_decoded_format(ITSMFDeco
  	TSMFFFmpegDecoder *mdecoder = (TSMFFFmpegDecoder *) decoder;
  	switch(mdecoder->codec_context->pix_fmt)
  	{
@@ -57,21 +57,3 @@ Last-Update: <2015-11-02>
  			return RDP_PIXFMT_I420;
  		default:
  			CLOG_ERR("unsupported pixel format %u",
-@@ -492,7 +492,7 @@ static void tsmf_ffmpeg_free(ITSMFDecode
- {
- 	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 @@ static void tsmf_ffmpeg_free(ITSMFDecode
- 			avcodec_close(mdecoder->codec_context);
- 		if(mdecoder->codec_context->extradata)
- 			free(mdecoder->codec_context->extradata);
--		av_free(mdecoder->codec_context);
-+		av_frame_free(&mdecoder->codec_context);
- 	}
- 	free(decoder);
- }