[135595] trunk/dports/net/FreeRDP

devans at macports.org devans at macports.org
Mon Apr 27 11:12:16 PDT 2015


Revision: 135595
          https://trac.macports.org/changeset/135595
Author:   devans at macports.org
Date:     2015-04-27 11:12:16 -0700 (Mon, 27 Apr 2015)
Log Message:
-----------
FreeRDP: update to latest commit to github stable-1.1 branch, fixes cmake 3.1+ build issues, add build deps, drop outdated ffmpeg patch, add +pulseaudio variant to enable pulseaudio sound support (#45956, #47389).

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

Removed Paths:
-------------
    trunk/dports/net/FreeRDP/files/patch-ffmpeg-2.0.diff

Modified: trunk/dports/net/FreeRDP/Portfile
===================================================================
--- trunk/dports/net/FreeRDP/Portfile	2015-04-27 17:50:58 UTC (rev 135594)
+++ trunk/dports/net/FreeRDP/Portfile	2015-04-27 18:12:16 UTC (rev 135595)
@@ -5,12 +5,13 @@
 PortGroup           github  1.0
 PortGroup           cmake   1.0
 
-set version_name    1.1.0-beta
-set version_date    2013071101
-github.setup        FreeRDP FreeRDP ${version_name}+${version_date}
+set version_name    1.1.0-beta1
+# set to date, hash of latest commit to github stable-1.1 branch
+set version_date    2015031201
+set git_commit      770c67d
+github.setup        FreeRDP FreeRDP ${git_commit}
 epoch               1
 version             ${version_name}-${version_date}
-revision            7
 categories          net
 platforms           darwin
 license             Apache
@@ -21,9 +22,14 @@
 
 homepage            http://www.freerdp.com
 
-checksums           rmd160  0a08ae4452603d89a7596be2f6825f2f33fe2c9c \
-                    sha256  ead34bb077451190abc177c5fda036b74191dba02045d69b59d0b9f29e9a1b38
-    
+checksums           rmd160  d7ae573f32a0e53b467bb5e0526d52b8e94a6dfe \
+                    sha256  5e4035d314134d7afa3891c88039c278c4bc6e607e5e322e4e10c066013a6437
+
+depends_build-append \
+                    port:pkgconfig \
+                    port:libxslt \
+                    port:docbook-xsl
+
 depends_lib-append  path:lib/libavcodec.dylib:ffmpeg \
                     port:xorg-libX11 \
                     port:xorg-libXcursor \
@@ -36,7 +42,6 @@
                     port:openssl
 
 patchfiles          patch-client_mac_mrdview.diff \
-                    patch-ffmpeg-2.0.diff \
                     patch-winpr-include-winpr-platform.h.diff \
                     patch-freerdp.pc.in.diff
 
@@ -61,4 +66,12 @@
 
 configure.args-append \
                     "-DWITH_X11=ON" \
-                    "-DWITH_FFMPEG=ON"
+                    "-DWITH_FFMPEG=ON" \
+                    "-DWITH_ALSA=OFF"
+
+variant pulseaudio description {Enable pulseaudio sound support (audio input, audio output and multimedia redirection)} {
+    depends_lib-append      port:pulseaudio
+    configure.args-append   "-DWITH_PULSE=ON"
+}
+
+livecheck.type      none

Deleted: trunk/dports/net/FreeRDP/files/patch-ffmpeg-2.0.diff
===================================================================
--- trunk/dports/net/FreeRDP/files/patch-ffmpeg-2.0.diff	2015-04-27 17:50:58 UTC (rev 135594)
+++ trunk/dports/net/FreeRDP/files/patch-ffmpeg-2.0.diff	2015-04-27 18:12:16 UTC (rev 135595)
@@ -1,36 +0,0 @@
---- 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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150427/68bbd896/attachment.html>


More information about the macports-changes mailing list