public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Ionen Wolkens" <ionen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/dvdstyler/
Date: Tue, 18 Mar 2025 02:57:12 +0000 (UTC)	[thread overview]
Message-ID: <1742266589.2de59f8667c2455e797da770147f0b8afed9c825.ionen@gentoo> (raw)

commit:     2de59f8667c2455e797da770147f0b8afed9c825
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 18 02:44:31 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Mar 18 02:56:29 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2de59f86

media-video/dvdstyler: fix ffmpeg-compat detection

...when normal media-video/ffmpeg is not installed.

At a glance this does not use the `ffmpeg` command (FFMPEG_PATH
is not used in the sources that I can see, nor the resulting
binary), but ./configure will abort if it is not found. Thanks
to that, we can get away with passing SYSROOT and not revbumping
which would otherwise be incorrect for a runtime-used path.

Reconsidered just fixing with ffmpeg-7, but given this was previously
broken with "older" ffmpeg5 and patches are accumulating, this may
need special attention and runtime testing.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 media-video/dvdstyler/dvdstyler-3.2.1-r3.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/media-video/dvdstyler/dvdstyler-3.2.1-r3.ebuild b/media-video/dvdstyler/dvdstyler-3.2.1-r3.ebuild
index 3e7453c4d420..2c5dc2e582e1 100644
--- a/media-video/dvdstyler/dvdstyler-3.2.1-r3.ebuild
+++ b/media-video/dvdstyler/dvdstyler-3.2.1-r3.ebuild
@@ -65,9 +65,11 @@ src_prepare() {
 }
 
 src_configure() {
-	# TODO: fix with >=ffmpeg-7 then drop compat
+	# TODO: fix with >=ffmpeg-7 then drop compat (FFMPEG_PATH is "unused" but
+	# ./configure will abort if the `ffmpeg` command is not found)
 	ffmpeg_compat_setup 6
 	ffmpeg_compat_add_flags
+	local -x ac_cv_path_FFMPEG_PATH=${SYSROOT}$(ffmpeg_compat_get_prefix 6)/bin/ffmpeg
 
 	setup-wxwidgets unicode
 	econf \


             reply	other threads:[~2025-03-18  2:57 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-03-18  2:57 Ionen Wolkens [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-03-17  1:53 [gentoo-commits] repo/gentoo:master commit in: media-video/dvdstyler/ Ionen Wolkens
2025-03-11  9:04 Ionen Wolkens
2024-07-05 17:49 Pacho Ramos
2022-11-12 17:48 Matt Turner
2020-12-18  9:00 Michał Górny
2020-04-26 12:05 David Seifert
2019-08-01 14:59 Andreas Sturmlechner
2018-01-13 12:16 Alexis Ballier
2018-01-13 12:16 Alexis Ballier
2017-02-09 13:57 Alexis Ballier
2016-08-29 13:19 Alexis Ballier
2016-08-06 16:51 Michał Górny
2016-02-26 21:32 Pacho Ramos
2016-01-07  7:38 Alexis Ballier
2015-12-01 12:31 Alexis Ballier
2015-10-25 15:25 Pacho Ramos
2015-10-06  9:13 Alexis Ballier
2015-08-15  9:49 Alexis Ballier

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=1742266589.2de59f8667c2455e797da770147f0b8afed9c825.ionen@gentoo \
    --to=ionen@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