1 |
commit: 3fded280bebd469895db6adefa8b2394309eddca |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Aug 17 21:15:29 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Aug 17 22:02:02 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fded280 |
7 |
|
8 |
media-libs/avidemux-plugins: Fix build with Qt 5.11 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/659330 |
11 |
Package-Manager: Portage-2.3.46, Repoman-2.3.10 |
12 |
|
13 |
.../avidemux-plugins/avidemux-plugins-2.7.0.ebuild | 5 ++- |
14 |
.../files/avidemux-plugins-2.7.0-qt-5.11.patch | 48 ++++++++++++++++++++++ |
15 |
2 files changed, 52 insertions(+), 1 deletion(-) |
16 |
|
17 |
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild |
18 |
index 2556ab1d6c6..1c70e135cbf 100644 |
19 |
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild |
20 |
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild |
21 |
@@ -83,7 +83,10 @@ RDEPEND="${COMMON_DEPEND} |
22 |
|
23 |
S="${WORKDIR}/${MY_P}" |
24 |
|
25 |
-PATCHES=( "${FILESDIR}"/${PN}-2.6.20-optional-pulse.patch ) |
26 |
+PATCHES=( |
27 |
+ "${FILESDIR}"/${PN}-2.6.20-optional-pulse.patch |
28 |
+ "${FILESDIR}"/${P}-qt-5.11.patch |
29 |
+) |
30 |
|
31 |
src_prepare() { |
32 |
default |
33 |
|
34 |
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 |
35 |
new file mode 100644 |
36 |
index 00000000000..8ac9bbc3b4a |
37 |
--- /dev/null |
38 |
+++ b/media-libs/avidemux-plugins/files/avidemux-plugins-2.7.0-qt-5.11.patch |
39 |
@@ -0,0 +1,48 @@ |
40 |
+From ba667da44fcb88ee660339e52859bb90dc1b00d3 Mon Sep 17 00:00:00 2001 |
41 |
+From: mean <fixounet@××××.fr> |
42 |
+Date: Wed, 30 May 2018 07:31:03 +0200 |
43 |
+Subject: [PATCH] [Qt] Compatibilty patch with newer qt (>=5.11), patch by |
44 |
+ Chris Clayton |
45 |
+ |
46 |
+--- |
47 |
+ avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp | 1 + |
48 |
+ avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp | 1 + |
49 |
+ avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp | 1 + |
50 |
+ 3 files changed, 3 insertions(+) |
51 |
+ |
52 |
+diff --git a/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp b/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp |
53 |
+index 256f69d5e..54b0ac639 100644 |
54 |
+--- a/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp |
55 |
++++ b/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp |
56 |
+@@ -17,6 +17,7 @@ |
57 |
+ #include "ADM_coreJobs.h" |
58 |
+ #include "DIA_coreToolkit.h" |
59 |
+ #include <QtCore/QDir> |
60 |
++#include <QAction> |
61 |
+ |
62 |
+ extern void loadTranslator(void); |
63 |
+ extern void initTranslator(void); |
64 |
+diff --git a/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp b/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp |
65 |
+index 85cec5f9a..f537995ca 100644 |
66 |
+--- a/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp |
67 |
++++ b/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp |
68 |
+@@ -21,6 +21,7 @@ |
69 |
+ #include "ADM_memsupport.h" |
70 |
+ #include "ADM_crashdump.h" |
71 |
+ #include "ADM_win32.h" |
72 |
++#include <QAction> |
73 |
+ |
74 |
+ void onexit( void ); |
75 |
+ |
76 |
+diff --git a/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp b/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp |
77 |
+index 94bdd577e..b2a01e54b 100644 |
78 |
+--- a/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp |
79 |
++++ b/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp |
80 |
+@@ -17,6 +17,7 @@ |
81 |
+ #include "Q_eq2.h" |
82 |
+ #include "ADM_toolkitQt.h" |
83 |
+ #include <QSignalMapper> |
84 |
++#include <QAction> |
85 |
+ |
86 |
+ // |
87 |
+ // Video is in YV12 Colorspace |
88 |
\ No newline at end of file |