[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/

[Alexis Ballier]

commit:     5f54c512e72cd0a101fbe1b90feaed4f47e6c013
Author:     Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Sat Jun 24 05:39:30 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> 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
 }