diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2018-11-08 18:38:37 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-11-08 18:38:37 +0100 |
commit | 6fabbd55dc849bfef5d90f2e3697d9275cd5adcd (patch) | |
tree | 8a9ead69814fa9e4c569295c87c1bbfd5bf70ccd /media-video/avidemux | |
parent | media-video/avidemux: Fix build with glibc-2.27 (diff) | |
download | gentoo-6fabbd55dc849bfef5d90f2e3697d9275cd5adcd.tar.gz gentoo-6fabbd55dc849bfef5d90f2e3697d9275cd5adcd.tar.bz2 gentoo-6fabbd55dc849bfef5d90f2e3697d9275cd5adcd.zip |
media-video/avidemux: Fix build with Qt 5.11
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'media-video/avidemux')
-rw-r--r-- | media-video/avidemux/avidemux-2.7.0.ebuild | 1 | ||||
-rw-r--r-- | media-video/avidemux/files/avidemux-2.7.0-qt-5.11.patch | 48 |
2 files changed, 49 insertions, 0 deletions
diff --git a/media-video/avidemux/avidemux-2.7.0.ebuild b/media-video/avidemux/avidemux-2.7.0.ebuild index 3a3537441542..3a66ade975eb 100644 --- a/media-video/avidemux/avidemux-2.7.0.ebuild +++ b/media-video/avidemux/avidemux-2.7.0.ebuild @@ -47,6 +47,7 @@ S="${WORKDIR}/${MY_P}" src_prepare() { eapply "${FILESDIR}/${P}-glibc-2.27.patch" + eapply "${FILESDIR}/${P}-qt-5.11.patch" processes="buildCli:avidemux/cli" if use qt5 ; then diff --git a/media-video/avidemux/files/avidemux-2.7.0-qt-5.11.patch b/media-video/avidemux/files/avidemux-2.7.0-qt-5.11.patch new file mode 100644 index 000000000000..8ac9bbc3b4ac --- /dev/null +++ b/media-video/avidemux/files/avidemux-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 |