commit: 48e25a7bc7d7206f69b863622abcdf83bbdbee25 Author: Karl-Johan Karlsson <creideiki <AT> ferretporn <DOT> se> AuthorDate: Wed Jul 26 10:01:17 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jul 27 09:38:44 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48e25a7b
media-video/ffmpeg: Rename AMF env.d file, and revbump Leading digits are required for env-update to consider the file. This commit leaves the file in the repository as is and uses "newenvd" to install it under a different name. This makes sure that the 6.0-r2 ebuild continues to work. If that is not required, a simpler solution would be to instead rename the file in the repository to 99amf-env-vulkan-override and keep using "doenvd". Closes: https://bugs.gentoo.org/911249 Signed-off-by: Karl-Johan Karlsson <creideiki <AT> lysator.liu.se> Closes: https://github.com/gentoo/gentoo/pull/32050 Signed-off-by: Sam James <sam <AT> gentoo.org> media-video/ffmpeg/{ffmpeg-4.4.4-r2.ebuild => ffmpeg-4.4.4-r3.ebuild} | 2 +- media-video/ffmpeg/{ffmpeg-5.1.3-r2.ebuild => ffmpeg-5.1.3-r3.ebuild} | 2 +- media-video/ffmpeg/{ffmpeg-6.0-r4.ebuild => ffmpeg-6.0-r5.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.4-r2.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r3.ebuild similarity index 99% rename from media-video/ffmpeg/ffmpeg-4.4.4-r2.ebuild rename to media-video/ffmpeg/ffmpeg-4.4.4-r3.ebuild index 4a3c4e8f1038..717a0742f97b 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.4-r2.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.4-r3.ebuild @@ -599,5 +599,5 @@ multilib_src_install_all() { dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES" - use amf && doenvd "${FILESDIR}"/amf-env-vulkan-override + use amf && newenvd "${FILESDIR}"/amf-env-vulkan-override 99amf-env-vulkan-override } diff --git a/media-video/ffmpeg/ffmpeg-5.1.3-r2.ebuild b/media-video/ffmpeg/ffmpeg-5.1.3-r3.ebuild similarity index 99% rename from media-video/ffmpeg/ffmpeg-5.1.3-r2.ebuild rename to media-video/ffmpeg/ffmpeg-5.1.3-r3.ebuild index f55c39bea2fb..8c290006f1db 100644 --- a/media-video/ffmpeg/ffmpeg-5.1.3-r2.ebuild +++ b/media-video/ffmpeg/ffmpeg-5.1.3-r3.ebuild @@ -599,5 +599,5 @@ multilib_src_install_all() { dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES" - use amf && doenvd "${FILESDIR}"/amf-env-vulkan-override + use amf && newenvd "${FILESDIR}"/amf-env-vulkan-override 99amf-env-vulkan-override } diff --git a/media-video/ffmpeg/ffmpeg-6.0-r4.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r5.ebuild similarity index 99% rename from media-video/ffmpeg/ffmpeg-6.0-r4.ebuild rename to media-video/ffmpeg/ffmpeg-6.0-r5.ebuild index e4b90e3a7bf4..646efd85ae1a 100644 --- a/media-video/ffmpeg/ffmpeg-6.0-r4.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r5.ebuild @@ -600,5 +600,5 @@ multilib_src_install_all() { dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES" - use amf && doenvd "${FILESDIR}"/amf-env-vulkan-override + use amf && newenvd "${FILESDIR}"/amf-env-vulkan-override 99amf-env-vulkan-override } diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 29d9e2cfbfa6..2abee6b94854 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -596,5 +596,5 @@ multilib_src_install_all() { dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES" - use amf && doenvd "${FILESDIR}"/amf-env-vulkan-override + use amf && newenvd "${FILESDIR}"/amf-env-vulkan-override 99amf-env-vulkan-override }
