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 461A71382C5 for ; Sat, 21 Apr 2018 20:56:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5D84FE0821; Sat, 21 Apr 2018 20:56:20 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 203CFE0819 for ; Sat, 21 Apr 2018 20:56:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 C1934335C74 for ; Sat, 21 Apr 2018 20:56:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 686E6292 for ; Sat, 21 Apr 2018 20:56:17 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <1524344169.c4c3763a56731396ec55a399e5f6aa2b572e0d17.sping@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/gegl/gegl-0.2.0-r4.ebuild media-libs/gegl/gegl-0.2.0-r5.ebuild media-libs/gegl/gegl-0.3.20.ebuild media-libs/gegl/gegl-0.3.24.ebuild media-libs/gegl/gegl-0.3.26.ebuild media-libs/gegl/gegl-0.3.28.ebuild media-libs/gegl/gegl-0.3.30.ebuild media-libs/gegl/gegl-0.3.8.ebuild X-VCS-Directories: media-libs/gegl/ X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: c4c3763a56731396ec55a399e5f6aa2b572e0d17 X-VCS-Branch: master Date: Sat, 21 Apr 2018 20:56:17 +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: 603f27d6-dd7c-4a39-9a5c-b3b9873d29a7 X-Archives-Hash: 187232fe2be8ff9c6bcff2c6e7f3e32d commit: c4c3763a56731396ec55a399e5f6aa2b572e0d17 Author: Marty E. Plummer startmail com> AuthorDate: Fri Apr 20 14:29:04 2018 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Sat Apr 21 20:56:09 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4c3763a media-libs/gegl: epatch->PATCHES=() Package-Manager: Portage-2.3.31, Repoman-2.3.9 media-libs/gegl/gegl-0.2.0-r4.ebuild | 30 ++++++++++++++++-------------- media-libs/gegl/gegl-0.2.0-r5.ebuild | 33 ++++++++++++++++++--------------- media-libs/gegl/gegl-0.3.20.ebuild | 6 ++++-- media-libs/gegl/gegl-0.3.24.ebuild | 6 ++++-- media-libs/gegl/gegl-0.3.26.ebuild | 6 ++++-- media-libs/gegl/gegl-0.3.28.ebuild | 6 ++++-- media-libs/gegl/gegl-0.3.30.ebuild | 6 ++++-- media-libs/gegl/gegl-0.3.8.ebuild | 9 +++++---- 8 files changed, 59 insertions(+), 43 deletions(-) diff --git a/media-libs/gegl/gegl-0.2.0-r4.ebuild b/media-libs/gegl/gegl-0.2.0-r4.ebuild index ddb70a4e401..2268786841a 100644 --- a/media-libs/gegl/gegl-0.2.0-r4.ebuild +++ b/media-libs/gegl/gegl-0.2.0-r4.ebuild @@ -54,15 +54,26 @@ DEPEND="${RDEPEND} DOCS=( ChangeLog INSTALL README NEWS ) -src_prepare() { +PATCHES=( # https://bugs.gentoo.org/show_bug.cgi?id=442016 - epatch "${FILESDIR}/${P}-cve-2012-4433-1e92e523.patch" - epatch "${FILESDIR}/${P}-cve-2012-4433-4757cdf7.patch" + "${FILESDIR}/${P}-cve-2012-4433-1e92e523.patch" + "${FILESDIR}/${P}-cve-2012-4433-4757cdf7.patch" # https://bugs.gentoo.org/show_bug.cgi?id=416587 - epatch "${FILESDIR}/${P}-introspection-version.patch" + "${FILESDIR}/${P}-introspection-version.patch" + + "${FILESDIR}/${P}-ffmpeg-0.11.diff" + "${FILESDIR}"/${P}-g_log_domain.patch + + # https://bugs.gentoo.org/show_bug.cgi?id=605216 + # https://bugs.gentoo.org/show_bug.cgi?id=617430 + "${FILESDIR}"/${P}-underlinking.patch + "${FILESDIR}"/${P}-libopenraw-0.1.patch # bug 639834 + "${FILESDIR}"/${P}-fix-without-exiv2.patch # bug 641872 +) - epatch "${FILESDIR}/${P}-ffmpeg-0.11.diff" +src_prepare() { + default # fix OSX loadable module filename extension sed -i -e 's/\.dylib/.bundle/' configure.ac || die # don't require Apple's OpenCL on versions of OSX that don't have it @@ -70,15 +81,6 @@ src_prepare() { sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die fi - epatch "${FILESDIR}"/${P}-g_log_domain.patch - - # https://bugs.gentoo.org/show_bug.cgi?id=605216 - # https://bugs.gentoo.org/show_bug.cgi?id=617430 - epatch "${FILESDIR}"/${P}-underlinking.patch - epatch "${FILESDIR}"/${P}-libopenraw-0.1.patch # bug 639834 - epatch "${FILESDIR}"/${P}-fix-without-exiv2.patch # bug 641872 - - eapply_user eautoreconf # https://bugs.gentoo.org/show_bug.cgi?id=468248 diff --git a/media-libs/gegl/gegl-0.2.0-r5.ebuild b/media-libs/gegl/gegl-0.2.0-r5.ebuild index 717ad1841b6..cd6b1554809 100644 --- a/media-libs/gegl/gegl-0.2.0-r5.ebuild +++ b/media-libs/gegl/gegl-0.2.0-r5.ebuild @@ -54,18 +54,30 @@ DEPEND="${RDEPEND} DOCS=( ChangeLog INSTALL README NEWS ) -src_prepare() { +PATCHES=( # https://bugs.gentoo.org/show_bug.cgi?id=636780 - epatch "${FILESDIR}/${P}-ffmpeg-av_frame_alloc.patch" + "${FILESDIR}/${P}-ffmpeg-av_frame_alloc.patch" # https://bugs.gentoo.org/show_bug.cgi?id=442016 - epatch "${FILESDIR}/${P}-cve-2012-4433-1e92e523.patch" - epatch "${FILESDIR}/${P}-cve-2012-4433-4757cdf7.patch" + "${FILESDIR}/${P}-cve-2012-4433-1e92e523.patch" + "${FILESDIR}/${P}-cve-2012-4433-4757cdf7.patch" # https://bugs.gentoo.org/show_bug.cgi?id=416587 - epatch "${FILESDIR}/${P}-introspection-version.patch" + "${FILESDIR}/${P}-introspection-version.patch" + + "${FILESDIR}/${P}-ffmpeg-0.11.diff" + "${FILESDIR}"/${P}-g_log_domain.patch + + # https://bugs.gentoo.org/show_bug.cgi?id=605216 + # https://bugs.gentoo.org/show_bug.cgi?id=617430 + "${FILESDIR}"/${P}-underlinking.patch + "${FILESDIR}"/${P}-libopenraw-0.1.patch # bug 639834 + "${FILESDIR}"/${P}-fix-without-exiv2.patch # bug 641872 + +) - epatch "${FILESDIR}/${P}-ffmpeg-0.11.diff" +src_prepare() { + default # fix OSX loadable module filename extension sed -i -e 's/\.dylib/.bundle/' configure.ac || die # don't require Apple's OpenCL on versions of OSX that don't have it @@ -73,15 +85,6 @@ src_prepare() { sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die fi - epatch "${FILESDIR}"/${P}-g_log_domain.patch - - # https://bugs.gentoo.org/show_bug.cgi?id=605216 - # https://bugs.gentoo.org/show_bug.cgi?id=617430 - epatch "${FILESDIR}"/${P}-underlinking.patch - epatch "${FILESDIR}"/${P}-libopenraw-0.1.patch # bug 639834 - epatch "${FILESDIR}"/${P}-fix-without-exiv2.patch # bug 641872 - - eapply_user eautoreconf # https://bugs.gentoo.org/show_bug.cgi?id=468248 diff --git a/media-libs/gegl/gegl-0.3.20.ebuild b/media-libs/gegl/gegl-0.3.20.ebuild index 6afa0cc4600..ca8af3a9292 100644 --- a/media-libs/gegl/gegl-0.3.20.ebuild +++ b/media-libs/gegl/gegl-0.3.20.ebuild @@ -75,6 +75,10 @@ pkg_setup() { use test && use introspection && python-any-r1_pkg_setup } +PATCHES=( + "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch +) + src_prepare() { default @@ -91,8 +95,6 @@ src_prepare() { -e '/composite-transform.xml/d' \ -i tests/compositions/Makefile.am || die - epatch "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch - eautoreconf gnome2_environment_reset diff --git a/media-libs/gegl/gegl-0.3.24.ebuild b/media-libs/gegl/gegl-0.3.24.ebuild index 4dc1c361007..725be5c3b37 100644 --- a/media-libs/gegl/gegl-0.3.24.ebuild +++ b/media-libs/gegl/gegl-0.3.24.ebuild @@ -75,6 +75,10 @@ pkg_setup() { use test && use introspection && python-any-r1_pkg_setup } +PATCHES=( + "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch +) + src_prepare() { default @@ -91,8 +95,6 @@ src_prepare() { -e '/composite-transform.xml/d' \ -i tests/compositions/Makefile.am || die - epatch "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch - eautoreconf gnome2_environment_reset diff --git a/media-libs/gegl/gegl-0.3.26.ebuild b/media-libs/gegl/gegl-0.3.26.ebuild index 7aa01eab364..aaf6fcd179b 100644 --- a/media-libs/gegl/gegl-0.3.26.ebuild +++ b/media-libs/gegl/gegl-0.3.26.ebuild @@ -75,6 +75,10 @@ pkg_setup() { use test && use introspection && python-any-r1_pkg_setup } +PATCHES=( + "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch +) + src_prepare() { default @@ -91,8 +95,6 @@ src_prepare() { -e '/composite-transform.xml/d' \ -i tests/compositions/Makefile.am || die - epatch "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch - eautoreconf gnome2_environment_reset diff --git a/media-libs/gegl/gegl-0.3.28.ebuild b/media-libs/gegl/gegl-0.3.28.ebuild index 863f2e51ff1..7ca15acd39e 100644 --- a/media-libs/gegl/gegl-0.3.28.ebuild +++ b/media-libs/gegl/gegl-0.3.28.ebuild @@ -75,6 +75,10 @@ pkg_setup() { use test && use introspection && python-any-r1_pkg_setup } +PATCHES=( + "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch +) + src_prepare() { default @@ -91,8 +95,6 @@ src_prepare() { -e '/composite-transform.xml/d' \ -i tests/compositions/Makefile.am || die - epatch "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch - eautoreconf gnome2_environment_reset diff --git a/media-libs/gegl/gegl-0.3.30.ebuild b/media-libs/gegl/gegl-0.3.30.ebuild index 7ea4b3acef9..6ca6a617b17 100644 --- a/media-libs/gegl/gegl-0.3.30.ebuild +++ b/media-libs/gegl/gegl-0.3.30.ebuild @@ -75,6 +75,10 @@ pkg_setup() { use test && use introspection && python-any-r1_pkg_setup } +PATCHES=( + "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch +) + src_prepare() { default @@ -91,8 +95,6 @@ src_prepare() { -e '/composite-transform.xml/d' \ -i tests/compositions/Makefile.am || die - epatch "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch - eautoreconf gnome2_environment_reset diff --git a/media-libs/gegl/gegl-0.3.8.ebuild b/media-libs/gegl/gegl-0.3.8.ebuild index 92e02f5f4eb..519fc730563 100644 --- a/media-libs/gegl/gegl-0.3.8.ebuild +++ b/media-libs/gegl/gegl-0.3.8.ebuild @@ -75,6 +75,11 @@ pkg_setup() { use test && use introspection && python-any-r1_pkg_setup } +PATCHES=( + #"${FILESDIR}"/${P}-g_log_domain.patch + "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch +) + src_prepare() { default @@ -86,15 +91,11 @@ src_prepare() { sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die fi - #epatch "${FILESDIR}"/${P}-g_log_domain.patch - # commit 7c78497b : tests that use gegl.png are broken on non-amd64 sed -e '/clones.xml/d' \ -e '/composite-transform.xml/d' \ -i tests/compositions/Makefile.am || die - epatch "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch - eautoreconf gnome2_environment_reset