mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-20 22:27:17 -08:00
media-libs/avidemux-plugins: Fix build with Qt 5.11
Closes: https://bugs.gentoo.org/659330 Package-Manager: Portage-2.3.46, Repoman-2.3.10
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
Reference in New Issue
Block a user