From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 6AAC31581EE for ; Tue, 01 Apr 2025 02:30:13 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 51ECF343138 for ; Tue, 01 Apr 2025 02:30:13 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id A0DC31104B2; Tue, 01 Apr 2025 02:30:06 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 bobolink.gentoo.org (Postfix) with ESMTPS id 9B9551104B2 for ; Tue, 01 Apr 2025 02:30:06 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3137A3430BF for ; Tue, 01 Apr 2025 02:30:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 91C431DF6 for ; Tue, 01 Apr 2025 02:30:03 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1743474426.0ad04a2de46a2c84acbe95d9fb718857fc0b2747.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/ffmpeg/ffmpeg-4.4.5-r2.ebuild media-video/ffmpeg/ffmpeg-6.1.2-r1.ebuild media-video/ffmpeg/ffmpeg-7.1.1.ebuild media-video/ffmpeg/ffmpeg-9999.ebuild X-VCS-Directories: media-video/ffmpeg/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 0ad04a2de46a2c84acbe95d9fb718857fc0b2747 X-VCS-Branch: master Date: Tue, 01 Apr 2025 02:30:03 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ce13529d-4902-433c-b8c7-d29a2162359f X-Archives-Hash: 3267872c7a93135d550eb36638569b7c commit: 0ad04a2de46a2c84acbe95d9fb718857fc0b2747 Author: Ionen Wolkens gentoo org> AuthorDate: Tue Apr 1 02:15:17 2025 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Tue Apr 1 02:27:06 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ad04a2d media-video/ffmpeg: slightly clarify S comment This is to allow copying the ebuild as-is to ffmpeg-compat and not have to maintain them as two different ebuilds. If same version, the only difference can at most be keywords if in middle of stabilization but otherwise these should match as well. ffmpeg-compat ebuilds could potentially be simplified when the equivalent ffmpeg version is dropped though. Signed-off-by: Ionen Wolkens gentoo.org> media-video/ffmpeg/ffmpeg-4.4.5-r2.ebuild | 2 +- media-video/ffmpeg/ffmpeg-6.1.2-r1.ebuild | 2 +- media-video/ffmpeg/ffmpeg-7.1.1.ebuild | 2 +- media-video/ffmpeg/ffmpeg-9999.ebuild | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-4.4.5-r2.ebuild b/media-video/ffmpeg/ffmpeg-4.4.5-r2.ebuild index c9e7ad2b7b75..a61c33e1d509 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.5-r2.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.5-r2.ebuild @@ -20,7 +20,7 @@ else verify-sig? ( https://ffmpeg.org/releases/ffmpeg-${PV}.tar.xz.asc ) https://dev.gentoo.org/~ionen/distfiles/ffmpeg-$(ver_cut 1-2)-patchset-1.tar.xz " - S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} + S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} for ffmpeg-compat KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi diff --git a/media-video/ffmpeg/ffmpeg-6.1.2-r1.ebuild b/media-video/ffmpeg/ffmpeg-6.1.2-r1.ebuild index 07142e5cc8e4..4a3a3a7e15b3 100644 --- a/media-video/ffmpeg/ffmpeg-6.1.2-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1.2-r1.ebuild @@ -27,7 +27,7 @@ else "} https://dev.gentoo.org/~ionen/distfiles/ffmpeg-$(ver_cut 1-2)-patchset-1.tar.xz " - S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} + S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} for ffmpeg-compat KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi diff --git a/media-video/ffmpeg/ffmpeg-7.1.1.ebuild b/media-video/ffmpeg/ffmpeg-7.1.1.ebuild index ba96968621fd..48ce87160460 100644 --- a/media-video/ffmpeg/ffmpeg-7.1.1.ebuild +++ b/media-video/ffmpeg/ffmpeg-7.1.1.ebuild @@ -26,7 +26,7 @@ else ) "} " - S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} + S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} for ffmpeg-compat KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index a8bd33d824f1..7ddbfafb70fc 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -26,7 +26,7 @@ else ) "} " - S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} + S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} for ffmpeg-compat KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi