public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Alexis Ballier" <aballier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
Date: Fri, 30 Jun 2017 05:28:48 +0000 (UTC)	[thread overview]
Message-ID: <1498800124.5f54c512e72cd0a101fbe1b90feaed4f47e6c013.aballier@gentoo> (raw)

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
 }
 


             reply	other threads:[~2017-06-30  5:28 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-30  5:28 Alexis Ballier [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-03-11  9:04 [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/ Ionen Wolkens
2023-01-28 11:49 Andreas Sturmlechner
2023-01-10  9:00 Sam James
2023-01-09  7:27 Sam James
2023-01-07  7:17 Sam James
2022-06-19  9:06 Jakov Smolić
2022-03-09 12:37 Sam James
2021-11-07  0:01 Sam James
2021-05-22  4:27 Andrew Savchenko
2021-01-01  1:06 Michał Górny
2020-10-31 11:11 David Seifert
2020-04-26 10:35 David Seifert
2019-08-25 20:52 Stefan Strogin
2019-08-25 20:52 Stefan Strogin
2019-08-14  4:35 Stefan Strogin
2019-07-06 10:25 Andreas Sturmlechner
2018-01-09 17:33 Andreas Sturmlechner
2018-01-09 17:33 Andreas Sturmlechner
2017-12-08 18:32 Andreas Sturmlechner
2017-10-29  9:34 Andreas Sturmlechner
2017-10-08 10:24 Alexis Ballier
2017-10-04  8:02 Alexis Ballier
2017-06-30  5:28 Alexis Ballier
2017-06-23  5:58 Alexis Ballier
2017-06-23  5:58 Alexis Ballier
2017-06-23  5:58 Alexis Ballier
2017-06-23  5:58 Alexis Ballier
2016-05-06  7:49 Patrick Lauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1498800124.5f54c512e72cd0a101fbe1b90feaed4f47e6c013.aballier@gentoo \
    --to=aballier@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox