gentoo resync : 18.11.2018

2 files changed, 70 insertions, 0 deletions

diff --git a/media-video/avidemux/files/avidemux-2.7.0-glibc-2.27.patch b/media-video/avidemux/files/avidemux-2.7.0-glibc-2.27.patch
new file mode 100644
index 000000000000..166791f4774a
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-2.7.0-glibc-2.27.patch
@@ -0,0 +1,22 @@
+From afdd9c4b876d77a4974d3fa7d9f25caeffbdf13d Mon Sep 17 00:00:00 2001
+From: eumagga0x2a <eumagga0x2a@users.noreply.github.com>
+Date: Fri, 29 Sep 2017 15:53:14 +0200
+Subject: [PATCH] [build] Fix compilation with glibc >= 2.27
+
+---
+ avidemux/common/ADM_audioFilter/src/audiofilter_normalize.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/avidemux/common/ADM_audioFilter/src/audiofilter_normalize.cpp b/avidemux/common/ADM_audioFilter/src/audiofilter_normalize.cpp
+index c6cb43bb6..269c2d2e3 100644
+--- a/avidemux/common/ADM_audioFilter/src/audiofilter_normalize.cpp
++++ b/avidemux/common/ADM_audioFilter/src/audiofilter_normalize.cpp
+@@ -35,7 +35,7 @@
+ #elif defined(ADM_BSD_FAMILY) || defined(__sun__)
+ #define POW10(x) powf(10.0,x)
+ #else
+-#define POW10(x)  pow10f(x)
++#define POW10(x) exp10f(x)
+ #endif
+ 
+ #define LINEAR_TO_DB(x) (20.*log10(x))
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