commit: 4124df76df6819eeebfb23bbe961c07a0b8646a9 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Jun 21 11:08:07 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Jun 21 11:37:40 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4124df76
media-video/avidemux: Fix build with Qt 5.15 Thanks-to: Petr Zima <zima <AT> matfyz.cz> Closes: https://bugs.gentoo.org/726322 Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-video/avidemux/avidemux-2.7.4-r1.ebuild | 13 ++++++------- media-video/avidemux/files/avidemux-2.7.4-qt-5.15.patch | 11 +++++++++++ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/media-video/avidemux/avidemux-2.7.4-r1.ebuild b/media-video/avidemux/avidemux-2.7.4-r1.ebuild index cc9638e1c58..ce223b81cf3 100644 --- a/media-video/avidemux/avidemux-2.7.4-r1.ebuild +++ b/media-video/avidemux/avidemux-2.7.4-r1.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 CMAKE_MAKEFILE_GENERATOR="emake" - inherit cmake desktop qmake-utils xdg DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks" @@ -17,7 +16,8 @@ SLOT="2.7" KEYWORDS="~amd64 ~x86" IUSE="debug nls nvenc opengl qt5 sdl vaapi vdpau xv" -COMMON_DEPEND=" +BDEPEND="qt5? ( dev-qt/linguist-tools:5 )" +DEPEND=" ~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?] nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) ) opengl? ( virtual/opengl:0 ) @@ -30,10 +30,7 @@ COMMON_DEPEND=" ) vaapi? ( x11-libs/libva:0= ) " -DEPEND="${COMMON_DEPEND} - qt5? ( dev-qt/linguist-tools:5 ) -" -RDEPEND="${COMMON_DEPEND} +RDEPEND="${DEPEND} nls? ( virtual/libintl:0 ) !<media-video/avidemux-${PV} " @@ -42,6 +39,8 @@ PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]" S="${WORKDIR}/avidemux2-${PV}" src_prepare() { + eapply "${FILESDIR}"/${P}-qt-5.15.patch + processes="buildCli:avidemux/cli" use qt5 && processes+=" buildQt4:avidemux/qt4" diff --git a/media-video/avidemux/files/avidemux-2.7.4-qt-5.15.patch b/media-video/avidemux/files/avidemux-2.7.4-qt-5.15.patch new file mode 100644 index 00000000000..5c92a561fd7 --- /dev/null +++ b/media-video/avidemux/files/avidemux-2.7.4-qt-5.15.patch @@ -0,0 +1,11 @@ +diff -ur avidemux2-2.7.4.orig/avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp avidemux2-2.7.4/avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp +--- a/avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp 2019-08-14 19:11:18.000000000 +0200 ++++ b/avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp 2020-05-30 20:45:53.304702855 +0200 +@@ -8,6 +8,7 @@ + ***************************************************************************/// + + #include <QPainter> ++#include <QPainterPath> + #include <QRubberBand> + #include <QBoxLayout> + #include <QSizeGrip>
