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 D40D6139695 for ; Fri, 30 Jun 2017 05:28:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F2E32234012; Fri, 30 Jun 2017 05:28:50 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BC83E234012 for ; Fri, 30 Jun 2017 05:28:50 +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 A245634175C for ; Fri, 30 Jun 2017 05:28:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 159F57498 for ; Fri, 30 Jun 2017 05:28:48 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1498800124.5f54c512e72cd0a101fbe1b90feaed4f47e6c013.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild media-libs/avidemux-core/avidemux-core-9999.ebuild X-VCS-Directories: media-libs/avidemux-core/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: 5f54c512e72cd0a101fbe1b90feaed4f47e6c013 X-VCS-Branch: master Date: Fri, 30 Jun 2017 05:28:48 +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: 08d87ff0-006f-4218-81af-fa84cdb642bc X-Archives-Hash: 09962ca74747c2857699cc54eff4b49a commit: 5f54c512e72cd0a101fbe1b90feaed4f47e6c013 Author: Peter Levine gmail com> AuthorDate: Sat Jun 24 05:39:30 2017 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Fri Jun 30 05:22:04 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f54c512 media-libs/avidemux-core: Undo changes from bug #461496 Undo the hardcoding of the build path in an installable cmake module. Causes failure in the configure phase of media-video/avidemux-2.6.20 and doesn't appear to be neccesary anymore. Revbump avidemux-core-2.6.20. Package-Manager: Portage-2.3.6, Repoman-2.3.2 .../{avidemux-core-9999.ebuild => avidemux-core-2.6.20-r1.ebuild} | 4 ---- media-libs/avidemux-core/avidemux-core-9999.ebuild | 4 ---- 2 files changed, 8 deletions(-) diff --git a/media-libs/avidemux-core/avidemux-core-9999.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild similarity index 89% copy from media-libs/avidemux-core/avidemux-core-9999.ebuild copy to media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild index 3a7af781cc1..16e22ff152f 100644 --- a/media-libs/avidemux-core/avidemux-core-9999.ebuild +++ b/media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild @@ -65,10 +65,6 @@ src_prepare() { sed -i -e 's/include(admFFmpegUtil)//g' avidemux/commonCmakeApplication.cmake || die "${error}" sed -i -e '/registerFFmpeg/d' avidemux/commonCmakeApplication.cmake || die "${error}" sed -i -e 's/include(admFFmpegBuild)//g' avidemux_core/CMakeLists.txt || die "${error}" - else - # Avoid existing avidemux installations from making the build process fail, bug #461496. - sed -i -e "s:getFfmpegLibNames(\"\${sourceDir}\"):getFfmpegLibNames(\"${WORKDIR}/${P}_build/ffmpeg/source/\"):g" cmake/admFFmpegUtil.cmake \ - || die "Failed to avoid existing avidemux installation from making the build fail." fi } diff --git a/media-libs/avidemux-core/avidemux-core-9999.ebuild b/media-libs/avidemux-core/avidemux-core-9999.ebuild index 3a7af781cc1..16e22ff152f 100644 --- a/media-libs/avidemux-core/avidemux-core-9999.ebuild +++ b/media-libs/avidemux-core/avidemux-core-9999.ebuild @@ -65,10 +65,6 @@ src_prepare() { sed -i -e 's/include(admFFmpegUtil)//g' avidemux/commonCmakeApplication.cmake || die "${error}" sed -i -e '/registerFFmpeg/d' avidemux/commonCmakeApplication.cmake || die "${error}" sed -i -e 's/include(admFFmpegBuild)//g' avidemux_core/CMakeLists.txt || die "${error}" - else - # Avoid existing avidemux installations from making the build process fail, bug #461496. - sed -i -e "s:getFfmpegLibNames(\"\${sourceDir}\"):getFfmpegLibNames(\"${WORKDIR}/${P}_build/ffmpeg/source/\"):g" cmake/admFFmpegUtil.cmake \ - || die "Failed to avoid existing avidemux installation from making the build fail." fi }