<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5fe60a79d8f5c1364123b33e8dff77b8c5c7bf92">https://github.com/macports/macports-ports/commit/5fe60a79d8f5c1364123b33e8dff77b8c5c7bf92</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 5fe60a7 FreeRDP: Update to 2.0.0-rc1
</span>5fe60a7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5fe60a79d8f5c1364123b33e8dff77b8c5c7bf92
</span>Author: Koichiro IWAO <meta@vmeta.jp>
AuthorDate: Fri Feb 16 14:27:17 2018 +0900
<span style='display:block; white-space:pre;color:#404040;'> FreeRDP: Update to 2.0.0-rc1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Most of local patches no longer needed since upstream improved macOS
</span><span style='display:block; white-space:pre;color:#404040;'> compatibility. In particular, now FreeRDP support Mac native audio
</span><span style='display:block; white-space:pre;color:#404040;'> (WITH_MACAUDIO) and it is enabled by default. PulseAudio variant is
</span><span style='display:block; white-space:pre;color:#404040;'> removed from this port since it is replaced with native audio.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/55829
</span>---
net/FreeRDP/Portfile | 32 +++--------------
net/FreeRDP/files/patch-client_mac_mrdview.diff | 12 -------
net/FreeRDP/files/patch-ffmpeg-3.0.diff | 42 ----------------------
net/FreeRDP/files/patch-freerdp.pc.in.diff | 11 ------
.../patch-winpr-include-winpr-platform.h.diff | 13 -------
5 files changed, 4 insertions(+), 106 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/FreeRDP/Portfile b/net/FreeRDP/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cd7cf3d..6a319f8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/FreeRDP/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/FreeRDP/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,12 +5,8 @@ PortGroup github 1.0
</span> PortGroup cmake 1.0
epoch 2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set version_name 1.1.0-beta1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# set to date, hash of latest commit to github stable-1.1 branch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set version_date 20170727
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set git_commit 03ab68318966c3a22935a02838daaea7b7fbe96c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup FreeRDP FreeRDP ${git_commit}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version ${version_name}-${version_date}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup FreeRDP FreeRDP 2.0.0-rc1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories net
platforms darwin
license Apache
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,8 +17,8 @@ long_description FreeRDP is a free implementation of the Remote Desktop Proto
</span>
homepage http://www.freerdp.com
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 e8ce3c227d8fced268554b9c11a9edbdec95f82c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 032c37930fa955530e6fae7e9b063dc5574a26d10201f672fdff43224d49e964
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 0b787dc5ea4fb45e8efe55e04a5bc4629012c732 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 20df57a6aa39207c8bf0c913c08117408401e8848644654726fa87a022c9b96b
</span>
depends_build-append \
port:pkgconfig \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,27 +35,12 @@ depends_lib-append port:xorg-libX11 \
</span> port:zlib \
path:lib/libssl.dylib:openssl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-client_mac_mrdview.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-config.h.in.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-winpr-include-winpr-platform.h.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-freerdp.pc.in.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-ffmpeg-3.0.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
if {[string match "*gcc*" ${configure.compiler}]} {
reinplace "s:-fobjc-nonfragile-abi::" \
${worksrcpath}/client/Mac/cli/CMakeLists.txt \
${worksrcpath}/client/Mac/CMakeLists.txt
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.platform} eq "darwin" && ${os.major} == 10} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # move ${worksrcpath}/client/Mac/PasswordDialog.xib ${worksrcpath}/client/Mac/PasswordDialog.xib.old
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # move ${worksrcpath}/client/Mac/cli/en.lproj/MainMenu.xib ${worksrcpath}/client/Mac/cli/en.lproj/MainMenu.xib.old
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # move ${worksrcpath}/client/Mac/cli/MainMenu.xib ${worksrcpath}/client/Mac/cli/MainMenu.xib.old
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy -force ${filespath}/PasswordDialog.xib ${worksrcpath}/client/Mac/PasswordDialog.xib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy -force ${filespath}/en-MainMenu.xib ${worksrcpath}/client/Mac/cli/en.lproj/MainMenu.xib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy -force ${filespath}/MainMenu.xib ${worksrcpath}/client/Mac/cli/MainMenu.xib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
cmake.out_of_source yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,9 +57,4 @@ if {${os.major} > 10 || (${os.major} == 10 && ${os.minor} >= 3)} {
</span> depends_lib-append path:lib/libavcodec.dylib:ffmpeg
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant pulseaudio description {Enable pulseaudio sound support (audio input, audio output and multimedia redirection)} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:pulseaudio
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DWITH_PULSE=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> livecheck.type none
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/FreeRDP/files/patch-client_mac_mrdview.diff b/net/FreeRDP/files/patch-client_mac_mrdview.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1f98cc5..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/FreeRDP/files/patch-client_mac_mrdview.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- client/Mac/MRDPView.m.orig 2014-03-02 23:33:18.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ client/Mac/MRDPView.m 2014-03-02 23:37:14.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -68,6 +68,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Forward declarations
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ******************************************/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+int mac_receive_channel_data(freerdp* instance, int chan_id, BYTE* data, int size, int flags, int total_size);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void windows_to_apple_cords(MRDPView* view, NSRect* r);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+int register_channels_fds(freerdp* instance);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void mf_Pointer_New(rdpContext* context, rdpPointer* pointer);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void mf_Pointer_Free(rdpContext* context, rdpPointer* pointer);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/FreeRDP/files/patch-ffmpeg-3.0.diff b/net/FreeRDP/files/patch-ffmpeg-3.0.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ae764d7..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/FreeRDP/files/patch-ffmpeg-3.0.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,42 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -ur channels/tsmf/client/ffmpeg.orig/tsmf_ffmpeg.c channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- channels/tsmf/client/ffmpeg.orig/tsmf_ffmpeg.c 2016-02-21 23:33:11.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c 2016-02-21 23:35:05.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -501,7 +501,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- switch (mdecoder->codec_context->pix_fmt)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- case PIX_FMT_YUV420P:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case AV_PIX_FMT_YUV420P:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return RDP_PIXFMT_I420;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -ur channels/tsmf/client/ffmpeg.orig/tsmf_ffmpeg.c channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- channels/tsmf/client/ffmpeg.orig/tsmf_ffmpeg.c 2016-02-21 23:41:42.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c 2016-02-21 23:43:55.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -107,7 +107,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mdecoder->codec_context->time_base.den = media_type->SamplesPerSecond.Numerator;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mdecoder->codec_context->time_base.num = media_type->SamplesPerSecond.Denominator;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- mdecoder->frame = avcodec_alloc_frame();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mdecoder->frame = av_frame_alloc();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return TRUE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -342,7 +342,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mdecoder->codec_context->width, mdecoder->codec_context->height);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mdecoder->decoded_data = malloc(mdecoder->decoded_size);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ZeroMemory(mdecoder->decoded_data, mdecoder->decoded_size);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- frame = avcodec_alloc_frame();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ frame = av_frame_alloc();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- avpicture_fill((AVPicture*) frame, mdecoder->decoded_data,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mdecoder->codec_context->pix_fmt,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mdecoder->codec_context->width, mdecoder->codec_context->height);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -412,7 +412,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (int16_t*) dst, &frame_size, src, src_size);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AVFrame* decoded_frame = avcodec_alloc_frame();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AVFrame* decoded_frame = av_frame_alloc();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int got_frame = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AVPacket pkt;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- av_init_packet(&pkt);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/FreeRDP/files/patch-freerdp.pc.in.diff b/net/FreeRDP/files/patch-freerdp.pc.in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d915856..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/FreeRDP/files/patch-freerdp.pc.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- freerdp.pc.in.orig 2013-07-10 01:00:21.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ freerdp.pc.in 2014-03-02 11:52:57.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8,6 +8,6 @@ Description: A free remote desktop proto
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- URL: http://www.freerdp.com/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Version: @FREERDP_VERSION_FULL@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--Requires:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--Libs: -L${libdir} -lfreerdp-cache -lfreerdp-codec -lfreerdp-core -lfreerdp-crypto -lfreerdp-gdi -lfreerdp-locale -lfreerdp-rail -lfreerdp-utils -lwinpr-sspi -lwinpr-rpc -lwinpr-utils
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Requires: openssl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Libs: -L${libdir} -lfreerdp-cache -lfreerdp-client -lfreerdp-codec -lfreerdp-common -lfreerdp-core -lfreerdp-crypto -lfreerdp-gdi -lfreerdp-locale -lfreerdp-primitives -lfreerdp-rail -lfreerdp-utils -lwinpr-asn1 -lwinpr-bcrypt -lwinpr-credentials -lwinpr-credui -lwinpr-crt -lwinpr-crypto -lwinpr-dsparse -lwinpr-environment -lwinpr-error -lwinpr-file -lwinpr-handle -lwinpr-heap -lwinpr-input -lwinpr-interlocked -lwinpr-io -lwinpr-library -lwinpr-makecert-tool -lwinpr-path -lwinpr-pipe -l [...]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Cflags: -I${includedir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/FreeRDP/files/patch-winpr-include-winpr-platform.h.diff b/net/FreeRDP/files/patch-winpr-include-winpr-platform.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 17b4ff6..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/FreeRDP/files/patch-winpr-include-winpr-platform.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- winpr/include/winpr/platform.h.orig 2014-03-02 09:52:04.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ winpr/include/winpr/platform.h 2014-03-02 09:53:35.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -156,6 +156,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Mac OS X (__MACOSX__) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if (__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <TargetConditionals.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if (__APPLE__ && __MACH__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef __MACOSX__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define __MACOSX__ 1
</span></pre><pre style='margin:0'>
</pre>