From 2c9ee8de140f4dabaa3ac1ec67fc908bd81667e3 Mon Sep 17 00:00:00 2001 From: miqlas <5569059+extrowerk@users.noreply.github.com> Date: Sun, 26 Aug 2018 18:08:46 +0200 Subject: [PATCH] Retroshare: build fix (#2960) --- .../patches/retroshare-0.6.4.patchset | 108 +++++++++++++++++- net-p2p/retroshare/retroshare-0.6.4.recipe | 2 +- 2 files changed, 107 insertions(+), 3 deletions(-) diff --git a/net-p2p/retroshare/patches/retroshare-0.6.4.patchset b/net-p2p/retroshare/patches/retroshare-0.6.4.patchset index c800eb2e6..9ae7d25bd 100644 --- a/net-p2p/retroshare/patches/retroshare-0.6.4.patchset +++ b/net-p2p/retroshare/patches/retroshare-0.6.4.patchset @@ -1,4 +1,4 @@ -From 55856cf2b700b19d4fdae1665520ff87610a7d30 Mon Sep 17 00:00:00 2001 +From 2234cab640683b6ff0bb02256ba4fc34ff3df995 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= Date: Mon, 9 Apr 2018 23:50:00 +0200 Subject: Haiku supporting patches @@ -188,5 +188,109 @@ index ff6038d..0d2b235 100644 return (QDir::homePath() + "/.RetroShare"); #endif -- -2.16.2 +2.16.4 + + +From c7b059fc343c08ed01aaf13feb2d6806a24b2b62 Mon Sep 17 00:00:00 2001 +From: sehraf +Date: Fri, 25 May 2018 23:12:35 +0200 +Subject: fix for Qt 5.11 + +Quote from Arch mailing list: +- there's been a huge header cleanup in Qt modules. Expect build failures for applications that rely on transitive includes instead of declaring all required headers. Those need to be fixed upstream by explicitely adding the missing includes. + +diff --git a/retroshare-gui/src/gui/Posted/PostedItem.cpp b/retroshare-gui/src/gui/Posted/PostedItem.cpp +index 7d70b3e..8fc1cc6 100644 +--- a/retroshare-gui/src/gui/Posted/PostedItem.cpp ++++ b/retroshare-gui/src/gui/Posted/PostedItem.cpp +@@ -22,6 +22,7 @@ + */ + + #include ++#include + + #include "rshare.h" + #include "PostedItem.h" +diff --git a/retroshare-gui/src/gui/chat/ChatTabWidget.cpp b/retroshare-gui/src/gui/chat/ChatTabWidget.cpp +index a965bbb..6a931b3 100644 +--- a/retroshare-gui/src/gui/chat/ChatTabWidget.cpp ++++ b/retroshare-gui/src/gui/chat/ChatTabWidget.cpp +@@ -20,6 +20,8 @@ + * Boston, MA 02110-1301, USA. + ****************************************************************/ + ++#include ++ + #include "ChatTabWidget.h" + #include "ui_ChatTabWidget.h" + #include "ChatDialog.h" +diff --git a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp +index d154408..7231764 100644 +--- a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp ++++ b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp +@@ -23,6 +23,7 @@ + + #include + #include ++#include + + #include "rshare.h" + #include "GxsChannelPostItem.h" +diff --git a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp +index 97ac9dd..e9773ab 100644 +--- a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp ++++ b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp +@@ -23,6 +23,7 @@ + + #include + #include ++#include + + #include "rshare.h" + #include "GxsForumMsgItem.h" +-- +2.16.4 + + +From 15e314540fbf36facca6af80d5b4810e73891623 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +Date: Sun, 26 Aug 2018 11:44:12 +0200 +Subject: FFMPEG4 adjustments + + +diff --git a/plugins/VOIP/gui/VideoProcessor.cpp b/plugins/VOIP/gui/VideoProcessor.cpp +index e781dcc..37cb298 100644 +--- a/plugins/VOIP/gui/VideoProcessor.cpp ++++ b/plugins/VOIP/gui/VideoProcessor.cpp +@@ -453,10 +453,10 @@ FFmpegVideo::FFmpegVideo() + encoding_context->rc_max_rate = 0; + encoding_context->rc_buffer_size = 0; + #endif +- if (encoding_codec->capabilities & CODEC_CAP_TRUNCATED) +- encoding_context->flags |= CODEC_FLAG_TRUNCATED; +- encoding_context->flags |= CODEC_FLAG_PSNR;//Peak signal-to-noise ratio +- encoding_context->flags |= CODEC_CAP_PARAM_CHANGE; ++ if (encoding_codec->capabilities & AV_CODEC_CAP_TRUNCATED) ++ encoding_context->flags |= AV_CODEC_FLAG_TRUNCATED; ++ encoding_context->flags |= AV_CODEC_FLAG_PSNR;//Peak signal-to-noise ratio ++ encoding_context->flags |= AV_CODEC_CAP_PARAM_CHANGE; + encoding_context->i_quant_factor = 0.769f; + encoding_context->b_quant_factor = 1.4f; + encoding_context->time_base.num = 1; +@@ -549,10 +549,10 @@ FFmpegVideo::FFmpegVideo() + decoding_context->pix_fmt = AV_PIX_FMT_YUV420P; + #endif + +- if(decoding_codec->capabilities & CODEC_CAP_TRUNCATED) +- decoding_context->flags |= CODEC_FLAG_TRUNCATED; // we do not send complete frames ++ if(decoding_codec->capabilities & AV_CODEC_CAP_TRUNCATED) ++ decoding_context->flags |= AV_CODEC_FLAG_TRUNCATED; // we do not send complete frames + //we can receive truncated frames +- decoding_context->flags2 |= CODEC_FLAG2_CHUNKS; ++ decoding_context->flags2 |= AV_CODEC_FLAG2_CHUNKS; + + AVDictionary* dictionary = NULL; + if(avcodec_open2(decoding_context, decoding_codec, &dictionary) < 0) +-- +2.16.4 diff --git a/net-p2p/retroshare/retroshare-0.6.4.recipe b/net-p2p/retroshare/retroshare-0.6.4.recipe index e7918004b..e43f86c9d 100644 --- a/net-p2p/retroshare/retroshare-0.6.4.recipe +++ b/net-p2p/retroshare/retroshare-0.6.4.recipe @@ -81,7 +81,7 @@ COPYRIGHT="2006-2014 RetroShare Team 2017 Konrad Dębiec" LICENSE="GNU GPL v2 GNU LGPL v2.1" -REVISION="3" +REVISION="4" SOURCE_URI="https://github.com/RetroShare/RetroShare/archive/v$portVersion.tar.gz" CHECKSUM_SHA256="84355c0f3be5ec1dfa7253e327ea1254f76f47739c233cfb8d0983ebd1a61f4a" SOURCE_DIR="RetroShare-$portVersion"