From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1693953-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 57CE01581F3
for <garchives@archives.gentoo.org>; Mon, 25 Nov 2024 20:07:30 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 81D90E082F;
Mon, 25 Nov 2024 20:07:29 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 64EF1E082F
for <gentoo-commits@lists.gentoo.org>; Mon, 25 Nov 2024 20:07:29 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id A0113342FF7
for <gentoo-commits@lists.gentoo.org>; Mon, 25 Nov 2024 20:07:28 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 35B2F11DF
for <gentoo-commits@lists.gentoo.org>; Mon, 25 Nov 2024 20:07:27 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1732565200.c43b019c1265f5c3400528056e9e943d6e87e63b.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-video/ffmpeg/ffmpeg-6.1.2.ebuild media-video/ffmpeg/ffmpeg-7.0.1-r1.ebuild media-video/ffmpeg/ffmpeg-7.0.2-r1.ebuild media-video/ffmpeg/ffmpeg-9999.ebuild
X-VCS-Directories: media-video/ffmpeg/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: c43b019c1265f5c3400528056e9e943d6e87e63b
X-VCS-Branch: master
Date: Mon, 25 Nov 2024 20:07:27 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: e9de024b-6f9c-489c-869d-313faf74dcf1
X-Archives-Hash: 2b9a2ce56a75a810a994155cc2c2d492
commit: c43b019c1265f5c3400528056e9e943d6e87e63b
Author: Quincy Fleming <quincyf467 <AT> protonmail <DOT> com>
AuthorDate: Mon Nov 11 07:41:33 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 25 20:06:40 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c43b019c
media-video/ffmpeg: Fix build on musl
Closes: https://bugs.gentoo.org/940733
Signed-off-by: Quincy Fleming <quincyf467 <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/39269
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/ffmpeg/ffmpeg-6.1.2.ebuild | 4 ++++
media-video/ffmpeg/ffmpeg-7.0.1-r1.ebuild | 4 ++++
media-video/ffmpeg/ffmpeg-7.0.2-r1.ebuild | 4 ++++
media-video/ffmpeg/ffmpeg-9999.ebuild | 4 ++++
4 files changed, 16 insertions(+)
diff --git a/media-video/ffmpeg/ffmpeg-6.1.2.ebuild b/media-video/ffmpeg/ffmpeg-6.1.2.ebuild
index 32eb9022ffd3..1baa7d788876 100644
--- a/media-video/ffmpeg/ffmpeg-6.1.2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1.2.ebuild
@@ -547,6 +547,10 @@ multilib_src_configure() {
$(multilib_native_enable manpages)
)
+ if use elibc_musl ; then
+ append-cflags -D__musl__
+ fi
+
# Use --extra-libs if needed for LIBS
set -- "${S}/configure" \
--prefix="${EPREFIX}/usr" \
diff --git a/media-video/ffmpeg/ffmpeg-7.0.1-r1.ebuild b/media-video/ffmpeg/ffmpeg-7.0.1-r1.ebuild
index a4d91f76c9bf..36a0af85b719 100644
--- a/media-video/ffmpeg/ffmpeg-7.0.1-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-7.0.1-r1.ebuild
@@ -548,6 +548,10 @@ multilib_src_configure() {
$(multilib_native_enable manpages)
)
+ if use elibc_musl ; then
+ append-cflags -D__musl__
+ fi
+
# Use --extra-libs if needed for LIBS
set -- "${S}/configure" \
--prefix="${EPREFIX}/usr" \
diff --git a/media-video/ffmpeg/ffmpeg-7.0.2-r1.ebuild b/media-video/ffmpeg/ffmpeg-7.0.2-r1.ebuild
index a4d91f76c9bf..36a0af85b719 100644
--- a/media-video/ffmpeg/ffmpeg-7.0.2-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-7.0.2-r1.ebuild
@@ -548,6 +548,10 @@ multilib_src_configure() {
$(multilib_native_enable manpages)
)
+ if use elibc_musl ; then
+ append-cflags -D__musl__
+ fi
+
# Use --extra-libs if needed for LIBS
set -- "${S}/configure" \
--prefix="${EPREFIX}/usr" \
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 357a04d67a61..ba89f852efa0 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -549,6 +549,10 @@ multilib_src_configure() {
$(multilib_native_enable manpages)
)
+ if use elibc_musl ; then
+ append-cflags -DHAVE_POSIX_IOCTL
+ fi
+
# Use --extra-libs if needed for LIBS
set -- "${S}/configure" \
--prefix="${EPREFIX}/usr" \