diff --git a/common/shlibs b/common/shlibs index 23426745318..cec98fee4d9 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1516,6 +1516,10 @@ libwiretap.so.7 libwireshark-2.4.1_1 libwireshark.so.10 libwireshark-2.4.1_1 libwsutil.so.8 libwireshark-2.4.1_1 libtaskmanager.so.6 plasma-workspace-5.8.4_1 +libfreerdp-client2.so.2 libfreerdp-2.0.0rc1_1 +libfreerdp2.so.2 libfreerdp-2.0.0rc1_1 +libwinpr2.so.2 libfreerdp-2.0.0rc1_1 +libwinpr-tools2.so.2 libfreerdp-2.0.0rc1_1 libfreerdp-core.so.1.0 libfreerdp-1.0.2_2 libfreerdp-channels.so.1.0 libfreerdp-1.0.2_2 libfreerdp-rail.so.1.0 libfreerdp-1.0.2_2 diff --git a/srcpkgs/freerdp/patches/ffmpeg2.0.patch b/srcpkgs/freerdp/patches/ffmpeg2.0.patch deleted file mode 100644 index 63688b7acfc..00000000000 --- a/srcpkgs/freerdp/patches/ffmpeg2.0.patch +++ /dev/null @@ -1,75 +0,0 @@ ---- channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c 2013-01-02 22:46:59.000000000 +0100 -+++ channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c 2013-07-22 18:12:18.001576713 +0200 -@@ -28,6 +28,8 @@ - #include "tsmf_constants.h" - #include "tsmf_decoder.h" - -+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 -+ - /* Compatibility with older FFmpeg */ - #if LIBAVUTIL_VERSION_MAJOR < 50 - #define AVMEDIA_TYPE_VIDEO 0 -@@ -39,7 +41,7 @@ typedef struct _TSMFFFmpegDecoder - ITSMFDecoder iface; - - int media_type; -- enum CodecID codec_id; -+ enum AVCodecID codec_id; - AVCodecContext* codec_context; - AVCodec* codec; - AVFrame* frame; -@@ -54,7 +56,7 @@ static boolean tsmf_ffmpeg_init_context( - { - TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder; - -- mdecoder->codec_context = avcodec_alloc_context(); -+ mdecoder->codec_context = avcodec_alloc_context3(NULL); - if (!mdecoder->codec_context) - { - DEBUG_WARN("avcodec_alloc_context failed."); -@@ -88,16 +90,6 @@ static boolean tsmf_ffmpeg_init_audio_st - mdecoder->codec_context->channels = media_type->Channels; - mdecoder->codec_context->block_align = media_type->BlockAlign; - --#ifdef AV_CPU_FLAG_SSE2 -- mdecoder->codec_context->dsp_mask = AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2; --#else --#if LIBAVCODEC_VERSION_MAJOR < 53 -- mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMXEXT; --#else -- mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMX2; --#endif --#endif -- - return true; - } - -@@ -174,7 +166,7 @@ static boolean tsmf_ffmpeg_prepare(ITSMF - { - TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder; - -- if (avcodec_open(mdecoder->codec_context, mdecoder->codec) < 0) -+ if (avcodec_open2(mdecoder->codec_context, mdecoder->codec, NULL) < 0) - { - DEBUG_WARN("avcodec_open failed."); - return false; -@@ -372,8 +364,9 @@ static boolean tsmf_ffmpeg_decode_audio( - av_init_packet(&pkt); - pkt.data = (uint8*) src; - pkt.size = src_size; -- len = avcodec_decode_audio3(mdecoder->codec_context, -- (int16_t*) dst, &frame_size, &pkt); -+ AVFrame * frame = avcodec_alloc_frame (); -+ len = avcodec_decode_audio4(mdecoder->codec_context, -+ frame, &frame_size, &pkt); - } - #endif - if (len <= 0 || frame_size <= 0) -@@ -499,7 +492,6 @@ TSMFDecoderEntry(void) - - if (!initialized) - { -- avcodec_init(); - avcodec_register_all(); - initialized = true; - } diff --git a/srcpkgs/freerdp/patches/ffmpeg3.x.patch b/srcpkgs/freerdp/patches/ffmpeg3.x.patch deleted file mode 100644 index 1c575b3702e..00000000000 --- a/srcpkgs/freerdp/patches/ffmpeg3.x.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c 2016-09-22 19:09:13.429317530 +0200 -+++ channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c 2016-09-22 19:11:31.976367968 +0200 -@@ -195,28 +195,28 @@ - switch (media_type->SubType) - { - case TSMF_SUB_TYPE_WVC1: -- mdecoder->codec_id = CODEC_ID_VC1; -+ mdecoder->codec_id = AV_CODEC_ID_VC1; - break; - case TSMF_SUB_TYPE_WMA2: -- mdecoder->codec_id = CODEC_ID_WMAV2; -+ mdecoder->codec_id = AV_CODEC_ID_WMAV2; - break; - case TSMF_SUB_TYPE_WMA9: -- mdecoder->codec_id = CODEC_ID_WMAPRO; -+ mdecoder->codec_id = AV_CODEC_ID_WMAPRO; - break; - case TSMF_SUB_TYPE_MP3: -- mdecoder->codec_id = CODEC_ID_MP3; -+ mdecoder->codec_id = AV_CODEC_ID_MP3; - break; - case TSMF_SUB_TYPE_MP2A: -- mdecoder->codec_id = CODEC_ID_MP2; -+ mdecoder->codec_id = AV_CODEC_ID_MP2; - break; - case TSMF_SUB_TYPE_MP2V: -- mdecoder->codec_id = CODEC_ID_MPEG2VIDEO; -+ mdecoder->codec_id = AV_CODEC_ID_MPEG2VIDEO; - break; - case TSMF_SUB_TYPE_WMV3: -- mdecoder->codec_id = CODEC_ID_WMV3; -+ mdecoder->codec_id = AV_CODEC_ID_WMV3; - break; - case TSMF_SUB_TYPE_AAC: -- mdecoder->codec_id = CODEC_ID_AAC; -+ mdecoder->codec_id = AV_CODEC_ID_AAC; - /* For AAC the pFormat is a HEAACWAVEINFO struct, and the codec data - is at the end of it. See - http://msdn.microsoft.com/en-us/library/dd757806.aspx */ -@@ -228,10 +228,10 @@ - break; - case TSMF_SUB_TYPE_H264: - case TSMF_SUB_TYPE_AVC1: -- mdecoder->codec_id = CODEC_ID_H264; -+ mdecoder->codec_id = AV_CODEC_ID_H264; - break; - case TSMF_SUB_TYPE_AC3: -- mdecoder->codec_id = CODEC_ID_AC3; -+ mdecoder->codec_id = AV_CODEC_ID_AC3; - break; - default: - return false; -@@ -438,7 +438,7 @@ - - switch (mdecoder->codec_context->pix_fmt) - { -- case PIX_FMT_YUV420P: -+ case AV_PIX_FMT_YUV420P: - return RDP_PIXFMT_I420; - - default: diff --git a/srcpkgs/freerdp/patches/libressl.patch b/srcpkgs/freerdp/patches/libressl.patch new file mode 100644 index 00000000000..1f2b2dc59bc --- /dev/null +++ b/srcpkgs/freerdp/patches/libressl.patch @@ -0,0 +1,20 @@ +--- winpr/libwinpr/utils/ssl.c.orig 2017-11-28 15:26:30.000000000 +0100 ++++ winpr/libwinpr/utils/ssl.c 2018-01-10 10:28:17.187304871 +0100 +@@ -279,7 +279,7 @@ + + if (flags & WINPR_SSL_INIT_ENABLE_FIPS) + { +-#if (OPENSSL_VERSION_NUMBER < 0x10001000L) ++#if (OPENSSL_VERSION_NUMBER < 0x10001000L) || defined(LIBRESSL_VERSION_NUMBER) + WLog_ERR(TAG, "Openssl fips mode ENable not available on openssl versions less than 1.0.1!"); + #else + WLog_DBG(TAG, "Ensuring openssl fips mode is ENabled"); +@@ -348,7 +348,7 @@ + + BOOL winpr_FIPSMode(void) + { +-#if (OPENSSL_VERSION_NUMBER < 0x10001000L) ++#if (OPENSSL_VERSION_NUMBER < 0x10001000L) || defined(LIBRESSL_VERSION_NUMBER) + return FALSE; + #else + return (FIPS_mode() == 1); diff --git a/srcpkgs/freerdp/patches/patch-libfreerdp-core_ntlmssp_c.diff b/srcpkgs/freerdp/patches/patch-libfreerdp-core_ntlmssp_c.diff deleted file mode 100644 index e78670b46f4..00000000000 --- a/srcpkgs/freerdp/patches/patch-libfreerdp-core_ntlmssp_c.diff +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-libfreerdp-core_ntlmssp_c,v 1.1 2014/04/14 17:10:56 naddy Exp $ ---- libfreerdp-core/ntlmssp.c.orig Wed Jan 2 22:46:59 2013 -+++ libfreerdp-core/ntlmssp.c Mon Apr 14 18:48:37 2014 -@@ -456,7 +456,7 @@ void ntlmssp_compute_lm_hash(char* password, char* has - char text[14]; - char des_key1[8]; - char des_key2[8]; -- des_key_schedule ks; -+ DES_key_schedule ks; - - /* LM("password") = E52CAC67419A9A224A3B108F3FA6CB6D */ - -@@ -530,7 +530,7 @@ void ntlmssp_compute_lm_response(char* password, char* - char des_key1[8]; - char des_key2[8]; - char des_key3[8]; -- des_key_schedule ks; -+ DES_key_schedule ks; - - /* A LM hash is 16-bytes long, but the LM response uses a LM hash null-padded to 21 bytes */ - memset(hash, '\0', 21); diff --git a/srcpkgs/freerdp/patches/patch-libfreerdp-core_tls_c.diff b/srcpkgs/freerdp/patches/patch-libfreerdp-core_tls_c.diff deleted file mode 100644 index edd07e6af8e..00000000000 --- a/srcpkgs/freerdp/patches/patch-libfreerdp-core_tls_c.diff +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-libfreerdp-core_tls_c,v 1.1 2015/02/08 04:55:00 jsing Exp $ ---- libfreerdp-core/tls.c.orig Sun Feb 8 04:08:05 2015 -+++ libfreerdp-core/tls.c Sun Feb 8 04:12:11 2015 -@@ -44,6 +44,13 @@ boolean tls_connect(rdpTls* tls) - */ - SSL_CTX_set_options(tls->ctx, SSL_OP_ALL); - -+ /* -+ * Disable the SSL 3.0/TLS 1.0 CBC vulnerability workaround since this -+ * breaks NLA - the remote host will return a TLS alert 50, terminating -+ * the session. -+ */ -+ SSL_CTX_set_options(tls->ctx, SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS); -+ - tls->ssl = SSL_new(tls->ctx); - - if (tls->ssl == NULL) diff --git a/srcpkgs/freerdp/patches/patch_numblock.patch b/srcpkgs/freerdp/patches/patch_numblock.patch deleted file mode 100644 index 11a386f8c88..00000000000 --- a/srcpkgs/freerdp/patches/patch_numblock.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- include/freerdp/kbd/vkcodes.h 2013-09-19 12:46:07.124339712 +0200 -+++ include/freerdp/kbd/vkcodes.h 2013-09-19 12:45:51.621005583 +0200 -@@ -434,7 +434,7 @@ - { 0x00, 0, "VK_SEPARATOR" , NULL }, - { 0x4A, 0, "VK_SUBTRACT" , "KPSU" }, - { 0x53, 0, "VK_DECIMAL" , "KPDL" }, -- { 0x35, 0, "VK_DIVIDE" , "KPDV" }, -+ { 0x35, 1, "VK_DIVIDE" , "KPDV" }, - { 0x3B, 0, "VK_F1" , "FK01" }, - { 0x3C, 0, "VK_F2" , "FK02" }, - { 0x3D, 0, "VK_F3" , "FK03" }, diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template index 684c18683c7..c34fd9477dd 100644 --- a/srcpkgs/freerdp/template +++ b/srcpkgs/freerdp/template @@ -1,24 +1,24 @@ # Template file for 'freerdp' pkgname=freerdp -version=1.0.2 -revision=14 -wrksrc="FreeRDP-${version}" +version=2.0.0rc1 +revision=1 +wrksrc="FreeRDP-${version/r/-r}" build_style=cmake configure_args="-DWITH_JPEG=ON -DWITH_PULSE=ON -DWITH_XINERAMA=ON -DWITH_XEXT=ON -DWITH_XCURSOR=ON -DWITH_XI=ON -DWITH_XRENDER=ON -DWITH_XV=ON - -DWITH_XKBFILE=ON -DWITH_FFMPEG=ON -DWITH_GSTREAMER=OFF -DWITH_ALSA=ON - -DWITH_CUPS=OFF -DWITH_PCSC=OFF" -hostmakedepends="pkg-config" + -DWITH_XKBFILE=ON -DWITH_FFMPEG=ON -DWITH_GSTREAMER_0_10=OFF -DWITH_GSTREAMER_1_0=OFF -DWITH_ALSA=ON + -DWITH_CUPS=OFF -DWITH_PCSC=OFF -DWITH_LIBSYSTEMD=OFF -DWITH_WAYLAND=OFF" +hostmakedepends="pkg-config xmlto" makedepends=" alsa-lib-devel libjpeg-turbo-devel pulseaudio-devel libXinerama-devel - libXext-devel libXcursor-devel libXi-devel libXrender-devel libXv-devel - libxkbfile-devel ffmpeg-devel libressl-devel zlib-devel" -short_desc="A Free RDP (Remote Desktop Protocol) client" + libXext-devel libXcursor-devel libXi-devel libXrandr-devel libXv-devel + libxkbfile-devel ffmpeg-devel glib-devel libressl-devel zlib-devel" +short_desc="Free RDP (Remote Desktop Protocol) client" maintainer="Juan RP " license="Apache-2.0" homepage="http://www.freerdp.com/" -distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz" -checksum=c0f137df7ab6fb76d7e7d316ae4e0ca6caf356e5bc0b5dadbdfadea5db992df1 +distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version/r/-r}.tar.gz" +checksum=a2c1c83072489d56da78bbe76c29729022f5c35a3ec3a1ce26cea8823de043c2 case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";; diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template index 41d1f0d7737..ff8f1e5447d 100644 --- a/srcpkgs/remmina/template +++ b/srcpkgs/remmina/template @@ -1,19 +1,26 @@ # Template file for 'remmina' pkgname=remmina -version=1.1.2 +version=1.2.0rc26 revision=1 +_gitrev=1.2.0-rcgit.26 +wrksrc="Remmina-${_gitrev}" build_style=cmake -configure_args="-DWITH_APPINDICATOR=OFF -DWITH_FREERDP=OFF" +configure_args="-DWITH_APPINDICATOR=OFF" hostmakedepends="intltool pkg-config" makedepends="avahi-glib-libs-devel avahi-ui-libs-devel - libgnome-keyring-devel libgcrypt-devel libssh-devel - libvncserver-devel libxkbfile-devel telepathy-glib-devel - vte290-devel" + freerdp-devel libgnome-keyring-devel libgcrypt-devel libssh-devel + libsecret-devel libvncserver-devel libxkbfile-devel telepathy-glib-devel + vte3-devel" depends="desktop-file-utils hicolor-icon-theme" maintainer="cr6git " short_desc="Remote desktop client written in GTK+" homepage="http://www.remmina.org/wp/" license="GPL-2" -distfiles="https://github.com/FreeRDP/Remmina/archive/v${version}.tar.gz" -checksum=2a075135e3c1a410ee0431f36a6795e2ac556b65fb82231e4126b5c372ca8cef -wrksrc="Remmina-${version}" +distfiles="https://github.com/FreeRDP/Remmina/archive/v${_gitrev}.tar.gz" +checksum=180202126617e4286b255ef23aa75f0eb782db2ca4657af140d5e62226ce8661 + +case "$XBPS_TARGET_MACHINE" in + *-musl) makedepends+=" libexecinfo-devel" ;; + *) ;; +esac +