From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2ACB6138334 for ; Fri, 17 Aug 2018 22:04:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 36219E08FA; Fri, 17 Aug 2018 22:04:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 02026E08FA for ; Fri, 17 Aug 2018 22:04:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7A68C335DB8 for ; Fri, 17 Aug 2018 22:04:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2164039E for ; Fri, 17 Aug 2018 22:04:16 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1534543322.3fded280bebd469895db6adefa8b2394309eddca.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-plugins/files/, media-libs/avidemux-plugins/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild media-libs/avidemux-plugins/files/avidemux-plugins-2.7.0-qt-5.11.patch X-VCS-Directories: media-libs/avidemux-plugins/files/ media-libs/avidemux-plugins/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 3fded280bebd469895db6adefa8b2394309eddca X-VCS-Branch: master Date: Fri, 17 Aug 2018 22:04:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 11b3b930-1e49-4b2a-8ac9-dd5307c592b5 X-Archives-Hash: a9768c33e4210d734c1c7f775722f63b commit: 3fded280bebd469895db6adefa8b2394309eddca Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Aug 17 21:15:29 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Aug 17 22:02:02 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fded280 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 .../avidemux-plugins/avidemux-plugins-2.7.0.ebuild | 5 ++- .../files/avidemux-plugins-2.7.0-qt-5.11.patch | 48 ++++++++++++++++++++++ 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild index 2556ab1d6c6..1c70e135cbf 100644 --- a/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild +++ b/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild @@ -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 diff --git a/media-libs/avidemux-plugins/files/avidemux-plugins-2.7.0-qt-5.11.patch b/media-libs/avidemux-plugins/files/avidemux-plugins-2.7.0-qt-5.11.patch new file mode 100644 index 00000000000..8ac9bbc3b4a --- /dev/null +++ b/media-libs/avidemux-plugins/files/avidemux-plugins-2.7.0-qt-5.11.patch @@ -0,0 +1,48 @@ +From ba667da44fcb88ee660339e52859bb90dc1b00d3 Mon Sep 17 00:00:00 2001 +From: mean +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 ++#include + + 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 + + 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 ++#include + + // + // Video is in YV12 Colorspace \ No newline at end of file