[109325] trunk/dports/net/FreeRDP

[Jeremy Huddleston Sequoia]

I just noticed that buildports-mtln-x86_64 failed cleanup after building this.

https://build.macports.org/builders/buildports-mtln-x86_64/builds/7018/steps/cleanup/logs/stdio

I'm guessing that version number is the culprit.

On Aug 12, 2013, at 23:10, devans at macports.org wrote:

> Revision
> 109325
> Author
> devans at macports.org
> Date
> 2013-08-12 23:10:32 -0700 (Mon, 12 Aug 2013)
> Log Message
> 
> FreeRDP: enable optional ffmpeg support, patch to build with latest ffmpeg-devel.
> Modified Paths
> 
> 	• trunk/dports/net/FreeRDP/Portfile
> Added Paths
> 
> 	• trunk/dports/net/FreeRDP/files/patch-ffmpeg-2.0.diff
> Diff
> 
> Modified: trunk/dports/net/FreeRDP/Portfile (109324 => 109325)
> 
> --- trunk/dports/net/FreeRDP/Portfile	2013-08-13 05:52:15 UTC (rev 109324)
> +++ trunk/dports/net/FreeRDP/Portfile	2013-08-13 06:10:32 UTC (rev 109325)
> 
> @@ -5,7 +5,7 @@
> 
>  PortGroup   cmake   1.0
> 
>  
> 
>  github.setup        FreeRDP FreeRDP 1.1.0-beta+2013071101
> 
> -revision            1
> 
> +revision            2
> 
>  categories          net
> 
>  platforms           darwin
> 
>  license             Apache
> 
> @@ -31,6 +31,10 @@
> 
>                          port:zlib \
> 
>                          port:openssl
> 
>  
> 
> -configure.args-append   "-DWITH_X11=ON"
> 
> +# optional ffmpeg support is disabled by default
> 
>  
> 
> -patchfiles          patch-client_mac_mrdview.diff
> 
> +configure.args-append   "-DWITH_X11=ON" \
> +			"-DWITH_FFMPEG=ON"
> +
> +patchfiles          patch-client_mac_mrdview.diff \
> +		    patch-ffmpeg-2.0.diff
> 
> Added: trunk/dports/net/FreeRDP/files/patch-ffmpeg-2.0.diff (0 => 109325)
> 
> --- trunk/dports/net/FreeRDP/files/patch-ffmpeg-2.0.diff	                        (rev 0)
> +++ trunk/dports/net/FreeRDP/files/patch-ffmpeg-2.0.diff	2013-08-13 06:10:32 UTC (rev 109325)
> 
> @@ -0,0 +1,36 @@
> 
> +--- channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c.orig	2013-07-10 01:00:21.000000000 -0700
> ++++ channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c	2013-08-12 22:26:28.000000000 -0700
> +@@ -43,12 +43,20 @@
> + #define AVMEDIA_TYPE_AUDIO 1
> + #endif
> + 
> ++#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
> ++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
> ++#endif
> ++
> + typedef struct _TSMFFFmpegDecoder
> + {
> + 	ITSMFDecoder iface;
> + 
> + 	int media_type;
> ++#if LIBAVCODEC_VERSION_MAJOR > 54
> ++	enum AVCodecID codec_id;
> ++#else
> + 	enum CodecID codec_id;
> ++#endif
> + 	AVCodecContext* codec_context;
> + 	AVCodec* codec;
> + 	AVFrame* frame;
> +@@ -99,8 +107,12 @@
> + 	mdecoder->codec_context->block_align = media_type->BlockAlign;
> + 
> + #ifdef AV_CPU_FLAG_SSE2
> ++#if LIBAVCODEC_VERSION_MAJOR < 55
> + 	mdecoder->codec_context->dsp_mask = AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2;
> + #else
> ++	av_set_cpu_flags_mask(AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2); 
> ++#endif
> ++#else
> + #if LIBAVCODEC_VERSION_MAJOR < 53
> + 	mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMXEXT;
> + #else
> 
> _______________________________________________
> macports-changes mailing list
> macports-changes at lists.macosforge.org
> https://lists.macosforge.org/mailman/listinfo/macports-changes

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 4145 bytes
Desc: not available
URL: <http://lists.macosforge.org/pipermail/macports-dev/attachments/20130813/8d404a92/attachment.p7s>