gentoo resync : 18.11.2018

5 files changed, 78 insertions, 7 deletions

diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index ddf3076d9f30..661e8c4f20f5 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,6 +1,8 @@
+AUX avidemux-2.7.0-glibc-2.27.patch 872 BLAKE2B 2edd751aa7de1d6b4ed6d6dc12bff1f02e54e4950b8402cd531776bba7be1481c205ee3b11249addfe759c2d730db0831280e6bdcafb470a683220242ee79937 SHA512 3bf0bc7b15cb50141b5ec771dcee97971d2889af8913c9d825a3d6cc929143eabf04af76d033257722cb6be90f966a34e3ba2c069470cfb6097bc959bb0feead
+AUX avidemux-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-2.6.20-r1.ebuild 4366 BLAKE2B cf89350d867c09eb88d6efa63c1ef56d28eba7cb7b137b599d2431c9c129957296536d96438bc1d5f627110ef7cfa9b62fa29fdadd0b8eb287407e03251aad80 SHA512 7fb00801367a6c0adbe85641c28b4e09dc1ffcc8493e8066ae734a85e75cd957afb6b0366526e1fae1d072c6bc6c05b8fb1622491d97cfeedea0f715f9bd7988
-EBUILD avidemux-2.7.0.ebuild 4445 BLAKE2B 8b58ee4acaaccf1c6335964b7953fc30799711eb4896d37367463b4131e097bf417cd5dd381eacb15933bcb6fa62cb3624b4b2c77f0e4610fac6e0bebe2d0acf SHA512 e4e763c2ca67be1786cd785f6bf5bb1647cc9faacde334b56103fe4d3a3fcc26b2cee20761a56b680e371334de8fffc019e278566629db5b2bd61133984edc3b
-EBUILD avidemux-9999.ebuild 4445 BLAKE2B 8b58ee4acaaccf1c6335964b7953fc30799711eb4896d37367463b4131e097bf417cd5dd381eacb15933bcb6fa62cb3624b4b2c77f0e4610fac6e0bebe2d0acf SHA512 e4e763c2ca67be1786cd785f6bf5bb1647cc9faacde334b56103fe4d3a3fcc26b2cee20761a56b680e371334de8fffc019e278566629db5b2bd61133984edc3b
+EBUILD avidemux-2.7.0.ebuild 4518 BLAKE2B 6eb480a6467eb5a734891ffeefbbb0a37abbb83469ca12a090c18502e3a3836701ef43439681e51ac5f3259af368f6b045c830207b05b5df7febbbf70a534b66 SHA512 5d7c46c56e237386d0c9e8c74ddfe5f25aa3e510a0e7683c91880a863fe40d51e3d5d4661cb670af25c6ff7a43264a303f74e9a7c9033bf0daa3d3d55968a8d0
+EBUILD avidemux-9999.ebuild 4432 BLAKE2B 4b1c6dd8436233da06e74f0bbffa6881d545c49a187489660746653111b7b40845f286a7e843c824020edc14cd645c60c7c3b90ed6bc9868d6cebdd2c7bd6e05 SHA512 35a665d74df41a431551500be75c186d686a28bd6e208d02575226bfa3f8c9c8424234a3628475893f6235759a0882639d59bedc52e7e8039018c18a02c28bdc
 MISC metadata.xml 489 BLAKE2B 51c28e4d932facf14fe99d0d18e736f16c754961e8fde468505f03c989e8ec3cb9afab9c916752468a5f9f0a07ad8d25da01e64cb987cfed1db835f657512b1e SHA512 7a1b885e05a9bb6684583dcaefc5853903330bbcfc6b1e07b76cde7405894d94e0f095fcfe18bc33bc24c1bbf260814c9ebb8219397e0e861a2fb5977361bc4d
diff --git a/media-video/avidemux/avidemux-2.7.0.ebuild b/media-video/avidemux/avidemux-2.7.0.ebuild
index 3408af19d4a3..3a66ade975eb 100644
--- a/media-video/avidemux/avidemux-2.7.0.ebuild
+++ b/media-video/avidemux/avidemux-2.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -46,7 +46,8 @@ PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]"
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	default
+	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/avidemux-9999.ebuild b/media-video/avidemux/avidemux-9999.ebuild
index 3408af19d4a3..6d44aea9bcd2 100644
--- a/media-video/avidemux/avidemux-9999.ebuild
+++ b/media-video/avidemux/avidemux-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -46,8 +46,6 @@ PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]"
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	default
-
 	processes="buildCli:avidemux/cli"
 	if use qt5 ; then
 		processes+=" buildQt4:avidemux/qt4"
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