gentoo resync : 25.08.2018

3 files changed, 54 insertions, 2 deletions

diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
index 8e8758275e91..53d7e67c0c37 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -1,7 +1,8 @@
 AUX avidemux-plugins-2.6.20-optional-pulse.patch 743 BLAKE2B e60a7433e539d49d5bff7dea62bfda984866dd72b93158827ee5ed785d77174db3fbde9e67c9c3fdc8d652485d8e704c075811c65848ef48f78490c6a3061b7f SHA512 dcec29c63aa7eb828fc1aaf4b54edb76290e3c7655b00002efa8036f0572b1c0111c30e873b925bb606e8e672e177ba8d103100b1fb55dcc830b83e4a5556710
+AUX avidemux-plugins-2.7.0-qt-5.11.patch 1664 BLAKE2B 080497a678e869e143eb350ecdca2b77d5e5906a8a469e24f16fc58853665791dbbd94880418b492df6816b8f420d54ee7ecd06c805b0aab16e8d05ab43f545d SHA512 49186e7648db60e081f78e1257ea788313cac6e991c995249701189ab344744f0c410203b39b49e5530a8dd33de937582099eb8b615d19fe7d0e3731254d535c
 DIST avidemux_2.6.20.tar.gz 20172362 BLAKE2B d458749e470e60b133a177ddf97ee04a665da3f7b2c52e8cc51f907aa5b51d11338ddab9306603b615170b5cf75ec2d3444bd648756bdb724aa442abf7044553 SHA512 d01d0fc24a3004770bd3923c2debc4fa2752eb71df08cfe423746b9c44a2562ca01d82965ed2563b99572a4bed8034b79487199ce330208b51a3b7f87ccf7103
 DIST avidemux_2.7.0.tar.gz 21474504 BLAKE2B c6e55a0b5220d6d3746fa06162bf11253145fd28f2f6f744702d5e0342fba85e546a28883eb847139eadd34c94037ebc7d68f5576e7505a85288556468d14b96 SHA512 7c92213d3bd2849dbdb5a1aff2acd6da231fd76c561b756fbf4a1d5a41e9705d609d7a35b6ca6b77ceb3bf5138f861cd24ed16d8fcec4fd713f09a2ff07e9015
 EBUILD avidemux-plugins-2.6.20.ebuild 4638 BLAKE2B 1ab4804335317d6c12906ec9a000a38cf1665ebcd0223b8dc563ed75f9e23f0631125c5b6521611b96a375a509ad8b54ba82095cb6f626ff122904572a95e692 SHA512 48e038364240357a6c6328b101973b94dd3cc813273ae5e36711aa4b3121b0ac322d2577a0faca8a7455ae6e2063cb4e1b0db3100564f84a77c3a44e4154ddb2
-EBUILD avidemux-plugins-2.7.0.ebuild 4838 BLAKE2B 701319a074861f69f17ea4970006eedf087f5586197f6a9ab158f8120aaed817236f880a4f59d588534c474cf550ef37764f2f44f0f7cff7f0ee3d5c8bda0c3c SHA512 f3b4c8dad3e24a9af37b7593b7a9d6014960eae9ec91bf9422251148bf336a8a7015d72713d4541a8466bf3695707a47731f0373339c4d5343581260dd319b03
+EBUILD avidemux-plugins-2.7.0.ebuild 4873 BLAKE2B a9a95cea60229f38ac116166cb449f31c9035f6b59b7577d1ade5b19f4218b8977e89292583149284bb727048bb602b47e0a176bf586ca933b3c7c7b13f5c364 SHA512 5d5b7526d4857161530d3c969fed0bbb2eb8b44f073609447e6e62588cb8be137273971038dff24dd44fda8775ca07a0246db9be0c3e0f9661f1ca671096a822
 EBUILD avidemux-plugins-9999.ebuild 4838 BLAKE2B 701319a074861f69f17ea4970006eedf087f5586197f6a9ab158f8120aaed817236f880a4f59d588534c474cf550ef37764f2f44f0f7cff7f0ee3d5c8bda0c3c SHA512 f3b4c8dad3e24a9af37b7593b7a9d6014960eae9ec91bf9422251148bf336a8a7015d72713d4541a8466bf3695707a47731f0373339c4d5343581260dd319b03
 MISC metadata.xml 1406 BLAKE2B 11611c16434167ee45901a059c37d8802c7b605d21cee9f813982cd8e22e98aac1fa0921662178ef532ef060e7d2c61353a2e057caef3b63a9bf5df06fa6f2a6 SHA512 117225570689a4b78a36b18f5e6c50e185d2db2b10ba6d38869105fa5e718d5dc753eb151cba411df8eba48705e0eee29c2acae8c1a491cc343832d9cfa0290c
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild
index 2556ab1d6c62..1c70e135cbf6 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild
@@ -83,7 +83,10 @@ RDEPEND="${COMMON_DEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}"/${PN}-2.6.20-optional-pulse.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6.20-optional-pulse.patch
+	"${FILESDIR}"/${P}-qt-5.11.patch
+)
 
 src_prepare() {
 	default
diff --git a/media-libs/avidemux-plugins/files/avidemux-plugins-2.7.0-qt-5.11.patch b/media-libs/avidemux-plugins/files/avidemux-plugins-2.7.0-qt-5.11.patch
new file mode 100644
index 000000000000..8ac9bbc3b4ac
--- /dev/null
+++ b/media-libs/avidemux-plugins/files/avidemux-plugins-2.7.0-qt-5.11.patch
@@ -0,0 +1,48 @@
+From ba667da44fcb88ee660339e52859bb90dc1b00d3 Mon Sep 17 00:00:00 2001
+From: mean <fixounet@free.fr>
+Date: Wed, 30 May 2018 07:31:03 +0200
+Subject: [PATCH] [Qt] Compatibilty patch with newer qt (>=5.11), patch by
+ Chris Clayton
+
+---
+ avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp         | 1 +
+ avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp               | 1 +
+ avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp b/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp
+index 256f69d5e..54b0ac639 100644
+--- a/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp
++++ b/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp
+@@ -17,6 +17,7 @@
+ #include "ADM_coreJobs.h"
+ #include "DIA_coreToolkit.h"
+ #include <QtCore/QDir>
++#include <QAction>
+ 
+ extern void loadTranslator(void);
+ extern void initTranslator(void);
+diff --git a/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp b/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp
+index 85cec5f9a..f537995ca 100644
+--- a/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp
++++ b/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp
+@@ -21,6 +21,7 @@
+ #include "ADM_memsupport.h"
+ #include "ADM_crashdump.h"
+ #include "ADM_win32.h"
++#include <QAction>
+ 
+ void onexit( void );
+ 
+diff --git a/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp b/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp
+index 94bdd577e..b2a01e54b 100644
+--- a/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp
++++ b/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp
+@@ -17,6 +17,7 @@
+ #include "Q_eq2.h"
+ #include "ADM_toolkitQt.h"
+ #include <QSignalMapper>
++#include <QAction>
+ 
+ //
+ //	Video is in YV12 Colorspace
\ No newline at end of file