[145942] trunk/dports/net/FreeRDP

[devans at macports.org]

Revision: 145942
          https://trac.macports.org/changeset/145942
Author:   devans at macports.org
Date:     2016-02-22 00:07:59 -0800 (Mon, 22 Feb 2016)
Log Message:
-----------
FreeRDP: patch for ffmpeg 3.0 compatibility, increment revision due to change in function usage.

Modified Paths:
--------------
    trunk/dports/net/FreeRDP/Portfile

Added Paths:
-----------
    trunk/dports/net/FreeRDP/files/patch-ffmpeg-3.0.diff

Modified: trunk/dports/net/FreeRDP/Portfile
===================================================================
--- trunk/dports/net/FreeRDP/Portfile	2016-02-22 05:59:19 UTC (rev 145941)
+++ trunk/dports/net/FreeRDP/Portfile	2016-02-22 08:07:59 UTC (rev 145942)
@@ -12,6 +12,7 @@
 github.setup        FreeRDP FreeRDP ${git_commit}
 epoch               1
 version             ${version_name}-${version_date}
+revision            1
 categories          net
 platforms           darwin
 license             Apache
@@ -43,7 +44,8 @@
 
 patchfiles          patch-client_mac_mrdview.diff \
                     patch-winpr-include-winpr-platform.h.diff \
-                    patch-freerdp.pc.in.diff
+                    patch-freerdp.pc.in.diff \
+                    patch-ffmpeg-3.0.diff
 
 post-patch {
     if {[string match "*gcc*" ${configure.compiler}]} {

Added: trunk/dports/net/FreeRDP/files/patch-ffmpeg-3.0.diff
===================================================================
--- trunk/dports/net/FreeRDP/files/patch-ffmpeg-3.0.diff	                        (rev 0)
+++ trunk/dports/net/FreeRDP/files/patch-ffmpeg-3.0.diff	2016-02-22 08:07:59 UTC (rev 145942)
@@ -0,0 +1,42 @@
+diff -ur channels/tsmf/client/ffmpeg.orig/tsmf_ffmpeg.c channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
+--- channels/tsmf/client/ffmpeg.orig/tsmf_ffmpeg.c	2016-02-21 23:33:11.000000000 -0800
++++ channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c	2016-02-21 23:35:05.000000000 -0800
+@@ -501,7 +501,7 @@
+ 
+ 	switch (mdecoder->codec_context->pix_fmt)
+ 	{
+-		case PIX_FMT_YUV420P:
++		case AV_PIX_FMT_YUV420P:
+ 			return RDP_PIXFMT_I420;
+ 
+ 		default:
+diff -ur channels/tsmf/client/ffmpeg.orig/tsmf_ffmpeg.c channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
+--- channels/tsmf/client/ffmpeg.orig/tsmf_ffmpeg.c	2016-02-21 23:41:42.000000000 -0800
++++ channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c	2016-02-21 23:43:55.000000000 -0800
+@@ -107,7 +107,7 @@
+ 	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;
+ }
+@@ -342,7 +342,7 @@
+ 			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);
+@@ -412,7 +412,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);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160222/22d89f4a/attachment.html>