commit: 6e38825031640fb08f8cc345d8209d67659b9bf2
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 15 03:40:39 2025 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Jun 15 03:44:03 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e388250
media-video/ffmpeg-compat: sync with ffmpeg
Primarily for libtheora's := that's been seemingly forgotten here.
Also syncs some in-progress stable keywords but that's fine, the
ebuilds are the same and that does not need retesting.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../{ffmpeg-compat-4.4.5-r1.ebuild => ffmpeg-compat-4.4.5-r2.ebuild} | 2 +-
.../{ffmpeg-compat-4.4.6.ebuild => ffmpeg-compat-4.4.6-r1.ebuild} | 4 ++--
.../{ffmpeg-compat-6.1.2-r1.ebuild => ffmpeg-compat-6.1.2-r2.ebuild} | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/media-video/ffmpeg-compat/ffmpeg-compat-4.4.5-r1.ebuild
b/media-video/ffmpeg-compat/ffmpeg-compat-4.4.5-r2.ebuild
similarity index 99%
rename from media-video/ffmpeg-compat/ffmpeg-compat-4.4.5-r1.ebuild
rename to media-video/ffmpeg-compat/ffmpeg-compat-4.4.5-r2.ebuild
index fab7a2922ea3..8ff7835c4fa1 100644
--- a/media-video/ffmpeg-compat/ffmpeg-compat-4.4.5-r1.ebuild
+++ b/media-video/ffmpeg-compat/ffmpeg-compat-4.4.5-r2.ebuild
@@ -229,7 +229,7 @@ RDEPEND="
x11-libs/cairo[${MULTILIB_USEDEP}]
)
svt-av1? ( >=media-libs/svt-av1-0.8.4:=[${MULTILIB_USEDEP}] )
- theora? ( media-libs/libtheora[encode,${MULTILIB_USEDEP}] )
+ theora? ( media-libs/libtheora:=[encode,${MULTILIB_USEDEP}] )
truetype? ( media-libs/freetype:2[${MULTILIB_USEDEP}] )
twolame? ( media-sound/twolame[${MULTILIB_USEDEP}] )
v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
diff --git a/media-video/ffmpeg-compat/ffmpeg-compat-4.4.6.ebuild
b/media-video/ffmpeg-compat/ffmpeg-compat-4.4.6-r1.ebuild
similarity index 98%
rename from media-video/ffmpeg-compat/ffmpeg-compat-4.4.6.ebuild
rename to media-video/ffmpeg-compat/ffmpeg-compat-4.4.6-r1.ebuild
index a04419fe8271..772eea8b2f9e 100644
--- a/media-video/ffmpeg-compat/ffmpeg-compat-4.4.6.ebuild
+++ b/media-video/ffmpeg-compat/ffmpeg-compat-4.4.6-r1.ebuild
@@ -21,7 +21,7 @@ else
https://dev.gentoo.org/~ionen/distfiles/ffmpeg-$(ver_cut
1-2)-patchset-2.tar.xz
"
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"
+ KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv
~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
fi
DESCRIPTION="Complete solution to record/convert/stream audio and video"
@@ -229,7 +229,7 @@ RDEPEND="
x11-libs/cairo[${MULTILIB_USEDEP}]
)
svt-av1? ( >=media-libs/svt-av1-0.8.4:=[${MULTILIB_USEDEP}] )
- theora? ( media-libs/libtheora[encode,${MULTILIB_USEDEP}] )
+ theora? ( media-libs/libtheora:=[encode,${MULTILIB_USEDEP}] )
truetype? ( media-libs/freetype:2[${MULTILIB_USEDEP}] )
twolame? ( media-sound/twolame[${MULTILIB_USEDEP}] )
v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
diff --git a/media-video/ffmpeg-compat/ffmpeg-compat-6.1.2-r1.ebuild
b/media-video/ffmpeg-compat/ffmpeg-compat-6.1.2-r2.ebuild
similarity index 99%
rename from media-video/ffmpeg-compat/ffmpeg-compat-6.1.2-r1.ebuild
rename to media-video/ffmpeg-compat/ffmpeg-compat-6.1.2-r2.ebuild
index ec4e103e9d2a..04cef58ab409 100644
--- a/media-video/ffmpeg-compat/ffmpeg-compat-6.1.2-r1.ebuild
+++ b/media-video/ffmpeg-compat/ffmpeg-compat-6.1.2-r2.ebuild
@@ -260,7 +260,7 @@ COMMON_DEPEND="
x11-libs/cairo[${MULTILIB_USEDEP}]
)
svt-av1? ( >=media-libs/svt-av1-0.9:=[${MULTILIB_USEDEP}] )
- theora? ( media-libs/libtheora[encode,${MULTILIB_USEDEP}] )
+ theora? ( media-libs/libtheora:=[encode,${MULTILIB_USEDEP}] )
truetype? (
media-libs/freetype:2[${MULTILIB_USEDEP}]
media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
