diff options
author | woodsb02 <woodsb02@FreeBSD.org> | 2016-12-11 12:36:57 +0800 |
---|---|---|
committer | woodsb02 <woodsb02@FreeBSD.org> | 2016-12-11 12:36:57 +0800 |
commit | dac76f0fb5585dedb46f30b9d53af02a8fc41545 (patch) | |
tree | 3b8430d61957c595f3da0c8c31c214506f0917ca /net | |
parent | 09c2b17976992056875d211d9cf174c736d677f1 (diff) | |
download | freebsd-ports-gnome-dac76f0fb5585dedb46f30b9d53af02a8fc41545.tar.gz freebsd-ports-gnome-dac76f0fb5585dedb46f30b9d53af02a8fc41545.tar.zst freebsd-ports-gnome-dac76f0fb5585dedb46f30b9d53af02a8fc41545.zip |
net/freerdp: Update to 2.0.0 pre-release (GitHub as of 2016.11.24)
- This update brings in the latest 2 years of FreeRDP project work,
which has had a long time between tagging releases.
- Remove DIRECTFB option, as it no longer compiles, and gets little
upstream maintenance
- Use NEON on aarch64, and optionally on armv6
- Mark as broken on armv6 on FreeBSD 11.0-RELEASE and early versions
of 12.0-CURRENT
- Fix issue with X11_USE=xorg= being truncated due to whitespace as it
wrapped over multiple lines
- Move installed *.cmake files to correct location for modules
net/freerdp1:
- create new port based on previous net/freerdp 1.2.0, as it is required
by net/guacamole-server
net/vinagre:
- patch to work with the new version of net/freerdp 2.0.0
net/guacamole-server:
- patch to work with net/freerdp1
PR: 212004
PR: 214956
Submitted by: Kyle Evans (maintainer)
Reported by: John Hein <z7dr6ut7gs@snkmail.com>
Reviewed by: Mikael Urankar <mikael.urankar@gmail.com>
Reviewed by: Ting-Wei Lan <lantw44@gmail.com>
Reviewed by: Antenore Gatta <antenore@simbiosi.org>
Reviewed by: amdmi3
Approved by: adamw (mentor)
Differential Revision: https://reviews.freebsd.org/D8712
Diffstat (limited to 'net')
36 files changed, 1211 insertions, 359 deletions
diff --git a/net/Makefile b/net/Makefile index ccb2bbed3298..2a6b2ea8268a 100644 --- a/net/Makefile +++ b/net/Makefile @@ -146,6 +146,7 @@ SUBDIR += freeradius2 SUBDIR += freeradius3 SUBDIR += freerdp + SUBDIR += freerdp1 SUBDIR += freeswitch SUBDIR += freevrrpd SUBDIR += fspclient diff --git a/net/freerdp/Makefile b/net/freerdp/Makefile index 217ab78f9b13..ab018f51ebca 100644 --- a/net/freerdp/Makefile +++ b/net/freerdp/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= freerdp -PORTVERSION= 1.2.0 -PORTREVISION= 7 +PORTVERSION= 2.0.0.g2016.11.24 CATEGORIES= net comms ipv6 MAINTAINER= bsdports@kyle-evans.net @@ -12,71 +11,87 @@ COMMENT= Free implementation of Remote Desktop Protocol LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -USE_LDCONFIG= yes -USES= alias cmake:outsource cpe execinfo pkgconfig compiler:c++11-lib ssl USE_GITHUB= yes GH_ACCOUNT= FreeRDP GH_PROJECT= ${GH_ACCOUNT} -GH_TAGNAME= f5ff6e1 +GH_TAGNAME= 2a6dbab +USES= alias cmake:outsource compiler:c++11-lib cpe execinfo gettext localbase pathfix pkgconfig ssl +USE_LDCONFIG= yes CPE_VENDOR= freerdp_project -LDFLAGS+= -L${LOCALBASE}/lib -CFLAGS+= -I${WRKSRC}/include -I${WRKSRC}/winpr/include -I${LOCALBASE}/include +CMAKE_ARGS+= -DWITH_LIBSYSTEMD=OFF -DWITH_WAYLAND=OFF -DWITH_GSTREAMER_0_10=OFF ${CMAKE_ARGS_${ARCH}} + +CMAKE_ARGS_aarch64= -DWITH_NEON=ON +CFLAGS_aarch64= -D__ARM_NEON__=__ARM_NEON # clang -OPTIONS_DEFINE= ALSA CUPS DIRECTFB FFMPEG GSTREAMER PULSEAUDIO SSE X11 +OPTIONS_DEFINE= ALSA CUPS FFMPEG GSTREAMER PULSEAUDIO SSE X11 OPTIONS_DEFAULT= CUPS GSTREAMER X11 OPTIONS_SUB= yes +OPTIONS_DEFINE_armv6= NEON +OPTIONS_EXCLUDE_armv6= SSE + ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib -ALSA_CMAKE_ON= -DWITH_ALSA=ON -ALSA_CMAKE_OFF= -DWITH_ALSA=OFF +ALSA_CMAKE_BOOL= WITH_ALSA CUPS_LIB_DEPENDS= libcups.so:print/cups -CUPS_CMAKE_ON= -DWITH_CUPS=ON -CUPS_CMAKE_OFF= -DWITH_CUPS=OFF - -# outdated and unmaintained upstream -DIRECTFB_DESC= Build FreeRDP DirectFB client (outdated) -DIRECTFB_LIB_DEPENDS= libdirectfb.so:devel/directfb -DIRECTFB_CMAKE_ON= -DWITH_DIRECTFB=ON -DIRECTFB_CMAKE_OFF= -DWITH_DIRECTFB=OFF -# currently DirectFB option fails with clang -DIRECTFB_USE= gcc=yes +CUPS_CMAKE_BOOL= WITH_CUPS FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libavutil.so:multimedia/ffmpeg -FFMPEG_CMAKE_ON= -DWITH_FFMPEG=ON -FFMPEG_CMAKE_OFF= -DWITH_FFMPEG=OFF +FFMPEG_CMAKE_BOOL= WITH_FFMPEG -GSTREAMER_CMAKE_ON= -DWITH_GSTREAMER_1_0=ON -DWITH_GSTREAMER_0_10=OFF -GSTREAMER_CMAKE_OFF= -DWITH_GSTREAMER_1_0=OFF -DWITH_GSTREAMER_0_10=OFF -GSTREAMER_USE= gstreamer1=yes xorg=x11,xextproto,xext,xrandr +GSTREAMER_CMAKE_BOOL= WITH_GSTREAMER_1_0 +GSTREAMER_USE= gnome=glib20 gstreamer1=yes xorg=x11,xextproto,xext,xrandr +GSTREAMER_LIB_DEPENDS= libgstbase-1.0.so:multimedia/gstreamer1 + +NEON_DESC= Enable Media Processing Engine instructions +NEON_CMAKE_BOOL= WITH_NEON +.if ! ${CFLAGS:M-march*} +NEON_CFLAGS= -march=armv7-a +.endif PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio -PULSEAUDIO_CMAKE_ON= -DWITH_PULSE=ON -PULSEAUDIO_CMAKE_OFF= -DWITH_PULSE=OFF +PULSEAUDIO_CMAKE_BOOL= WITH_PULSE -SSE_CMAKE_ON= -DWITH_SSE2=ON -SSE_CMAKE_OFF= -DWITH_SSE2=OFF +SSE_CMAKE_BOOL= WITH_SSE2 X11_DESC= Build FreeRDP X11 client X11_BUILD_DEPENDS= xmlto:textproc/xmlto -X11_CMAKE_ON= -DWITH_X11=ON -X11_CMAKE_OFF= -DWITH_X11=OFF -DWITH_XKBFILE=OFF -X11_USE= xorg=x11,xkbfile,xcursor,xextproto,xv,xinerama,xext \ - xcursor,xrandr,xi,xfixes,xrender - -.include <bsd.port.options.mk> - -post-extract: - ${REINPLACE_CMD} -e 's|$${CMAKE_INSTALL_LIBDIR}/pkgconfig|libdata/pkgconfig|' \ - -e '/CMAKE_INSTALL_RPATH /d' \ +X11_CMAKE_ON= -DWITH_XKBDFILE=OFF +X11_CMAKE_BOOL= WITH_X11 +X11_USE= xorg=x11,xkbfile,xcursor,xextproto,xv,xinerama,xext,xrandr,xi,xfixes,xrender + +.include <bsd.port.pre.mk> + +.if ${OPSYS} == "FreeBSD" && ${ARCH} == "armv6" +.if ${OSVERSION} < 1100500 || \ + (${OSVERSION} >= 1100500 && ${OSVERSION} < 1100504) || \ + (${OSVERSION} >= 1200000 && ${OSVERSION} < 1200008) +BROKEN= Fails to build on ARMv6 (libm bug). See: r305380 (HEAD), r305971 (stable/11) [\#199422, \#211965] \ + Please update to a later (fixed) version. +.endif +.endif + +post-patch: + @${REINPLACE_CMD} -e '/CMAKE_INSTALL_RPATH /d' \ ${WRKSRC}/CMakeLists.txt - ${REINPLACE_CMD} -e 's|share/man/man1|man/man1|' \ + @${REINPLACE_CMD} -e 's/OPENBSD/BSD/' \ + ${WRKSRC}/winpr/CMakeLists.txt \ ${WRKSRC}/client/X11/CMakeLists.txt - ${REINPLACE_CMD} -e 's/NetBSD__)/NetBSD__) || defined(__FreeBSD__)/' \ + @${REINPLACE_CMD} -e 's/NetBSD__)/NetBSD__) || defined(__FreeBSD__)/' \ ${WRKSRC}/winpr/libwinpr/utils/trio/triodef.h - ${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' \ + @${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' \ ${WRKSRC}/channels/drive/client/statvfs.c -.include <bsd.port.mk> + @${RM} ${WRKSRC}/cmake/FindOpenSSL.cmake + @${REINPLACE_CMD} -e 's|$${CMAKE_INSTALL_LIBDIR}/cmake|$${CMAKE_INSTALL_PREFIX}/share/cmake/Modules|' \ + ${WRKSRC}/client/CMakeLists.txt \ + ${WRKSRC}/winpr/CMakeLists.txt \ + ${WRKSRC}/uwac/CMakeLists.txt \ + ${WRKSRC}/server/CMakeLists.txt \ + ${WRKSRC}/server/shadow/CMakeLists.txt \ + ${WRKSRC}/libfreerdp/CMakeLists.txt + + +.include <bsd.port.post.mk> diff --git a/net/freerdp/distinfo b/net/freerdp/distinfo index 4fbc40f7106b..557b60fa6a74 100644 --- a/net/freerdp/distinfo +++ b/net/freerdp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1470755086 -SHA256 (FreeRDP-FreeRDP-1.2.0-f5ff6e1_GH0.tar.gz) = f39c7eaa007a3aef580f364f8f5c0b9208c6c3c8f5f00a4c0ed020a81535eb32 -SIZE (FreeRDP-FreeRDP-1.2.0-f5ff6e1_GH0.tar.gz) = 6033856 +TIMESTAMP = 1480005507 +SHA256 (FreeRDP-FreeRDP-2.0.0.g2016.11.24-2a6dbab_GH0.tar.gz) = 2a8550c3b067f49353614c4dc13fff4b2c0cf7653dd765c8e44eccaf8c79f20b +SIZE (FreeRDP-FreeRDP-2.0.0.g2016.11.24-2a6dbab_GH0.tar.gz) = 6417326 diff --git a/net/freerdp/files/patch-CMakeLists.txt b/net/freerdp/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..2766465d4df8 --- /dev/null +++ b/net/freerdp/files/patch-CMakeLists.txt @@ -0,0 +1,14 @@ +--- CMakeLists.txt.orig 2016-11-24 13:19:47 UTC ++++ CMakeLists.txt +@@ -156,6 +156,11 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "BSD") + endif() + endif() + ++if(${CMAKE_SYSTEM_NAME} MATCHES "DragonFly") ++ set(BSD TRUE) ++ set(FREEBSD TRUE) ++endif() ++ + # Configure MSVC Runtime + if(MSVC) + include(MSVCRuntime) diff --git a/net/freerdp/files/patch-cmake_FindGStreamer__1__0.cmake b/net/freerdp/files/patch-cmake_FindGStreamer__1__0.cmake new file mode 100644 index 000000000000..4b2fa5aa808f --- /dev/null +++ b/net/freerdp/files/patch-cmake_FindGStreamer__1__0.cmake @@ -0,0 +1,16 @@ +Don't use custom code to find the include dirs for gstreamer 1.0 (core). +Since 1.6.0 there are multiple include paths. So use pkg-config to find +which. IMO the rest of this file should use pkg-config.... + +--- cmake/FindGStreamer_1_0.cmake.orig 2016-10-21 07:29:51 UTC ++++ cmake/FindGStreamer_1_0.cmake +@@ -78,7 +78,8 @@ endmacro() + # 1.1. Find headers and libraries + set(GLIB_ROOT_DIR ${GSTREAMER_1_0_ROOT_DIR}) + find_package(Glib REQUIRED) +-FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gstreamer-1.0) ++#FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gstreamer-1.0) ++pkg_check_modules (GSTREAMER_1_0 gstreamer-1.0) + FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_BASE gstreamer-base-1.0 gstbase-1.0) + + # 1.2. Check Gstreamer version diff --git a/net/freerdp/files/patch-ffmpeg29 b/net/freerdp/files/patch-ffmpeg29 index 0d7e6de57ebd..653fdefcbf08 100644 --- a/net/freerdp/files/patch-ffmpeg29 +++ b/net/freerdp/files/patch-ffmpeg29 @@ -1,45 +1,15 @@ -Description: Replace deprecated FFmpeg API -Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> -Last-Update: <2015-11-02> - ---- channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c.orig 2016-06-11 21:12:27.134896000 +0200 -+++ channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c 2016-06-11 21:14:05.282247000 +0200 -@@ -103,7 +103,7 @@ - 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(); -+ mdecoder->frame = av_frame_alloc(); - return TRUE; - } +--- channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c.orig 2016-10-21 07:29:51 UTC ++++ channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c +@@ -346,7 +346,7 @@ static BOOL tsmf_ffmpeg_decode_video(ITS + 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); + } -@@ -322,14 +322,14 @@ - 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); - 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 @@ - (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); -@@ -398,7 +398,7 @@ +@@ -428,7 +428,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); } @@ -47,29 +17,20 @@ Last-Update: <2015-11-02> + av_frame_free(&decoded_frame); } #endif - if(len <= 0 || frame_size <= 0) -@@ -464,7 +464,7 @@ - TSMFFFmpegDecoder *mdecoder = (TSMFFFmpegDecoder *) decoder; - switch(mdecoder->codec_context->pix_fmt) - { -- case PIX_FMT_YUV420P: -+ case AV_PIX_FMT_YUV420P: - return RDP_PIXFMT_I420; - default: - CLOG_ERR("unsupported pixel format %u", -@@ -492,7 +492,7 @@ + if (len <= 0 || frame_size <= 0) +@@ -524,7 +524,7 @@ static void tsmf_ffmpeg_free(ITSMFDecode { - TSMFFFmpegDecoder *mdecoder = (TSMFFFmpegDecoder *) decoder; - if(mdecoder->frame) + 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 @@ + + free(mdecoder->decoded_data); + +@@ -534,7 +534,7 @@ static void tsmf_ffmpeg_free(ITSMFDecode avcodec_close(mdecoder->codec_context); - if(mdecoder->codec_context->extradata) - free(mdecoder->codec_context->extradata); + + free(mdecoder->codec_context->extradata); - av_free(mdecoder->codec_context); + av_frame_free(&mdecoder->codec_context); } diff --git a/net/freerdp/files/patch-libfreerdp_freerdp.pc.in b/net/freerdp/files/patch-libfreerdp_freerdp.pc.in new file mode 100644 index 000000000000..fa13e564fd8d --- /dev/null +++ b/net/freerdp/files/patch-libfreerdp_freerdp.pc.in @@ -0,0 +1,11 @@ +--- libfreerdp/freerdp.pc.in.orig 2016-10-21 07:29:51 UTC ++++ libfreerdp/freerdp.pc.in +@@ -9,7 +9,7 @@ Description: FreeRDP: A Remote Desktop P + URL: http://www.freerdp.com/ + Version: @FREERDP_VERSION@ + Requires: +-Requires.private: @WINPR_PKG_CONFIG_FILENAME@ libssl ++Requires.private: @WINPR_PKG_CONFIG_FILENAME@ + Libs: -L${libdir} ${libs} + Libs.private: -ldl -lpthread + Cflags: -I${includedir} diff --git a/net/freerdp/files/patch-winpr_winpr.pc.in b/net/freerdp/files/patch-winpr_winpr.pc.in new file mode 100644 index 000000000000..cd1b3e770fe3 --- /dev/null +++ b/net/freerdp/files/patch-winpr_winpr.pc.in @@ -0,0 +1,10 @@ +--- winpr/winpr.pc.in.orig 2016-10-21 07:29:51 UTC ++++ winpr/winpr.pc.in +@@ -9,7 +9,6 @@ Description: WinPR: Windows Portable Run + URL: http://www.freerdp.com/ + Version: @WINPR_VERSION@ + Requires: +-Requires.private: libssl + Libs: -L${libdir} ${libs} + Libs.private: -ldl -lrt -lm -lpthread + Cflags: -I${includedir} diff --git a/net/freerdp/pkg-plist b/net/freerdp/pkg-plist index de35b4e558b3..abff061c5287 100644 --- a/net/freerdp/pkg-plist +++ b/net/freerdp/pkg-plist @@ -1,248 +1,222 @@ -%%DIRECTFB%%bin/dfreerdp +bin/winpr-hash +bin/winpr-makecert %%X11%%bin/xfreerdp -include/freerdp/addin.h -include/freerdp/altsec.h -include/freerdp/api.h -include/freerdp/assistance.h -include/freerdp/cache/bitmap.h -include/freerdp/cache/brush.h -include/freerdp/cache/cache.h -include/freerdp/cache/glyph.h -include/freerdp/cache/nine_grid.h -include/freerdp/cache/offscreen.h -include/freerdp/cache/palette.h -include/freerdp/cache/pointer.h -include/freerdp/channels/audin.h -include/freerdp/channels/channels.h -include/freerdp/channels/cliprdr.h -include/freerdp/channels/encomsp.h -include/freerdp/channels/log.h -include/freerdp/channels/rail.h -include/freerdp/channels/rdpdr.h -include/freerdp/channels/rdpgfx.h -include/freerdp/channels/rdpsnd.h -include/freerdp/channels/remdesk.h -include/freerdp/channels/tsmf.h -include/freerdp/channels/wtsvc.h -include/freerdp/client.h -include/freerdp/client/audin.h -include/freerdp/client/channels.h -include/freerdp/client/cliprdr.h -include/freerdp/client/cmdline.h -include/freerdp/client/disp.h -include/freerdp/client/drdynvc.h -include/freerdp/client/encomsp.h -include/freerdp/client/file.h -include/freerdp/client/rail.h -include/freerdp/client/rdpei.h -include/freerdp/client/rdpgfx.h -include/freerdp/client/rdpsnd.h -include/freerdp/client/remdesk.h -include/freerdp/client/tsmf.h -include/freerdp/codec/audio.h -include/freerdp/codec/bitmap.h -include/freerdp/codec/bulk.h -include/freerdp/codec/clear.h -include/freerdp/codec/color.h -include/freerdp/codec/dsp.h -include/freerdp/codec/h264.h -include/freerdp/codec/interleaved.h -include/freerdp/codec/jpeg.h -include/freerdp/codec/mppc.h -include/freerdp/codec/ncrush.h -include/freerdp/codec/nsc.h -include/freerdp/codec/planar.h -include/freerdp/codec/progressive.h -include/freerdp/codec/region.h -include/freerdp/codec/rfx.h -include/freerdp/codec/xcrush.h -include/freerdp/codec/zgfx.h -include/freerdp/codecs.h -include/freerdp/constants.h -include/freerdp/crypto/ber.h -include/freerdp/crypto/certificate.h -include/freerdp/crypto/crypto.h -include/freerdp/crypto/der.h -include/freerdp/crypto/er.h -include/freerdp/crypto/per.h -include/freerdp/crypto/tls.h -include/freerdp/dvc.h -include/freerdp/error.h -include/freerdp/event.h -include/freerdp/extension.h -include/freerdp/freerdp.h -include/freerdp/gdi/16bpp.h -include/freerdp/gdi/32bpp.h -include/freerdp/gdi/8bpp.h -include/freerdp/gdi/bitmap.h -include/freerdp/gdi/brush.h -include/freerdp/gdi/clipping.h -include/freerdp/gdi/dc.h -include/freerdp/gdi/drawing.h -include/freerdp/gdi/gdi.h -include/freerdp/gdi/line.h -include/freerdp/gdi/palette.h -include/freerdp/gdi/pen.h -include/freerdp/gdi/region.h -include/freerdp/gdi/shape.h -include/freerdp/graphics.h -include/freerdp/input.h -include/freerdp/listener.h -include/freerdp/locale/keyboard.h -include/freerdp/locale/locale.h -include/freerdp/locale/timezone.h -include/freerdp/log.h -include/freerdp/message.h -include/freerdp/metrics.h -include/freerdp/peer.h -include/freerdp/pointer.h -include/freerdp/primary.h -include/freerdp/primitives.h -include/freerdp/rail.h -include/freerdp/rail/icon.h -include/freerdp/rail/rail.h -include/freerdp/rail/window.h -include/freerdp/rail/window_list.h -include/freerdp/scancode.h -include/freerdp/secondary.h -include/freerdp/server/audin.h -include/freerdp/server/channels.h -include/freerdp/server/cliprdr.h -include/freerdp/server/drdynvc.h -include/freerdp/server/echo.h -include/freerdp/server/encomsp.h -include/freerdp/server/rdpdr.h -include/freerdp/server/rdpsnd.h -include/freerdp/server/remdesk.h -include/freerdp/server/shadow.h -include/freerdp/settings.h -include/freerdp/svc.h -include/freerdp/types.h -include/freerdp/update.h -include/freerdp/utils/debug.h -include/freerdp/utils/event.h -include/freerdp/utils/msusb.h -include/freerdp/utils/passphrase.h -include/freerdp/utils/pcap.h -include/freerdp/utils/profiler.h -include/freerdp/utils/rail.h -include/freerdp/utils/ringbuffer.h -include/freerdp/utils/signal.h -include/freerdp/utils/stopwatch.h -include/freerdp/utils/svc_plugin.h -include/freerdp/utils/tcp.h -include/freerdp/utils/time.h -include/freerdp/utils/uds.h -include/freerdp/version.h -include/freerdp/window.h -include/winpr/asn1.h -include/winpr/bcrypt.h -include/winpr/bitstream.h -include/winpr/cmdline.h -include/winpr/collections.h -include/winpr/comm.h -include/winpr/credentials.h -include/winpr/credui.h -include/winpr/crt.h -include/winpr/crypto.h -include/winpr/debug.h -include/winpr/dsparse.h -include/winpr/endian.h -include/winpr/environment.h -include/winpr/error.h -include/winpr/file.h -include/winpr/handle.h -include/winpr/heap.h -include/winpr/image.h -include/winpr/ini.h -include/winpr/input.h -include/winpr/interlocked.h -include/winpr/io.h -include/winpr/library.h -include/winpr/locale.h -include/winpr/memory.h -include/winpr/midl.h -include/winpr/ndr.h -include/winpr/nt.h -include/winpr/ntlm.h -include/winpr/path.h -include/winpr/pipe.h -include/winpr/platform.h -include/winpr/pool.h -include/winpr/print.h -include/winpr/registry.h -include/winpr/rpc.h -include/winpr/sam.h -include/winpr/schannel.h -include/winpr/security.h -include/winpr/smartcard.h -include/winpr/spec.h -include/winpr/ssl.h -include/winpr/sspi.h -include/winpr/sspicli.h -include/winpr/stream.h -include/winpr/string.h -include/winpr/synch.h -include/winpr/sysinfo.h -include/winpr/tchar.h -include/winpr/thread.h -include/winpr/timezone.h -include/winpr/tools/makecert.h -include/winpr/windows.h -include/winpr/winhttp.h -include/winpr/winpr.h -include/winpr/winsock.h -include/winpr/wlog.h -include/winpr/wnd.h -include/winpr/wtsapi.h -include/winpr/wtypes.h -lib/cmake/FreeRDP/FreeRDPConfig.cmake -lib/cmake/FreeRDP/FreeRDPConfigVersion.cmake -lib/cmake/FreeRDP/FreeRDPTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/FreeRDP/FreeRDPTargets.cmake -lib/cmake/WinPR/WinPRConfig.cmake -lib/cmake/WinPR/WinPRConfigVersion.cmake -lib/cmake/WinPR/WinPRTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/WinPR/WinPRTargets.cmake -%%ALSA%%lib/freerdp/audin-client-alsa.a -%%PULSEAUDIO%%lib/freerdp/audin-client-pulse.a -lib/freerdp/audin-client.a -lib/freerdp/cliprdr-client.a -lib/freerdp/disp-client.a -lib/freerdp/drdynvc-client.a -lib/freerdp/drive-client.a -lib/freerdp/echo-client.a -lib/freerdp/encomsp-client.a -lib/freerdp/parallel-client.a -%%CUPS%%lib/freerdp/printer-client.a -lib/freerdp/rail-client.a -lib/freerdp/rdpdr-client.a -lib/freerdp/rdpei-client.a -lib/freerdp/rdpgfx-client.a -%%ALSA%%lib/freerdp/rdpsnd-client-alsa.a -%%PULSEAUDIO%%lib/freerdp/rdpsnd-client-pulse.a -lib/freerdp/rdpsnd-client.a -lib/freerdp/remdesk-client.a -lib/freerdp/serial-client.a -lib/freerdp/smartcard-client.a -%%ALSA%%lib/freerdp/tsmf-client-alsa-audio.a -%%FFMPEG%%lib/freerdp/tsmf-client-ffmpeg-decoder.a -%%GSTREAMER%%lib/freerdp/tsmf-client-gstreamer-decoder.a -%%PULSEAUDIO%%lib/freerdp/tsmf-client-pulse-audio.a -lib/freerdp/tsmf-client.a -lib/libfreerdp.so -lib/libfreerdp.so.1.2 -lib/libfreerdp.so.1.2.0 +include/freerdp2/freerdp/addin.h +include/freerdp2/freerdp/altsec.h +include/freerdp2/freerdp/api.h +include/freerdp2/freerdp/assistance.h +include/freerdp2/freerdp/autodetect.h +include/freerdp2/freerdp/build-config.h +include/freerdp2/freerdp/cache/bitmap.h +include/freerdp2/freerdp/cache/brush.h +include/freerdp2/freerdp/cache/cache.h +include/freerdp2/freerdp/cache/glyph.h +include/freerdp2/freerdp/cache/nine_grid.h +include/freerdp2/freerdp/cache/offscreen.h +include/freerdp2/freerdp/cache/palette.h +include/freerdp2/freerdp/cache/pointer.h +include/freerdp2/freerdp/channels/audin.h +include/freerdp2/freerdp/channels/channels.h +include/freerdp2/freerdp/channels/cliprdr.h +include/freerdp2/freerdp/channels/encomsp.h +include/freerdp2/freerdp/channels/log.h +include/freerdp2/freerdp/channels/rail.h +include/freerdp2/freerdp/channels/rdpdr.h +include/freerdp2/freerdp/channels/rdpei.h +include/freerdp2/freerdp/channels/rdpgfx.h +include/freerdp2/freerdp/channels/rdpsnd.h +include/freerdp2/freerdp/channels/remdesk.h +include/freerdp2/freerdp/channels/tsmf.h +include/freerdp2/freerdp/channels/wtsvc.h +include/freerdp2/freerdp/client.h +include/freerdp2/freerdp/client/audin.h +include/freerdp2/freerdp/client/channels.h +include/freerdp2/freerdp/client/cliprdr.h +include/freerdp2/freerdp/client/cmdline.h +include/freerdp2/freerdp/client/disp.h +include/freerdp2/freerdp/client/drdynvc.h +include/freerdp2/freerdp/client/encomsp.h +include/freerdp2/freerdp/client/file.h +include/freerdp2/freerdp/client/rail.h +include/freerdp2/freerdp/client/rdpei.h +include/freerdp2/freerdp/client/rdpgfx.h +include/freerdp2/freerdp/client/rdpsnd.h +include/freerdp2/freerdp/client/remdesk.h +include/freerdp2/freerdp/client/tsmf.h +include/freerdp2/freerdp/codec/audio.h +include/freerdp2/freerdp/codec/bitmap.h +include/freerdp2/freerdp/codec/bulk.h +include/freerdp2/freerdp/codec/clear.h +include/freerdp2/freerdp/codec/color.h +include/freerdp2/freerdp/codec/dsp.h +include/freerdp2/freerdp/codec/h264.h +include/freerdp2/freerdp/codec/interleaved.h +include/freerdp2/freerdp/codec/jpeg.h +include/freerdp2/freerdp/codec/mppc.h +include/freerdp2/freerdp/codec/ncrush.h +include/freerdp2/freerdp/codec/nsc.h +include/freerdp2/freerdp/codec/planar.h +include/freerdp2/freerdp/codec/progressive.h +include/freerdp2/freerdp/codec/region.h +include/freerdp2/freerdp/codec/rfx.h +include/freerdp2/freerdp/codec/xcrush.h +include/freerdp2/freerdp/codec/zgfx.h +include/freerdp2/freerdp/codecs.h +include/freerdp2/freerdp/constants.h +include/freerdp2/freerdp/crypto/ber.h +include/freerdp2/freerdp/crypto/certificate.h +include/freerdp2/freerdp/crypto/crypto.h +include/freerdp2/freerdp/crypto/der.h +include/freerdp2/freerdp/crypto/er.h +include/freerdp2/freerdp/crypto/per.h +include/freerdp2/freerdp/crypto/tls.h +include/freerdp2/freerdp/dvc.h +include/freerdp2/freerdp/error.h +include/freerdp2/freerdp/event.h +include/freerdp2/freerdp/extension.h +include/freerdp2/freerdp/freerdp.h +include/freerdp2/freerdp/gdi/bitmap.h +include/freerdp2/freerdp/gdi/dc.h +include/freerdp2/freerdp/gdi/gdi.h +include/freerdp2/freerdp/gdi/gfx.h +include/freerdp2/freerdp/gdi/pen.h +include/freerdp2/freerdp/gdi/region.h +include/freerdp2/freerdp/gdi/shape.h +include/freerdp2/freerdp/graphics.h +include/freerdp2/freerdp/input.h +include/freerdp2/freerdp/listener.h +include/freerdp2/freerdp/locale/keyboard.h +include/freerdp2/freerdp/locale/locale.h +include/freerdp2/freerdp/log.h +include/freerdp2/freerdp/message.h +include/freerdp2/freerdp/metrics.h +include/freerdp2/freerdp/peer.h +include/freerdp2/freerdp/pointer.h +include/freerdp2/freerdp/primary.h +include/freerdp2/freerdp/primitives.h +include/freerdp2/freerdp/rail.h +include/freerdp2/freerdp/scancode.h +include/freerdp2/freerdp/secondary.h +include/freerdp2/freerdp/server/audin.h +include/freerdp2/freerdp/server/channels.h +include/freerdp2/freerdp/server/cliprdr.h +include/freerdp2/freerdp/server/drdynvc.h +include/freerdp2/freerdp/server/echo.h +include/freerdp2/freerdp/server/encomsp.h +include/freerdp2/freerdp/server/rdpdr.h +include/freerdp2/freerdp/server/rdpei.h +include/freerdp2/freerdp/server/rdpgfx.h +include/freerdp2/freerdp/server/rdpsnd.h +include/freerdp2/freerdp/server/remdesk.h +include/freerdp2/freerdp/server/shadow.h +include/freerdp2/freerdp/session.h +include/freerdp2/freerdp/settings.h +include/freerdp2/freerdp/svc.h +include/freerdp2/freerdp/types.h +include/freerdp2/freerdp/update.h +include/freerdp2/freerdp/utils/msusb.h +include/freerdp2/freerdp/utils/passphrase.h +include/freerdp2/freerdp/utils/pcap.h +include/freerdp2/freerdp/utils/profiler.h +include/freerdp2/freerdp/utils/ringbuffer.h +include/freerdp2/freerdp/utils/signal.h +include/freerdp2/freerdp/utils/stopwatch.h +include/freerdp2/freerdp/version.h +include/freerdp2/freerdp/window.h +include/winpr2/winpr/asn1.h +include/winpr2/winpr/bcrypt.h +include/winpr2/winpr/bitstream.h +include/winpr2/winpr/clipboard.h +include/winpr2/winpr/cmdline.h +include/winpr2/winpr/collections.h +include/winpr2/winpr/comm.h +include/winpr2/winpr/credentials.h +include/winpr2/winpr/credui.h +include/winpr2/winpr/crt.h +include/winpr2/winpr/crypto.h +include/winpr2/winpr/debug.h +include/winpr2/winpr/dsparse.h +include/winpr2/winpr/endian.h +include/winpr2/winpr/environment.h +include/winpr2/winpr/error.h +include/winpr2/winpr/file.h +include/winpr2/winpr/handle.h +include/winpr2/winpr/heap.h +include/winpr2/winpr/image.h +include/winpr2/winpr/ini.h +include/winpr2/winpr/input.h +include/winpr2/winpr/interlocked.h +include/winpr2/winpr/intrin.h +include/winpr2/winpr/io.h +include/winpr2/winpr/library.h +include/winpr2/winpr/locale.h +include/winpr2/winpr/memory.h +include/winpr2/winpr/midl.h +include/winpr2/winpr/ndr.h +include/winpr2/winpr/nt.h +include/winpr2/winpr/ntlm.h +include/winpr2/winpr/pack.h +include/winpr2/winpr/path.h +include/winpr2/winpr/pipe.h +include/winpr2/winpr/platform.h +include/winpr2/winpr/pool.h +include/winpr2/winpr/print.h +include/winpr2/winpr/registry.h +include/winpr2/winpr/rpc.h +include/winpr2/winpr/sam.h +include/winpr2/winpr/schannel.h +include/winpr2/winpr/security.h +include/winpr2/winpr/shell.h +include/winpr2/winpr/smartcard.h +include/winpr2/winpr/spec.h +include/winpr2/winpr/ssl.h +include/winpr2/winpr/sspi.h +include/winpr2/winpr/sspicli.h +include/winpr2/winpr/stream.h +include/winpr2/winpr/string.h +include/winpr2/winpr/synch.h +include/winpr2/winpr/sysinfo.h +include/winpr2/winpr/tchar.h +include/winpr2/winpr/thread.h +include/winpr2/winpr/timezone.h +include/winpr2/winpr/tools/makecert.h +include/winpr2/winpr/user.h +include/winpr2/winpr/version.h +include/winpr2/winpr/windows.h +include/winpr2/winpr/winhttp.h +include/winpr2/winpr/winpr.h +include/winpr2/winpr/winsock.h +include/winpr2/winpr/wlog.h +include/winpr2/winpr/wnd.h +include/winpr2/winpr/wtsapi.h +include/winpr2/winpr/wtypes.h lib/libfreerdp-client.so -lib/libfreerdp-client.so.1.2 -lib/libfreerdp-client.so.1.2.0 -lib/libwinpr.so -lib/libwinpr.so.1.1 -lib/libwinpr.so.1.1.0 -lib/libwinpr-makecert-tool.a -%%X11%%lib/libxfreerdp-client.so -%%X11%%lib/libxfreerdp-client.so.1.2 -%%X11%%lib/libxfreerdp-client.so.1.2.0 -libdata/pkgconfig/freerdp.pc -libdata/pkgconfig/winpr.pc +lib/libfreerdp-client.so.2 +lib/libfreerdp-client.so.2.0.0 +lib/libfreerdp.so +lib/libfreerdp.so.2 +lib/libfreerdp.so.2.0.0 +lib/libwinpr-tools.so +lib/libwinpr-tools.so.2 +lib/libwinpr-tools.so.2.0.0 +lib/libwinpr.so +lib/libwinpr.so.2 +lib/libwinpr.so.2.0.0 +libdata/pkgconfig/freerdp-client2.pc +libdata/pkgconfig/freerdp2.pc +libdata/pkgconfig/winpr-tools2.pc +libdata/pkgconfig/winpr2.pc +man/man1/wlog.1.gz %%X11%%man/man1/xfreerdp.1.gz +share/cmake/Modules/FreeRDP-Client2/FreeRDP-ClientConfig.cmake +share/cmake/Modules/FreeRDP-Client2/FreeRDP-ClientConfigVersion.cmake +share/cmake/Modules/FreeRDP-Client2/FreeRDP-ClientTargets-%%CMAKE_BUILD_TYPE%%.cmake +share/cmake/Modules/FreeRDP-Client2/FreeRDP-ClientTargets.cmake +share/cmake/Modules/FreeRDP2/FreeRDPConfig.cmake +share/cmake/Modules/FreeRDP2/FreeRDPConfigVersion.cmake +share/cmake/Modules/FreeRDP2/FreeRDPTargets-%%CMAKE_BUILD_TYPE%%.cmake +share/cmake/Modules/FreeRDP2/FreeRDPTargets.cmake +share/cmake/Modules/WinPR2/WinPRConfig.cmake +share/cmake/Modules/WinPR2/WinPRConfigVersion.cmake +share/cmake/Modules/WinPR2/WinPRTargets-%%CMAKE_BUILD_TYPE%%.cmake +share/cmake/Modules/WinPR2/WinPRTargets.cmake diff --git a/net/freerdp1/Makefile b/net/freerdp1/Makefile new file mode 100644 index 000000000000..6c87afdd8faf --- /dev/null +++ b/net/freerdp1/Makefile @@ -0,0 +1,97 @@ +# Created by: Alexander Logvinov <avl@FreeBSD.org> +# $FreeBSD$ + +PORTNAME= freerdp +PORTVERSION= 1.2.0 +CATEGORIES= net comms ipv6 +PKGNAMESUFFIX= 1 + +MAINTAINER= bsdports@kyle-evans.net +COMMENT= Free implementation of Remote Desktop Protocol + +LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/LICENSE + +USE_LDCONFIG= yes +USES= alias cmake:outsource cpe execinfo pathfix pkgconfig compiler:c++11-lib ssl +USE_GITHUB= yes +GH_ACCOUNT= FreeRDP +GH_PROJECT= ${GH_ACCOUNT} +GH_TAGNAME= f5ff6e1 + +CPE_VENDOR= freerdp_project + +LDFLAGS+= -L${LOCALBASE}/lib +CFLAGS+= -I${WRKSRC}/include -I${WRKSRC}/winpr/include -I${LOCALBASE}/include + +OPTIONS_DEFINE= ALSA CUPS DIRECTFB FFMPEG GSTREAMER PULSEAUDIO SSE X11 +OPTIONS_DEFAULT= CUPS GSTREAMER X11 +OPTIONS_SUB= yes + +ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib +ALSA_CMAKE_ON= -DWITH_ALSA=ON +ALSA_CMAKE_OFF= -DWITH_ALSA=OFF + +CUPS_LIB_DEPENDS= libcups.so:print/cups +CUPS_CMAKE_ON= -DWITH_CUPS=ON +CUPS_CMAKE_OFF= -DWITH_CUPS=OFF + +# outdated and unmaintained upstream +DIRECTFB_DESC= Build FreeRDP DirectFB client (outdated) +DIRECTFB_LIB_DEPENDS= libdirectfb.so:devel/directfb +DIRECTFB_CMAKE_ON= -DWITH_DIRECTFB=ON +DIRECTFB_CMAKE_OFF= -DWITH_DIRECTFB=OFF +# currently DirectFB option fails with clang +DIRECTFB_USE= gcc=yes + +FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ + libavutil.so:multimedia/ffmpeg +FFMPEG_CMAKE_ON= -DWITH_FFMPEG=ON +FFMPEG_CMAKE_OFF= -DWITH_FFMPEG=OFF + +GSTREAMER_CMAKE_ON= -DWITH_GSTREAMER_1_0=ON -DWITH_GSTREAMER_0_10=OFF +GSTREAMER_CMAKE_OFF= -DWITH_GSTREAMER_1_0=OFF -DWITH_GSTREAMER_0_10=OFF +GSTREAMER_USE= gstreamer1=yes xorg=x11,xextproto,xext,xrandr + +PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio +PULSEAUDIO_CMAKE_ON= -DWITH_PULSE=ON +PULSEAUDIO_CMAKE_OFF= -DWITH_PULSE=OFF + +SSE_CMAKE_ON= -DWITH_SSE2=ON +SSE_CMAKE_OFF= -DWITH_SSE2=OFF + +X11_DESC= Build FreeRDP X11 client +X11_BUILD_DEPENDS= xmlto:textproc/xmlto +X11_CMAKE_ON= -DWITH_X11=ON +X11_CMAKE_OFF= -DWITH_X11=OFF -DWITH_XKBFILE=OFF +X11_USE= xorg=x11,xkbfile,xcursor,xextproto,xv,xinerama,xext \ + xcursor,xrandr,xi,xfixes,xrender + +.include <bsd.port.options.mk> + +post-patch: + @${FIND} ${WRKSRC} -name 'CMakeLists.txt' | ${XARGS} \ + ${REINPLACE_CMD} \ + -e 's|list(APPEND $${MODULE_PREFIX}_LIBS freerdp)|list(APPEND $${MODULE_PREFIX}_LIBS freerdp1)|' \ + -e 's|list(APPEND $${MODULE_PREFIX}_LIBS winpr)|list(APPEND $${MODULE_PREFIX}_LIBS winpr1)|' + @${FIND} ${WRKSRC} -name 'CMakeLists.txt' | ${XARGS} \ + ${REINPLACE_CMD} -E \ + -e 's|freerdp winpr|freerdp1 winpr1|' \ + -e 's|winpr freerdp|winpr1 freerdp1|' \ + -e 's|-lwinpr|-lwinpr1|' \ + -e 's|-lfreerdp|-lfreerdp1|' \ + -e 's|^([[:blank:]]*)target_link_libraries\((.+) freerdp\)([[:blank:]]*)$$|\1target_link_libraries(\2 freerdp1)\3|' \ + -e 's|^([[:blank:]]*)target_link_libraries\((.+) winpr\)([[:blank:]]*)$$|\1target_link_libraries(\2 winpr1)\3|' \ + -e 's|^([[:blank:]]*)set\((.+) freerdp (.+) winpr\)([[:blank:]]*)$$|\1set(\2 freerdp1 \3 winpr1)\4|' \ + -e 's|^([[:blank:]]*)set\((.+) winpr\)([[:blank:]]*)$$|\1set(\2 winpr1)\3|' + @${REINPLACE_CMD} -e 's|share/man/man1|man/man1|' \ + ${WRKSRC}/client/X11/CMakeLists.txt + @${REINPLACE_CMD} -e 's/NetBSD__)/NetBSD__) || defined(__FreeBSD__)/' \ + ${WRKSRC}/winpr/libwinpr/utils/trio/triodef.h + @${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' \ + ${WRKSRC}/channels/drive/client/statvfs.c + @${REINPLACE_CMD} -e 's|$${CMAKE_INSTALL_LIBDIR}/cmake|$${CMAKE_INSTALL_PREFIX}/share/cmake/Modules|' \ + ${WRKSRC}/winpr/CMakeLists.txt \ + ${WRKSRC}/CMakeLists.txt + +.include <bsd.port.mk> diff --git a/net/freerdp1/distinfo b/net/freerdp1/distinfo new file mode 100644 index 000000000000..4fbc40f7106b --- /dev/null +++ b/net/freerdp1/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1470755086 +SHA256 (FreeRDP-FreeRDP-1.2.0-f5ff6e1_GH0.tar.gz) = f39c7eaa007a3aef580f364f8f5c0b9208c6c3c8f5f00a4c0ed020a81535eb32 +SIZE (FreeRDP-FreeRDP-1.2.0-f5ff6e1_GH0.tar.gz) = 6033856 diff --git a/net/freerdp1/files/patch-client_X11_CMakeLists.txt b/net/freerdp1/files/patch-client_X11_CMakeLists.txt new file mode 100644 index 000000000000..bee5a38a474c --- /dev/null +++ b/net/freerdp1/files/patch-client_X11_CMakeLists.txt @@ -0,0 +1,70 @@ +--- client/X11/CMakeLists.txt.orig 2016-12-04 14:35:40 UTC ++++ client/X11/CMakeLists.txt +@@ -16,7 +16,7 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + +-set(MODULE_NAME "xfreerdp-client") ++set(MODULE_NAME "xfreerdp1-client") + set(MODULE_PREFIX "FREERDP_CLIENT_X11_CONTROL") + + include(FindDocBookXSL) +@@ -66,7 +66,7 @@ if(WITH_CLIENT_INTERFACE) + else() + set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} cli/xfreerdp.c cli/xfreerdp.h) + add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS}) +- set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "xfreerdp") ++ set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "xfreerdp1") + endif() + + set(${MODULE_PREFIX}_LIBS +@@ -84,31 +84,31 @@ if(WITH_MANPAGES) + + TODAY(MAN_TODAY) + +- configure_file(xfreerdp.1.xml.in xfreerdp.1.xml @ONLY IMMEDIATE) ++ configure_file(xfreerdp.1.xml.in xfreerdp1.1.xml @ONLY IMMEDIATE) + + add_executable(generate_argument_docbook generate_argument_docbook.c) + +- set(GAD_LIBS freerdp-client) +- target_link_libraries(generate_argument_docbook ${GAD_LIBS} freerdp winpr) ++ set(GAD_LIBS freerdp1-client) ++ target_link_libraries(generate_argument_docbook ${GAD_LIBS} freerdp1 winpr1) + +- add_custom_command(OUTPUT xfreerdp.1 ++ add_custom_command(OUTPUT xfreerdp1.1 + COMMAND generate_argument_docbook + COMMAND ${CMAKE_COMMAND} -E copy + ${CMAKE_CURRENT_SOURCE_DIR}/xfreerdp-channels.1.xml ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${CMAKE_COMMAND} -E copy + ${CMAKE_CURRENT_SOURCE_DIR}/xfreerdp-examples.1.xml ${CMAKE_CURRENT_BINARY_DIR} +- COMMAND ${XSLTPROC_EXECUTABLE} ${DOCBOOKXSL_DIR}/manpages/docbook.xsl xfreerdp.1.xml ++ COMMAND ${XSLTPROC_EXECUTABLE} ${DOCBOOKXSL_DIR}/manpages/docbook.xsl xfreerdp1.1.xml + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + DEPENDS +- ${CMAKE_CURRENT_BINARY_DIR}/xfreerdp.1.xml ++ ${CMAKE_CURRENT_BINARY_DIR}/xfreerdp1.1.xml + ${CMAKE_CURRENT_SOURCE_DIR}/xfreerdp-examples.1.xml + ${CMAKE_CURRENT_SOURCE_DIR}/xfreerdp-channels.1.xml + generate_argument_docbook) + +- add_custom_target(xfreerdp.manpage ALL +- DEPENDS xfreerdp.1) ++ add_custom_target(xfreerdp1.manpage ALL ++ DEPENDS xfreerdp1.1) + +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/xfreerdp.1 DESTINATION share/man/man1) ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/xfreerdp1.1 DESTINATION man/man1) + else() + message(WARNING "WITH_MANPAGES was set, but xsltproc was not found. man-pages will not be installed") + endif() +@@ -199,7 +199,7 @@ endif() + + include_directories(${CMAKE_SOURCE_DIR}/resources) + +-set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp freerdp-client) ++set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp1 freerdp1-client) + target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) + + if(WITH_IPP) diff --git a/net/freerdp1/files/patch-client_X11_ModuleOptions.cmake b/net/freerdp1/files/patch-client_X11_ModuleOptions.cmake new file mode 100644 index 000000000000..0a49213fc2df --- /dev/null +++ b/net/freerdp1/files/patch-client_X11_ModuleOptions.cmake @@ -0,0 +1,8 @@ +--- client/X11/ModuleOptions.cmake.orig 2014-09-11 22:46:32 UTC ++++ client/X11/ModuleOptions.cmake +@@ -1,4 +1,4 @@ + +-set(FREERDP_CLIENT_NAME "xfreerdp") ++set(FREERDP_CLIENT_NAME "xfreerdp1") + set(FREERDP_CLIENT_PLATFORM "X11") + set(FREERDP_CLIENT_VENDOR "FreeRDP") diff --git a/net/freerdp1/files/patch-client_X11_cli_CMakeLists.txt b/net/freerdp1/files/patch-client_X11_cli_CMakeLists.txt new file mode 100644 index 000000000000..5ee19c1a63b4 --- /dev/null +++ b/net/freerdp1/files/patch-client_X11_cli_CMakeLists.txt @@ -0,0 +1,23 @@ +--- client/X11/cli/CMakeLists.txt.orig 2016-12-04 14:35:40 UTC ++++ client/X11/cli/CMakeLists.txt +@@ -15,7 +15,7 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + +-set(MODULE_NAME "xfreerdp-cli") ++set(MODULE_NAME "xfreerdp1-cli") + set(MODULE_PREFIX "FREERDP_CLIENT_X11") + + include_directories(..) +@@ -24,9 +24,9 @@ set(${MODULE_PREFIX}_SRCS + xfreerdp.c) + + add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS}) +-set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "xfreerdp" RUNTIME_OUTPUT_DIRECTORY "..") ++set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "xfreerdp1" RUNTIME_OUTPUT_DIRECTORY "..") + +-set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} xfreerdp-client) ++set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} xfreerdp1-client) + + target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) + diff --git a/net/freerdp1/files/patch-client_X11_xfreerdp.1.xml.in b/net/freerdp1/files/patch-client_X11_xfreerdp.1.xml.in new file mode 100644 index 000000000000..0f219a987938 --- /dev/null +++ b/net/freerdp1/files/patch-client_X11_xfreerdp.1.xml.in @@ -0,0 +1,37 @@ +--- client/X11/xfreerdp.1.xml.in.orig 2014-09-11 22:46:32 UTC ++++ client/X11/xfreerdp.1.xml.in +@@ -16,13 +16,13 @@ PUBLIC "-//OASIS//DTD DocBook XML V4.5// + </author> + </refentryinfo> + <refmeta> +- <refentrytitle>xfreerdp</refentrytitle> ++ <refentrytitle>xfreerdp1</refentrytitle> + <manvolnum>1</manvolnum> + <refmiscinfo class="source">freerdp</refmiscinfo> +- <refmiscinfo class="manual">xfreerdp</refmiscinfo> ++ <refmiscinfo class="manual">xfreerdp1</refmiscinfo> + </refmeta> + <refnamediv> +- <refname><application>xfreerdp</application></refname> ++ <refname><application>xfreerdp1</application></refname> + <refpurpose>FreeRDP X11 client</refpurpose> + </refnamediv> + <refsynopsisdiv> +@@ -30,7 +30,7 @@ PUBLIC "-//OASIS//DTD DocBook XML V4.5// + <date>@MAN_TODAY@</date> + </refsynopsisdivinfo> + <para> +- <command>xfreerdp</command> [file] [options] [/v:server[:port]] ++ <command>xfreerdp1</command> [file] [options] [/v:server[:port]] + </para> + </refsynopsisdiv> + <refsect1> +@@ -39,7 +39,7 @@ PUBLIC "-//OASIS//DTD DocBook XML V4.5// + </refsect1info> + <title>DESCRIPTION</title> + <para> +- <command>xfreerdp</command> is an X11 Remote Desktop Protocol (RDP) ++ <command>xfreerdp1</command> is an X11 Remote Desktop Protocol (RDP) + client which is part of the FreeRDP project. An RDP server is built-in + to many editions of Windows. Alternative servers included xrdp and VRDP (VirtualBox). + </para> diff --git a/net/freerdp1/files/patch-client_common_CMakeLists.txt b/net/freerdp1/files/patch-client_common_CMakeLists.txt new file mode 100644 index 000000000000..8d33cbb4a7f4 --- /dev/null +++ b/net/freerdp1/files/patch-client_common_CMakeLists.txt @@ -0,0 +1,20 @@ +--- client/common/CMakeLists.txt.orig 2016-12-04 15:05:17 UTC ++++ client/common/CMakeLists.txt +@@ -15,7 +15,7 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + +-set(MODULE_NAME "freerdp-client") ++set(MODULE_NAME "freerdp1-client") + set(MODULE_PREFIX "FREERDP_CLIENT") + + # Policy CMP0022: INTERFACE_LINK_LIBRARIES defines the link +@@ -58,7 +58,7 @@ set(${MODULE_PREFIX}_LIBS ${${MODULE_PRE + set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} + ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES}) + +-set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr freerdp) ++set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr1 freerdp1) + + target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) + diff --git a/net/freerdp/files/patch-cmake-FindOpenSSL.cmake b/net/freerdp1/files/patch-cmake-FindOpenSSL.cmake index ca2a8c0f075c..ca2a8c0f075c 100644 --- a/net/freerdp/files/patch-cmake-FindOpenSSL.cmake +++ b/net/freerdp1/files/patch-cmake-FindOpenSSL.cmake diff --git a/net/freerdp/files/patch-cmake_ConfigOptions.cmake b/net/freerdp1/files/patch-cmake_ConfigOptions.cmake index f99ac8a71da8..f99ac8a71da8 100644 --- a/net/freerdp/files/patch-cmake_ConfigOptions.cmake +++ b/net/freerdp1/files/patch-cmake_ConfigOptions.cmake diff --git a/net/freerdp/files/patch-cmake_FindGStreamer_1_0.cmake b/net/freerdp1/files/patch-cmake_FindGStreamer_1_0.cmake index ca21ee35ad8f..ca21ee35ad8f 100644 --- a/net/freerdp/files/patch-cmake_FindGStreamer_1_0.cmake +++ b/net/freerdp1/files/patch-cmake_FindGStreamer_1_0.cmake diff --git a/net/freerdp1/files/patch-ffmpeg29 b/net/freerdp1/files/patch-ffmpeg29 new file mode 100644 index 000000000000..0d7e6de57ebd --- /dev/null +++ b/net/freerdp1/files/patch-ffmpeg29 @@ -0,0 +1,77 @@ +Description: Replace deprecated FFmpeg API +Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> +Last-Update: <2015-11-02> + +--- channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c.orig 2016-06-11 21:12:27.134896000 +0200 ++++ channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c 2016-06-11 21:14:05.282247000 +0200 +@@ -103,7 +103,7 @@ + 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(); ++ mdecoder->frame = av_frame_alloc(); + return TRUE; + } + +@@ -322,14 +322,14 @@ + 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); + 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 @@ + (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); +@@ -398,7 +398,7 @@ + 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 @@ + TSMFFFmpegDecoder *mdecoder = (TSMFFFmpegDecoder *) decoder; + switch(mdecoder->codec_context->pix_fmt) + { +- case PIX_FMT_YUV420P: ++ case AV_PIX_FMT_YUV420P: + return RDP_PIXFMT_I420; + default: + CLOG_ERR("unsupported pixel format %u", +@@ -492,7 +492,7 @@ + { + 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 @@ + 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); + } diff --git a/net/freerdp/files/patch-freerdp.pc.in b/net/freerdp1/files/patch-freerdp.pc.in index 9bbcc5bfe247..7220ebccef41 100644 --- a/net/freerdp/files/patch-freerdp.pc.in +++ b/net/freerdp1/files/patch-freerdp.pc.in @@ -1,13 +1,12 @@ Index: freerdp.pc.in -diff -u freerdp.pc.in.orig freerdp.pc.in ---- freerdp.pc.in.orig 2014-09-12 07:46:32.000000000 +0900 -+++ freerdp.pc.in 2015-05-26 02:05:37.874925433 +0900 -@@ -9,7 +9,7 @@ +--- freerdp.pc.in.orig 2014-09-11 22:46:32 UTC ++++ freerdp.pc.in +@@ -9,7 +9,7 @@ Description: FreeRDP: A Remote Desktop P URL: http://www.freerdp.com/ Version: @FREERDP_VERSION_FULL@ Requires: -Requires.private: winpr zlib libssl -+Requires.private: winpr ++Requires.private: winpr1 Libs: -L${libdir} ${libs} Libs.private: -ldl -lpthread Cflags: -I${includedir} diff --git a/net/freerdp/files/patch-git_1b663cef b/net/freerdp1/files/patch-git_1b663cef index 5d697c226490..5d697c226490 100644 --- a/net/freerdp/files/patch-git_1b663cef +++ b/net/freerdp1/files/patch-git_1b663cef diff --git a/net/freerdp/files/patch-git_434436b7 b/net/freerdp1/files/patch-git_434436b7 index 6db84088dede..6db84088dede 100644 --- a/net/freerdp/files/patch-git_434436b7 +++ b/net/freerdp1/files/patch-git_434436b7 diff --git a/net/freerdp/files/patch-libfreerdp-locale-timezone.c b/net/freerdp1/files/patch-libfreerdp-locale-timezone.c index ee8d2e4bb070..ee8d2e4bb070 100644 --- a/net/freerdp/files/patch-libfreerdp-locale-timezone.c +++ b/net/freerdp1/files/patch-libfreerdp-locale-timezone.c diff --git a/net/freerdp1/files/patch-libfreerdp_CMakeLists.txt b/net/freerdp1/files/patch-libfreerdp_CMakeLists.txt new file mode 100644 index 000000000000..0a1c34df46af --- /dev/null +++ b/net/freerdp1/files/patch-libfreerdp_CMakeLists.txt @@ -0,0 +1,19 @@ +--- libfreerdp/CMakeLists.txt.orig 2016-12-04 14:35:40 UTC ++++ libfreerdp/CMakeLists.txt +@@ -15,7 +15,7 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + +-set(MODULE_NAME "freerdp") ++set(MODULE_NAME "freerdp1") + set(MODULE_PREFIX "FREERDP") + + # Create imported targets for Intel IPP libraries +@@ -284,6 +284,6 @@ if (WITH_LIBRARY_VERSIONING) + endif() + set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "lib") + +-target_link_libraries(${MODULE_NAME} ${LIBFREERDP_LIBS} winpr) ++target_link_libraries(${MODULE_NAME} ${LIBFREERDP_LIBS} winpr1) + install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT FreeRDPTargets) + set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "FreeRDP/libfreerdp") diff --git a/net/freerdp/files/patch-winpr.pc.in b/net/freerdp1/files/patch-winpr.pc.in index b3e01821f0eb..b3e01821f0eb 100644 --- a/net/freerdp/files/patch-winpr.pc.in +++ b/net/freerdp1/files/patch-winpr.pc.in diff --git a/net/freerdp1/files/patch-winpr_tools_hash_CMakeLists.txt b/net/freerdp1/files/patch-winpr_tools_hash_CMakeLists.txt new file mode 100644 index 000000000000..eab2a404c7e7 --- /dev/null +++ b/net/freerdp1/files/patch-winpr_tools_hash_CMakeLists.txt @@ -0,0 +1,11 @@ +--- winpr/tools/hash/CMakeLists.txt.orig 2016-12-04 14:51:44 UTC ++++ winpr/tools/hash/CMakeLists.txt +@@ -29,7 +29,7 @@ add_executable(${MODULE_NAME} ${${MODULE + set(${MODULE_PREFIX}_LIBS + ${ZLIB_LIBRARIES} + ${OPENSSL_LIBRARIES} +- winpr) ++ winpr1) + + target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) + diff --git a/net/freerdp1/files/patch-winpr_tools_makecert_CMakeLists.txt b/net/freerdp1/files/patch-winpr_tools_makecert_CMakeLists.txt new file mode 100644 index 000000000000..358a324fe39e --- /dev/null +++ b/net/freerdp1/files/patch-winpr_tools_makecert_CMakeLists.txt @@ -0,0 +1,11 @@ +--- winpr/tools/makecert/CMakeLists.txt.orig 2016-12-04 14:56:48 UTC ++++ winpr/tools/makecert/CMakeLists.txt +@@ -28,7 +28,7 @@ add_library(${MODULE_NAME} STATIC ${${MO + set(${MODULE_PREFIX}_LIBS + ${ZLIB_LIBRARIES} + ${OPENSSL_LIBRARIES} +- winpr) ++ winpr1) + + target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) + diff --git a/net/freerdp/files/patch-z001-CMakeLists.txt b/net/freerdp1/files/patch-z001-CMakeLists.txt index 6c9c2194b421..6c9c2194b421 100644 --- a/net/freerdp/files/patch-z001-CMakeLists.txt +++ b/net/freerdp1/files/patch-z001-CMakeLists.txt diff --git a/net/freerdp1/pkg-descr b/net/freerdp1/pkg-descr new file mode 100644 index 000000000000..c40b0cc19a5c --- /dev/null +++ b/net/freerdp1/pkg-descr @@ -0,0 +1,6 @@ +FreeRDP is a free implementation of the Remote Desktop Protocol (RDP), +released under the Apache license. Enjoy the freedom of using your +software wherever you want, the way you want it, in a world where +interoperability can finally liberate your computing experience. + +WWW: http://www.freerdp.com/ diff --git a/net/freerdp1/pkg-plist b/net/freerdp1/pkg-plist new file mode 100644 index 000000000000..8cc5fcec6e6c --- /dev/null +++ b/net/freerdp1/pkg-plist @@ -0,0 +1,248 @@ +%%DIRECTFB%%bin/dfreerdp1 +%%X11%%bin/xfreerdp1 +include/freerdp/addin.h +include/freerdp/altsec.h +include/freerdp/api.h +include/freerdp/assistance.h +include/freerdp/cache/bitmap.h +include/freerdp/cache/brush.h +include/freerdp/cache/cache.h +include/freerdp/cache/glyph.h +include/freerdp/cache/nine_grid.h +include/freerdp/cache/offscreen.h +include/freerdp/cache/palette.h +include/freerdp/cache/pointer.h +include/freerdp/channels/audin.h +include/freerdp/channels/channels.h +include/freerdp/channels/cliprdr.h +include/freerdp/channels/encomsp.h +include/freerdp/channels/log.h +include/freerdp/channels/rail.h +include/freerdp/channels/rdpdr.h +include/freerdp/channels/rdpgfx.h +include/freerdp/channels/rdpsnd.h +include/freerdp/channels/remdesk.h +include/freerdp/channels/tsmf.h +include/freerdp/channels/wtsvc.h +include/freerdp/client.h +include/freerdp/client/audin.h +include/freerdp/client/channels.h +include/freerdp/client/cliprdr.h +include/freerdp/client/cmdline.h +include/freerdp/client/disp.h +include/freerdp/client/drdynvc.h +include/freerdp/client/encomsp.h +include/freerdp/client/file.h +include/freerdp/client/rail.h +include/freerdp/client/rdpei.h +include/freerdp/client/rdpgfx.h +include/freerdp/client/rdpsnd.h +include/freerdp/client/remdesk.h +include/freerdp/client/tsmf.h +include/freerdp/codec/audio.h +include/freerdp/codec/bitmap.h +include/freerdp/codec/bulk.h +include/freerdp/codec/clear.h +include/freerdp/codec/color.h +include/freerdp/codec/dsp.h +include/freerdp/codec/h264.h +include/freerdp/codec/interleaved.h +include/freerdp/codec/jpeg.h +include/freerdp/codec/mppc.h +include/freerdp/codec/ncrush.h +include/freerdp/codec/nsc.h +include/freerdp/codec/planar.h +include/freerdp/codec/progressive.h +include/freerdp/codec/region.h +include/freerdp/codec/rfx.h +include/freerdp/codec/xcrush.h +include/freerdp/codec/zgfx.h +include/freerdp/codecs.h +include/freerdp/constants.h +include/freerdp/crypto/ber.h +include/freerdp/crypto/certificate.h +include/freerdp/crypto/crypto.h +include/freerdp/crypto/der.h +include/freerdp/crypto/er.h +include/freerdp/crypto/per.h +include/freerdp/crypto/tls.h +include/freerdp/dvc.h +include/freerdp/error.h +include/freerdp/event.h +include/freerdp/extension.h +include/freerdp/freerdp.h +include/freerdp/gdi/16bpp.h +include/freerdp/gdi/32bpp.h +include/freerdp/gdi/8bpp.h +include/freerdp/gdi/bitmap.h +include/freerdp/gdi/brush.h +include/freerdp/gdi/clipping.h +include/freerdp/gdi/dc.h +include/freerdp/gdi/drawing.h +include/freerdp/gdi/gdi.h +include/freerdp/gdi/line.h +include/freerdp/gdi/palette.h +include/freerdp/gdi/pen.h +include/freerdp/gdi/region.h +include/freerdp/gdi/shape.h +include/freerdp/graphics.h +include/freerdp/input.h +include/freerdp/listener.h +include/freerdp/locale/keyboard.h +include/freerdp/locale/locale.h +include/freerdp/locale/timezone.h +include/freerdp/log.h +include/freerdp/message.h +include/freerdp/metrics.h +include/freerdp/peer.h +include/freerdp/pointer.h +include/freerdp/primary.h +include/freerdp/primitives.h +include/freerdp/rail.h +include/freerdp/rail/icon.h +include/freerdp/rail/rail.h +include/freerdp/rail/window.h +include/freerdp/rail/window_list.h +include/freerdp/scancode.h +include/freerdp/secondary.h +include/freerdp/server/audin.h +include/freerdp/server/channels.h +include/freerdp/server/cliprdr.h +include/freerdp/server/drdynvc.h +include/freerdp/server/echo.h +include/freerdp/server/encomsp.h +include/freerdp/server/rdpdr.h +include/freerdp/server/rdpsnd.h +include/freerdp/server/remdesk.h +include/freerdp/server/shadow.h +include/freerdp/settings.h +include/freerdp/svc.h +include/freerdp/types.h +include/freerdp/update.h +include/freerdp/utils/debug.h +include/freerdp/utils/event.h +include/freerdp/utils/msusb.h +include/freerdp/utils/passphrase.h +include/freerdp/utils/pcap.h +include/freerdp/utils/profiler.h +include/freerdp/utils/rail.h +include/freerdp/utils/ringbuffer.h +include/freerdp/utils/signal.h +include/freerdp/utils/stopwatch.h +include/freerdp/utils/svc_plugin.h +include/freerdp/utils/tcp.h +include/freerdp/utils/time.h +include/freerdp/utils/uds.h +include/freerdp/version.h +include/freerdp/window.h +include/winpr/asn1.h +include/winpr/bcrypt.h +include/winpr/bitstream.h +include/winpr/cmdline.h +include/winpr/collections.h +include/winpr/comm.h +include/winpr/credentials.h +include/winpr/credui.h +include/winpr/crt.h +include/winpr/crypto.h +include/winpr/debug.h +include/winpr/dsparse.h +include/winpr/endian.h +include/winpr/environment.h +include/winpr/error.h +include/winpr/file.h +include/winpr/handle.h +include/winpr/heap.h +include/winpr/image.h +include/winpr/ini.h +include/winpr/input.h +include/winpr/interlocked.h +include/winpr/io.h +include/winpr/library.h +include/winpr/locale.h +include/winpr/memory.h +include/winpr/midl.h +include/winpr/ndr.h +include/winpr/nt.h +include/winpr/ntlm.h +include/winpr/path.h +include/winpr/pipe.h +include/winpr/platform.h +include/winpr/pool.h +include/winpr/print.h +include/winpr/registry.h +include/winpr/rpc.h +include/winpr/sam.h +include/winpr/schannel.h +include/winpr/security.h +include/winpr/smartcard.h +include/winpr/spec.h +include/winpr/ssl.h +include/winpr/sspi.h +include/winpr/sspicli.h +include/winpr/stream.h +include/winpr/string.h +include/winpr/synch.h +include/winpr/sysinfo.h +include/winpr/tchar.h +include/winpr/thread.h +include/winpr/timezone.h +include/winpr/tools/makecert.h +include/winpr/windows.h +include/winpr/winhttp.h +include/winpr/winpr.h +include/winpr/winsock.h +include/winpr/wlog.h +include/winpr/wnd.h +include/winpr/wtsapi.h +include/winpr/wtypes.h +%%ALSA%%lib/freerdp/audin-client-alsa.a +%%PULSEAUDIO%%lib/freerdp/audin-client-pulse.a +lib/freerdp/audin-client.a +lib/freerdp/cliprdr-client.a +lib/freerdp/disp-client.a +lib/freerdp/drdynvc-client.a +lib/freerdp/drive-client.a +lib/freerdp/echo-client.a +lib/freerdp/encomsp-client.a +lib/freerdp/parallel-client.a +%%CUPS%%lib/freerdp/printer-client.a +lib/freerdp/rail-client.a +lib/freerdp/rdpdr-client.a +lib/freerdp/rdpei-client.a +lib/freerdp/rdpgfx-client.a +%%ALSA%%lib/freerdp/rdpsnd-client-alsa.a +%%PULSEAUDIO%%lib/freerdp/rdpsnd-client-pulse.a +lib/freerdp/rdpsnd-client.a +lib/freerdp/remdesk-client.a +lib/freerdp/serial-client.a +lib/freerdp/smartcard-client.a +%%ALSA%%lib/freerdp/tsmf-client-alsa-audio.a +%%FFMPEG%%lib/freerdp/tsmf-client-ffmpeg-decoder.a +%%GSTREAMER%%lib/freerdp/tsmf-client-gstreamer-decoder.a +%%PULSEAUDIO%%lib/freerdp/tsmf-client-pulse-audio.a +lib/freerdp/tsmf-client.a +lib/libfreerdp1.so +lib/libfreerdp1.so.1.2 +lib/libfreerdp1.so.1.2.0 +lib/libfreerdp1-client.so +lib/libfreerdp1-client.so.1.2 +lib/libfreerdp1-client.so.1.2.0 +lib/libwinpr1.so +lib/libwinpr1.so.1.1 +lib/libwinpr1.so.1.1.0 +lib/libwinpr-makecert-tool.a +%%X11%%lib/libxfreerdp1-client.so +%%X11%%lib/libxfreerdp1-client.so.1.2 +%%X11%%lib/libxfreerdp1-client.so.1.2.0 +libdata/pkgconfig/freerdp.pc +libdata/pkgconfig/winpr.pc +%%X11%%man/man1/xfreerdp1.1.gz +share/cmake/Modules/FreeRDP/FreeRDPConfig.cmake +share/cmake/Modules/FreeRDP/FreeRDPConfigVersion.cmake +share/cmake/Modules/FreeRDP/FreeRDPTargets-%%CMAKE_BUILD_TYPE%%.cmake +share/cmake/Modules/FreeRDP/FreeRDPTargets.cmake +share/cmake/Modules/WinPR/WinPRConfig.cmake +share/cmake/Modules/WinPR/WinPRConfigVersion.cmake +share/cmake/Modules/WinPR/WinPRTargets-%%CMAKE_BUILD_TYPE%%.cmake +share/cmake/Modules/WinPR/WinPRTargets.cmake diff --git a/net/guacamole-server/Makefile b/net/guacamole-server/Makefile index a2cca481e44c..65708ac1d13a 100644 --- a/net/guacamole-server/Makefile +++ b/net/guacamole-server/Makefile @@ -40,7 +40,7 @@ OPTIONS_DEFAULT= RDP SSH VNC VORBIS PULSEAUDIO WEBP OPTIONS_SUB= yes PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_DESC?= VNC audio support (Experimental) -RDP_LIB_DEPENDS= libfreerdp.so:net/freerdp +RDP_LIB_DEPENDS= libfreerdp1.so:net/freerdp1 RDP_DESC?= RDP Protocal Support SSH_LIB_DEPENDS= libssh2.so:security/libssh2 SSH_USE= GNOME=pango diff --git a/net/guacamole-server/files/patch-configure.ac b/net/guacamole-server/files/patch-configure.ac new file mode 100644 index 000000000000..bcb011012165 --- /dev/null +++ b/net/guacamole-server/files/patch-configure.ac @@ -0,0 +1,66 @@ +--- configure.ac.orig 2016-12-04 15:16:36 UTC ++++ configure.ac +@@ -389,13 +389,13 @@ then + event_interface=unknown + + # libfreerdp-core / libfreerdp +- AC_CHECK_LIB([freerdp-core], [freerdp_new], +- [RDP_LIBS="$RDP_LIBS -lfreerdp-core"], +- [AC_CHECK_LIB([freerdp], [freerdp_new], +- [RDP_LIBS="$RDP_LIBS -lfreerdp -lfreerdp-client"], ++ AC_CHECK_LIB([freerdp1-core], [freerdp_new], ++ [RDP_LIBS="$RDP_LIBS -lfreerdp1-core"], ++ [AC_CHECK_LIB([freerdp1], [freerdp_new], ++ [RDP_LIBS="$RDP_LIBS -lfreerdp1 -lfreerdp1-client"], + [AC_MSG_WARN([ + -------------------------------------------- +- Unable to find libfreerdp-core / libfreerdp ++ Unable to find libfreerdp1-core / libfreerdp1 + RDP will be disabled. + --------------------------------------------]) + have_freerdp=no])]) +@@ -405,33 +405,33 @@ fi + # libfreerdp-cache + if test "x${have_freerdp}" = "xyes" + then +- AC_CHECK_LIB([freerdp-cache], [glyph_cache_register_callbacks], +- [RDP_LIBS="$RDP_LIBS -lfreerdp-cache"]) ++ AC_CHECK_LIB([freerdp1-cache], [glyph_cache_register_callbacks], ++ [RDP_LIBS="$RDP_LIBS -lfreerdp1-cache"]) + fi + + # libfreerdp-channels (1.0) / libfreerdp-client + libfreerdp-core (1.1) + if test "x${have_freerdp}" = "xyes" + then +- AC_CHECK_LIB([freerdp-client], [freerdp_channels_new], +- [RDP_LIBS="$RDP_LIBS -lfreerdp-client"], +- [AC_CHECK_LIB([freerdp-channels], [freerdp_channels_new], +- [RDP_LIBS="$RDP_LIBS -lfreerdp-channels" ++ AC_CHECK_LIB([freerdp1-client], [freerdp_channels_new], ++ [RDP_LIBS="$RDP_LIBS -lfreerdp1-client"], ++ [AC_CHECK_LIB([freerdp1-channels], [freerdp_channels_new], ++ [RDP_LIBS="$RDP_LIBS -lfreerdp1-channels" + legacy_freerdp_extensions=yes])], +- [-lfreerdp-core]) ++ [-lfreerdp1-core]) + fi + + # libfreerdp-utils + if test "x${have_freerdp}" = "xyes" + then +- AC_CHECK_LIB([freerdp-utils], [svc_plugin_init], +- [RDP_LIBS="$RDP_LIBS -lfreerdp-utils"]) ++ AC_CHECK_LIB([freerdp1-utils], [svc_plugin_init], ++ [RDP_LIBS="$RDP_LIBS -lfreerdp1-utils"]) + fi + + # libfreerdp-codec + if test "x${have_freerdp}" = "xyes" + then +- AC_CHECK_LIB([freerdp-codec], [freerdp_image_convert], +- [RDP_LIBS="$RDP_LIBS -lfreerdp-codec"]) ++ AC_CHECK_LIB([freerdp1-codec], [freerdp_image_convert], ++ [RDP_LIBS="$RDP_LIBS -lfreerdp1-codec"]) + fi + + # Available color conversion functions diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile index 1f5486d437a8..beed9f1e6c7f 100644 --- a/net/vinagre/Makefile +++ b/net/vinagre/Makefile @@ -11,7 +11,13 @@ DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= VNC client for the GNOME Desktop -BUILD_DEPENDS= itstool:textproc/itstool +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING + +BUILD_DEPENDS= appstream-glib>=0:devel/appstream-glib \ + itstool:textproc/itstool \ + gnome-autogen.sh:devel/gnome-common \ + yelp-tools>=0:textproc/yelp-tools LIB_DEPENDS= libgtk-vnc-2.0.so:net/gtk-vnc \ libgdbm.so:databases/gdbm \ libsecret-1.so:security/libsecret @@ -19,8 +25,8 @@ RUN_DEPENDS= gnome-icon-theme>=0:misc/gnome-icon-theme PORTSCOUT= limitw:1,even -USES= desktop-file-utils gettext gmake gnome pathfix pkgconfig \ - shared-mime-info tar:xz +USES= autoreconf desktop-file-utils gettext gmake gnome pathfix \ + pkgconfig shared-mime-info tar:xz USE_GNOME= gtk30 intlhack libxml2 vte3 GNU_CONFIGURE= yes INSTALLS_ICONS= yes diff --git a/net/vinagre/files/patch-configure.ac b/net/vinagre/files/patch-configure.ac new file mode 100644 index 000000000000..ab515fe71f14 --- /dev/null +++ b/net/vinagre/files/patch-configure.ac @@ -0,0 +1,30 @@ +From 8d072483ffff3a4e752c35811fb562f61d206f68 Mon Sep 17 00:00:00 2001 +From: Adam Williamson <awilliam@redhat.com> +Date: Fri, 22 Apr 2016 14:54:09 -0700 +Subject: [PATCH] handle new freerdp pkgconfig name + +freerdp has now changed its pkgconfig name to 'freerdp2' - +https://github.com/FreeRDP/FreeRDP/commit/6fa36081 . Assuming +we can build against both 1 and 2, we should handle both names. +--- configure.ac.orig 2016-09-20 06:02:32 UTC ++++ configure.ac +@@ -59,6 +59,7 @@ AM_CONDITIONAL([VINAGRE_ENABLE_SSH], [te + + # Whether to enable support for RDP. + RDP_DEPS="freerdp x11" ++RDP_2_DEPS="freerdp2 x11" + AC_ARG_ENABLE([rdp], + [AS_HELP_STRING([--disable-rdp], + [Disable Remote Desktop Protocol (RDP) support])]) +@@ -68,7 +69,10 @@ AS_IF([test "x$enable_rdp" != "xno"], + [have_rdp=yes + PKG_CHECK_EXISTS(freerdp >= 1.1, + [AC_DEFINE([HAVE_FREERDP_1_1], [1], [FreeRDP is of version 1.1 or newer])], [])], +- [have_rdp=no])], ++ [PKG_CHECK_EXISTS([$RDP_2_DEPS], ++ [have_rdp=yes ++ RDP_DEPS=$RDP_2_DEPS ++ AC_DEFINE([HAVE_FREERDP_1_1], [1], [FreeRDP is of version 1.1 or newer])], [have_rdp=no])])], + [have_rdp=no]) + + AS_IF([test "x$have_rdp" = "xyes"], diff --git a/net/vinagre/files/patch-plugins_rdp_vinagre-rdp-tab.c b/net/vinagre/files/patch-plugins_rdp_vinagre-rdp-tab.c new file mode 100644 index 000000000000..d218be2d9493 --- /dev/null +++ b/net/vinagre/files/patch-plugins_rdp_vinagre-rdp-tab.c @@ -0,0 +1,119 @@ +--- plugins/rdp/vinagre-rdp-tab.c.orig 2015-10-06 15:40:06 UTC ++++ plugins/rdp/vinagre-rdp-tab.c +@@ -476,16 +476,18 @@ frdp_drawing_area_draw (GtkWidget *area, + return TRUE; + } + +-static void ++static BOOL + frdp_begin_paint (rdpContext *context) + { + rdpGdi *gdi = context->gdi; + + gdi->primary->hdc->hwnd->invalid->null = 1; + gdi->primary->hdc->hwnd->ninvalid = 0; ++ ++ return TRUE; + } + +-static void ++static BOOL + frdp_end_paint (rdpContext *context) + { + VinagreRdpTab *rdp_tab = ((frdpContext *) context)->rdp_tab; +@@ -495,7 +497,7 @@ frdp_end_paint (rdpContext *context) + gint x, y, w, h; + + if (gdi->primary->hdc->hwnd->invalid->null) +- return; ++ return FALSE; + + x = gdi->primary->hdc->hwnd->invalid->x; + y = gdi->primary->hdc->hwnd->invalid->y; +@@ -517,6 +519,8 @@ frdp_end_paint (rdpContext *context) + { + gtk_widget_queue_draw_area (priv->display, x, y, w, h); + } ++ ++ return TRUE; + } + + static BOOL +@@ -591,11 +595,15 @@ frdp_post_connect (freerdp *instance) + #if defined(FREERDP_VERSION_MAJOR) && defined(FREERDP_VERSION_MINOR) && \ + !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && \ + FREERDP_VERSION_MINOR >= 2)) +- CLRBUF_24BPP, ++ CLRBUF_24BPP, NULL + #else +- CLRBUF_32BPP, ++#ifdef CLRBUF_32BPP ++ CLRBUF_32BPP, NULL ++#else ++ PIXEL_FORMAT_BGRA32 ++#endif + #endif +- NULL); ++ ); + gdi = instance->context->gdi; + + instance->update->BeginPaint = frdp_begin_paint; +@@ -862,7 +870,7 @@ frdp_mouse_moved (GtkWidget *widget + return TRUE; + } + +-static gboolean ++static BOOL + frdp_authenticate (freerdp *instance, + char **username, + char **password, +@@ -934,11 +942,13 @@ frdp_authenticate (freerdp *instance, + return TRUE; + } + +-static BOOL +-frdp_certificate_verify (freerdp *instance, +- char *subject, +- char *issuer, +- char *fingerprint) ++static DWORD ++frdp_certificate_verify (freerdp *instance, ++ const char *common_name, ++ const char *subject, ++ const char *issuer, ++ const char *fingerprint, ++ BOOL host_mismatch) + { + VinagreTab *tab = VINAGRE_TAB (((frdpContext *) instance->context)->rdp_tab); + GtkBuilder *builder; +@@ -973,12 +983,15 @@ frdp_certificate_verify (freerdp *instan + + + #if HAVE_FREERDP_1_1 +-static BOOL +-frdp_changed_certificate_verify (freerdp *instance, +- char *subject, +- char *issuer, +- char *new_fingerprint, +- char *old_fingerprint) ++static DWORD ++frdp_changed_certificate_verify (freerdp *instance, ++ const char *common_name, ++ const char *subject, ++ const char *issuer, ++ const char *new_fingerprint, ++ const char *old_subject, ++ const char *old_issuer, ++ const char *old_fingerprint) + { + VinagreTab *tab = VINAGRE_TAB (((frdpContext *) instance->context)->rdp_tab); + GtkBuilder *builder; +@@ -1108,7 +1107,7 @@ open_freerdp (VinagreRdpTab *rdp_tab) + settings->encryption_level = ENCRYPTION_LEVEL_CLIENT_COMPATIBLE; + #endif + #include <freerdp/version.h> +-#if (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2 && FREERDP_VERSION_REVISION >= 1) ++#if (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2 && FREERDP_VERSION_REVISION >= 1) || (FREERDP_VERSION_MAJOR == 2) + settings->UseRdpSecurityLayer = FALSE; + #else + settings->DisableEncryption = FALSE; |